diff options
Diffstat (limited to 'test')
175 files changed, 17643 insertions, 17895 deletions
diff --git a/test/API/H5_api_async_test.c b/test/API/H5_api_async_test.c index 3d676c0..4afea50 100644 --- a/test/API/H5_api_async_test.c +++ b/test/API/H5_api_async_test.c @@ -73,8 +73,7 @@ test_one_dataset_io(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_FLUSH_REFRESH)) { SKIPPED(); - HDprintf( - " API functions for basic file, dataset, or flush aren't supported with this connector\n"); + printf(" API functions for basic file, dataset, or flush aren't supported with this connector\n"); return 0; } @@ -135,7 +134,7 @@ test_one_dataset_io(void) for (j = 0; j < 10; j++) if (wbuf[i][j] != rbuf[i][j]) { H5_FAILED(); - HDprintf(" data verification failed\n"); + printf(" data verification failed\n"); PART_ERROR(single_dset_eswait); } /* end if */ @@ -177,7 +176,7 @@ test_one_dataset_io(void) for (j = 0; j < 10; j++) if (wbuf[i][j] != rbuf[i][j]) { H5_FAILED(); - HDprintf(" data verification failed\n"); + printf(" data verification failed\n"); PART_ERROR(single_dset_dclose); } /* end if */ @@ -222,7 +221,7 @@ test_one_dataset_io(void) for (j = 0; j < 10; j++) if (wbuf[i][j] != rbuf[i][j]) { H5_FAILED(); - HDprintf(" data verification failed\n"); + printf(" data verification failed\n"); PART_ERROR(single_dset_dflush); } /* end if */ @@ -276,7 +275,7 @@ test_one_dataset_io(void) for (j = 0; j < 10; j++) if (wbuf[i][j] != rbuf[i][j]) { H5_FAILED(); - HDprintf(" data verification failed\n"); + printf(" data verification failed\n"); PART_ERROR(single_dset_fclose); } /* end if */ @@ -341,8 +340,7 @@ test_multi_dataset_io(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_FLUSH_REFRESH)) { SKIPPED(); - HDprintf( - " API functions for basic file, dataset, or flush aren't supported with this connector\n"); + printf(" API functions for basic file, dataset, or flush aren't supported with this connector\n"); return 0; } @@ -432,7 +430,7 @@ test_multi_dataset_io(void) for (k = 0; k < 10; k++) if (wbuf[i][j][k] != rbuf[i][j][k]) { H5_FAILED(); - HDprintf(" data verification failed\n"); + printf(" data verification failed\n"); PART_ERROR(multi_dset_open); } /* end if */ @@ -526,7 +524,7 @@ test_multi_dataset_io(void) for (k = 0; k < 10; k++) if (wbuf[i][j][k] != rbuf[i][j][k]) { H5_FAILED(); - HDprintf(" data verification failed\n"); + printf(" data verification failed\n"); PART_ERROR(multi_dset_close); } /* end if */ @@ -596,8 +594,7 @@ test_multi_file_dataset_io(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_FLUSH_REFRESH)) { SKIPPED(); - HDprintf( - " API functions for basic file, dataset, or flush aren't supported with this connector\n"); + printf(" API functions for basic file, dataset, or flush aren't supported with this connector\n"); return 0; } @@ -673,7 +670,7 @@ test_multi_file_dataset_io(void) for (k = 0; k < 10; k++) if (wbuf[i][j][k] != rbuf[i][j][k]) { H5_FAILED(); - HDprintf(" data verification failed\n"); + printf(" data verification failed\n"); PART_ERROR(multi_file_dset_open); } /* end if */ @@ -744,7 +741,7 @@ test_multi_file_dataset_io(void) for (k = 0; k < 10; k++) if (wbuf[i][j][k] != rbuf[i][j][k]) { H5_FAILED(); - HDprintf(" data verification failed\n"); + printf(" data verification failed\n"); PART_ERROR(multi_file_dset_dclose); } /* end if */ @@ -838,7 +835,7 @@ test_multi_file_dataset_io(void) for (k = 0; k < 10; k++) if (wbuf[i][j][k] != rbuf[i][j][k]) { H5_FAILED(); - HDprintf(" data verification failed\n"); + printf(" data verification failed\n"); PART_ERROR(multi_file_dset_fclose); } /* end if */ @@ -907,8 +904,7 @@ test_multi_file_grp_dset_io(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC)) { SKIPPED(); - HDprintf( - " API functions for basic file, group, or dataset aren't supported with this connector\n"); + printf(" API functions for basic file, group, or dataset aren't supported with this connector\n"); return 0; } @@ -1028,7 +1024,7 @@ test_multi_file_grp_dset_io(void) for (k = 0; k < 10; k++) if (wbuf[i][j][k] != rbuf[i][j][k]) { H5_FAILED(); - HDprintf(" data verification failed\n"); + printf(" data verification failed\n"); PART_ERROR(multi_file_grp_dset_no_kick); } /* end if */ @@ -1149,7 +1145,7 @@ test_multi_file_grp_dset_io(void) for (k = 0; k < 10; k++) if (wbuf[i][j][k] != rbuf[i][j][k]) { H5_FAILED(); - HDprintf(" data verification failed\n"); + printf(" data verification failed\n"); PART_ERROR(multi_file_grp_dset_kick); } /* end if */ @@ -1224,8 +1220,8 @@ test_set_extent(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_FLUSH_REFRESH) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_MORE)) { SKIPPED(); - HDprintf(" API functions for basic file, dataset, dataset more, or flush aren't supported with " - "this connector\n"); + printf(" API functions for basic file, dataset, dataset more, or flush aren't supported with " + "this connector\n"); return 0; } @@ -1428,8 +1424,8 @@ test_attribute_exists(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_FLUSH_REFRESH) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC)) { SKIPPED(); - HDprintf(" API functions for basic file, dataset, dataset more, attribute, or flush aren't " - "supported with this connector\n"); + printf(" API functions for basic file, dataset, dataset more, attribute, or flush aren't " + "supported with this connector\n"); return 0; } @@ -1549,8 +1545,8 @@ test_attribute_io(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_FLUSH_REFRESH) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC)) { SKIPPED(); - HDprintf(" API functions for basic file, dataset, dataset more, attribute, or flush aren't " - "supported with this connector\n"); + printf(" API functions for basic file, dataset, dataset more, attribute, or flush aren't " + "supported with this connector\n"); return 0; } @@ -1691,7 +1687,7 @@ test_attribute_io_tconv(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_FLUSH_REFRESH) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC)) { SKIPPED(); - HDprintf( + printf( " API functions for basic file, attribute, or flush aren't supported with this connector\n"); return 0; } @@ -1837,7 +1833,7 @@ test_attribute_io_compound(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_FLUSH_REFRESH) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC)) { SKIPPED(); - HDprintf( + printf( " API functions for basic file, attribute, or flush aren't supported with this connector\n"); return 0; } @@ -2143,8 +2139,8 @@ test_group(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_MORE) || !(vol_cap_flags_g & H5VL_CAP_FLAG_FLUSH_REFRESH)) { SKIPPED(); - HDprintf(" API functions for basic file, group, or group more aren't supported " - "with this connector\n"); + printf(" API functions for basic file, group, or group more aren't supported " + "with this connector\n"); return 0; } @@ -2314,8 +2310,8 @@ test_link(void) !(vol_cap_flags_g & H5VL_CAP_FLAG_FLUSH_REFRESH) || !(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" API functions for basic file, link, hard link, soft link, flush, or creation order " - "aren't supported with this connector\n"); + printf(" API functions for basic file, link, hard link, soft link, flush, or creation order " + "aren't supported with this connector\n"); return 0; } @@ -2505,8 +2501,8 @@ test_ocopy_orefresh(void) !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_OBJECT_MORE) || !(vol_cap_flags_g & H5VL_CAP_FLAG_FLUSH_REFRESH)) { SKIPPED(); - HDprintf(" API functions for basic file, group, dataset, object more, flush, or refresh aren't " - "supported with this connector\n"); + printf(" API functions for basic file, group, dataset, object more, flush, or refresh aren't " + "supported with this connector\n"); return 0; } @@ -2615,7 +2611,7 @@ test_file_reopen(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_MORE)) { SKIPPED(); - HDprintf(" API functions for basic file or file more aren't supported with this connector\n"); + printf(" API functions for basic file or file more aren't supported with this connector\n"); return 0; } @@ -2691,16 +2687,16 @@ H5_api_async_test(void) size_t i; int nerrors; - HDprintf("**********************************************\n"); - HDprintf("* *\n"); - HDprintf("* API Async Tests *\n"); - HDprintf("* *\n"); - HDprintf("**********************************************\n\n"); + printf("**********************************************\n"); + printf("* *\n"); + printf("* API Async Tests *\n"); + printf("* *\n"); + printf("**********************************************\n\n"); /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_ASYNC)) { SKIPPED(); - HDprintf(" Async APIs aren't supported with this connector\n"); + printf(" Async APIs aren't supported with this connector\n"); return 0; } @@ -2708,9 +2704,9 @@ H5_api_async_test(void) nerrors += (*async_tests[i])() ? 1 : 0; } - HDprintf("\n"); + printf("\n"); - HDprintf("Cleaning up testing files\n"); + printf("Cleaning up testing files\n"); cleanup_files(); return nerrors; @@ -2721,13 +2717,13 @@ H5_api_async_test(void) int H5_api_async_test(void) { - HDprintf("**********************************************\n"); - HDprintf("* *\n"); - HDprintf("* API Async Tests *\n"); - HDprintf("* *\n"); - HDprintf("**********************************************\n\n"); + printf("**********************************************\n"); + printf("* *\n"); + printf("* API Async Tests *\n"); + printf("* *\n"); + printf("**********************************************\n\n"); - HDprintf("SKIPPED due to no async support in HDF5 library\n"); + printf("SKIPPED due to no async support in HDF5 library\n"); return 0; } diff --git a/test/API/H5_api_attribute_test.c b/test/API/H5_api_attribute_test.c index f1409a4..144b0a4 100644 --- a/test/API/H5_api_attribute_test.c +++ b/test/API/H5_api_attribute_test.c @@ -126,7 +126,7 @@ test_create_attribute_on_root(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC)) { SKIPPED(); - HDprintf(" API functions for basic file or attribute aren't supported with this connector\n"); + printf(" API functions for basic file or attribute aren't supported with this connector\n"); return 0; } @@ -134,7 +134,7 @@ test_create_attribute_on_root(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } @@ -157,22 +157,22 @@ test_create_attribute_on_root(void) if ((attr_id = H5Acreate2(file_id, ATTRIBUTE_CREATE_ON_ROOT_ATTR_NAME, attr_dtype1, space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create attribute '%s' using H5Acreate\n", - ATTRIBUTE_CREATE_ON_ROOT_ATTR_NAME); + printf(" couldn't create attribute '%s' using H5Acreate\n", + ATTRIBUTE_CREATE_ON_ROOT_ATTR_NAME); PART_ERROR(H5Acreate2); } /* Verify the attribute has been created */ if ((attr_exists = H5Aexists(file_id, ATTRIBUTE_CREATE_ON_ROOT_ATTR_NAME)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if attribute '%s' exists\n", - ATTRIBUTE_CREATE_ON_ROOT_ATTR_NAME); + printf(" couldn't determine if attribute '%s' exists\n", + ATTRIBUTE_CREATE_ON_ROOT_ATTR_NAME); PART_ERROR(H5Acreate2); } if (!attr_exists) { H5_FAILED(); - HDprintf(" attribute '%s' did not exist\n", ATTRIBUTE_CREATE_ON_ROOT_ATTR_NAME); + printf(" attribute '%s' did not exist\n", ATTRIBUTE_CREATE_ON_ROOT_ATTR_NAME); PART_ERROR(H5Acreate2); } @@ -187,21 +187,21 @@ test_create_attribute_on_root(void) if ((attr_id2 = H5Acreate_by_name(file_id, "/", ATTRIBUTE_CREATE_ON_ROOT_ATTR_NAME2, attr_dtype2, space_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create attribute on root group using H5Acreate_by_name\n"); + printf(" couldn't create attribute on root group using H5Acreate_by_name\n"); PART_ERROR(H5Acreate_by_name); } /* Verify the attribute has been created */ if ((attr_exists = H5Aexists(file_id, ATTRIBUTE_CREATE_ON_ROOT_ATTR_NAME2)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if attribute '%s' exists\n", - ATTRIBUTE_CREATE_ON_ROOT_ATTR_NAME2); + printf(" couldn't determine if attribute '%s' exists\n", + ATTRIBUTE_CREATE_ON_ROOT_ATTR_NAME2); PART_ERROR(H5Acreate_by_name); } if (!attr_exists) { H5_FAILED(); - HDprintf(" attribute '%s' did not exist\n", ATTRIBUTE_CREATE_ON_ROOT_ATTR_NAME2); + printf(" attribute '%s' did not exist\n", ATTRIBUTE_CREATE_ON_ROOT_ATTR_NAME2); PART_ERROR(H5Acreate_by_name); } @@ -269,8 +269,8 @@ test_create_attribute_on_dataset(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC)) { SKIPPED(); - HDprintf(" API functions for basic file, group, dataset, or attribute aren't supported with this " - "connector\n"); + printf(" API functions for basic file, group, dataset, or attribute aren't supported with this " + "connector\n"); return 0; } @@ -278,20 +278,20 @@ test_create_attribute_on_dataset(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, ATTRIBUTE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", ATTRIBUTE_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", ATTRIBUTE_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, ATTRIBUTE_CREATE_ON_DATASET_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container group '%s'\n", ATTRIBUTE_CREATE_ON_DATASET_GROUP_NAME); + printf(" couldn't create container group '%s'\n", ATTRIBUTE_CREATE_ON_DATASET_GROUP_NAME); goto error; } @@ -312,7 +312,7 @@ test_create_attribute_on_dataset(void) if ((dset_id = H5Dcreate2(group_id, ATTRIBUTE_CREATE_ON_DATASET_DSET_NAME, dset_dtype, dset_space_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create dataset\n"); + printf(" couldn't create dataset\n"); goto error; } @@ -327,21 +327,21 @@ test_create_attribute_on_dataset(void) if ((attr_id = H5Acreate2(dset_id, ATTRIBUTE_CREATE_ON_DATASET_ATTR_NAME, attr_dtype1, attr_space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create attribute\n"); + printf(" couldn't create attribute\n"); PART_ERROR(H5Acreate_on_dataset); } /* Verify the attribute has been created */ if ((attr_exists = H5Aexists(dset_id, ATTRIBUTE_CREATE_ON_DATASET_ATTR_NAME)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if attribute '%s' exists\n", - ATTRIBUTE_CREATE_ON_DATASET_ATTR_NAME); + printf(" couldn't determine if attribute '%s' exists\n", + ATTRIBUTE_CREATE_ON_DATASET_ATTR_NAME); PART_ERROR(H5Acreate_on_dataset); } if (!attr_exists) { H5_FAILED(); - HDprintf(" attribute '%s' did not exist\n", ATTRIBUTE_CREATE_ON_DATASET_ATTR_NAME); + printf(" attribute '%s' did not exist\n", ATTRIBUTE_CREATE_ON_DATASET_ATTR_NAME); PART_ERROR(H5Acreate_on_dataset); } @@ -357,21 +357,21 @@ test_create_attribute_on_dataset(void) ATTRIBUTE_CREATE_ON_DATASET_ATTR_NAME2, attr_dtype2, attr_space_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create attribute on dataset by name\n"); + printf(" couldn't create attribute on dataset by name\n"); PART_ERROR(H5Acreate_by_name_on_dataset); } /* Verify the attribute has been created */ if ((attr_exists = H5Aexists(dset_id, ATTRIBUTE_CREATE_ON_DATASET_ATTR_NAME2)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if attribute '%s' exists\n", - ATTRIBUTE_CREATE_ON_DATASET_ATTR_NAME2); + printf(" couldn't determine if attribute '%s' exists\n", + ATTRIBUTE_CREATE_ON_DATASET_ATTR_NAME2); PART_ERROR(H5Acreate_by_name_on_dataset); } if (!attr_exists) { H5_FAILED(); - HDprintf(" attribute '%s' did not exist\n", ATTRIBUTE_CREATE_ON_DATASET_ATTR_NAME2); + printf(" attribute '%s' did not exist\n", ATTRIBUTE_CREATE_ON_DATASET_ATTR_NAME2); PART_ERROR(H5Acreate_by_name_on_dataset); } @@ -453,8 +453,8 @@ test_create_attribute_on_datatype(void) !(vol_cap_flags_g & H5VL_CAP_FLAG_STORED_DATATYPES) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC)) { SKIPPED(); - HDprintf(" API functions for basic file, group, stored datatype, or attribute aren't supported " - "with this connector\n"); + printf(" API functions for basic file, group, stored datatype, or attribute aren't supported " + "with this connector\n"); return 0; } @@ -462,33 +462,33 @@ test_create_attribute_on_datatype(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, ATTRIBUTE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", ATTRIBUTE_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", ATTRIBUTE_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, ATTRIBUTE_CREATE_ON_DATATYPE_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container group '%s'\n", ATTRIBUTE_CREATE_ON_DATATYPE_GROUP_NAME); + printf(" couldn't create container group '%s'\n", ATTRIBUTE_CREATE_ON_DATATYPE_GROUP_NAME); goto error; } if ((type_id = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) { H5_FAILED(); - HDprintf(" couldn't create datatype\n"); + printf(" couldn't create datatype\n"); goto error; } if (H5Tcommit2(group_id, ATTRIBUTE_CREATE_ON_DATATYPE_DTYPE_NAME, type_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't commit datatype\n"); + printf(" couldn't commit datatype\n"); goto error; } @@ -511,19 +511,19 @@ test_create_attribute_on_datatype(void) if ((attr_id = H5Acreate2(type_id, ATTRIBUTE_CREATE_ON_DATATYPE_ATTR_NAME, attr_dtype1, space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create attribute on datatype using H5Acreate\n"); + printf(" couldn't create attribute on datatype using H5Acreate\n"); PART_ERROR(H5Acreate_on_datatype); } if ((attr_exists = H5Aexists(type_id, ATTRIBUTE_CREATE_ON_DATATYPE_ATTR_NAME)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if attribute exists\n"); + printf(" couldn't determine if attribute exists\n"); PART_ERROR(H5Acreate_on_datatype); } if (!attr_exists) { H5_FAILED(); - HDprintf(" attribute did not exist\n"); + printf(" attribute did not exist\n"); PART_ERROR(H5Acreate_on_datatype); } @@ -539,20 +539,20 @@ test_create_attribute_on_datatype(void) ATTRIBUTE_CREATE_ON_DATATYPE_ATTR_NAME2, attr_dtype2, space_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create attribute on datatype using H5Acreate_by_name\n"); + printf(" couldn't create attribute on datatype using H5Acreate_by_name\n"); PART_ERROR(H5Acreate_by_name_on_datatype); } /* Verify the attribute has been created */ if ((attr_exists = H5Aexists(type_id, ATTRIBUTE_CREATE_ON_DATATYPE_ATTR_NAME2)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if attribute exists\n"); + printf(" couldn't determine if attribute exists\n"); PART_ERROR(H5Acreate_by_name_on_datatype); } if (!attr_exists) { H5_FAILED(); - HDprintf(" attribute did not exist\n"); + printf(" attribute did not exist\n"); PART_ERROR(H5Acreate_by_name_on_datatype); } @@ -625,27 +625,27 @@ test_create_attribute_with_null_space(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC)) { SKIPPED(); - HDprintf( + printf( " API functions for basic file, group, or attribute aren't supported with this connector\n"); return 0; } if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file\n"); + printf(" couldn't open file\n"); goto error; } if ((container_group = H5Gopen2(file_id, ATTRIBUTE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group\n"); + printf(" couldn't open container group\n"); goto error; } if ((group_id = H5Gcreate2(container_group, ATTRIBUTE_CREATE_NULL_DATASPACE_TEST_SUBGROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container subgroup\n"); + printf(" couldn't create container subgroup\n"); goto error; } @@ -658,20 +658,20 @@ test_create_attribute_with_null_space(void) if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_CREATE_NULL_DATASPACE_TEST_ATTR_NAME, attr_dtype, space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create attribute\n"); + printf(" couldn't create attribute\n"); goto error; } /* Verify the attribute has been created */ if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_CREATE_NULL_DATASPACE_TEST_ATTR_NAME)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if attribute exists\n"); + printf(" couldn't determine if attribute exists\n"); goto error; } if (!attr_exists) { H5_FAILED(); - HDprintf(" attribute did not exist\n"); + printf(" attribute did not exist\n"); goto error; } @@ -680,7 +680,7 @@ test_create_attribute_with_null_space(void) if ((attr_id = H5Aopen(group_id, ATTRIBUTE_CREATE_NULL_DATASPACE_TEST_ATTR_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open attribute\n"); + printf(" couldn't open attribute\n"); goto error; } @@ -736,27 +736,27 @@ test_create_attribute_with_scalar_space(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC)) { SKIPPED(); - HDprintf( + printf( " API functions for basic file, group, or attribute aren't supported with this connector\n"); return 0; } if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file\n"); + printf(" couldn't open file\n"); goto error; } if ((container_group = H5Gopen2(file_id, ATTRIBUTE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group\n"); + printf(" couldn't open container group\n"); goto error; } if ((group_id = H5Gcreate2(container_group, ATTRIBUTE_CREATE_SCALAR_DATASPACE_TEST_SUBGROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container subgroup\n"); + printf(" couldn't create container subgroup\n"); goto error; } @@ -769,20 +769,20 @@ test_create_attribute_with_scalar_space(void) if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_CREATE_SCALAR_DATASPACE_TEST_ATTR_NAME, attr_dtype, space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create attribute\n"); + printf(" couldn't create attribute\n"); goto error; } /* Verify the attribute has been created */ if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_CREATE_SCALAR_DATASPACE_TEST_ATTR_NAME)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if attribute exists\n"); + printf(" couldn't determine if attribute exists\n"); goto error; } if (!attr_exists) { H5_FAILED(); - HDprintf(" attribute did not exist\n"); + printf(" attribute did not exist\n"); goto error; } @@ -791,7 +791,7 @@ test_create_attribute_with_scalar_space(void) if ((attr_id = H5Aopen(group_id, ATTRIBUTE_CREATE_SCALAR_DATASPACE_TEST_ATTR_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open attribute\n"); + printf(" couldn't open attribute\n"); goto error; } @@ -849,28 +849,27 @@ test_create_attribute_with_space_in_name(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC)) { SKIPPED(); - HDprintf( + printf( " API functions for basic file, group, or attribute aren't supported with this connector\n"); return 0; } if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file\n"); + printf(" couldn't open file\n"); goto error; } if ((container_group = H5Gopen2(file_id, ATTRIBUTE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group\n"); + printf(" couldn't open container group\n"); goto error; } if ((group_id = H5Gcreate2(container_group, ATTRIBUTE_CREATE_WITH_SPACE_IN_NAME_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container group '%s'\n", - ATTRIBUTE_CREATE_WITH_SPACE_IN_NAME_GROUP_NAME); + printf(" couldn't create container group '%s'\n", ATTRIBUTE_CREATE_WITH_SPACE_IN_NAME_GROUP_NAME); goto error; } @@ -884,20 +883,20 @@ test_create_attribute_with_space_in_name(void) if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_CREATE_WITH_SPACE_IN_NAME_ATTR_NAME, attr_dtype, space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create attribute\n"); + printf(" couldn't create attribute\n"); goto error; } /* Verify the attribute has been created */ if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_CREATE_WITH_SPACE_IN_NAME_ATTR_NAME)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if attribute exists\n"); + printf(" couldn't determine if attribute exists\n"); goto error; } if (!attr_exists) { H5_FAILED(); - HDprintf(" attribute did not exist\n"); + printf(" attribute did not exist\n"); goto error; } @@ -953,7 +952,7 @@ test_create_attribute_invalid_params(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC)) { SKIPPED(); - HDprintf( + printf( " API functions for basic file, group, or attribute aren't supported with this connector\n"); return 0; } @@ -962,20 +961,20 @@ test_create_attribute_invalid_params(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, ATTRIBUTE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", ATTRIBUTE_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", ATTRIBUTE_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, ATTRIBUTE_CREATE_INVALID_PARAMS_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container group\n"); + printf(" couldn't create container group\n"); goto error; } @@ -1002,7 +1001,7 @@ test_create_attribute_invalid_params(void) if (attr_id >= 0) { H5_FAILED(); - HDprintf(" created attribute using H5Acreate with an invalid loc_id!\n"); + printf(" created attribute using H5Acreate with an invalid loc_id!\n"); H5Aclose(attr_id); PART_ERROR(H5Acreate_invalid_loc_id); } @@ -1023,7 +1022,7 @@ test_create_attribute_invalid_params(void) if (attr_id >= 0) { H5_FAILED(); - HDprintf(" created attribute using H5Acreate with a NULL name!\n"); + printf(" created attribute using H5Acreate with a NULL name!\n"); H5Aclose(attr_id); PART_ERROR(H5Acreate_invalid_attr_name); } @@ -1036,7 +1035,7 @@ test_create_attribute_invalid_params(void) if (attr_id >= 0) { H5_FAILED(); - HDprintf(" created attribute using H5Acreate with an invalid name of ''!\n"); + printf(" created attribute using H5Acreate with an invalid name of ''!\n"); H5Aclose(attr_id); PART_ERROR(H5Acreate_invalid_attr_name); } @@ -1058,7 +1057,7 @@ test_create_attribute_invalid_params(void) if (attr_id >= 0) { H5_FAILED(); - HDprintf(" created attribute using H5Acreate with an invalid datatype!\n"); + printf(" created attribute using H5Acreate with an invalid datatype!\n"); H5Aclose(attr_id); PART_ERROR(H5Acreate_invalid_datatype); } @@ -1080,7 +1079,7 @@ test_create_attribute_invalid_params(void) if (attr_id >= 0) { H5_FAILED(); - HDprintf(" created attribute using H5Acreate with an invalid dataspace!\n"); + printf(" created attribute using H5Acreate with an invalid dataspace!\n"); H5Aclose(attr_id); PART_ERROR(H5Acreate_invalid_dataspace); } @@ -1102,7 +1101,7 @@ test_create_attribute_invalid_params(void) if (attr_id >= 0) { H5_FAILED(); - HDprintf(" created attribute using H5Acreate with an invalid ACPL!\n"); + printf(" created attribute using H5Acreate with an invalid ACPL!\n"); H5Aclose(attr_id); PART_ERROR(H5Acreate_invalid_acpl); } @@ -1124,7 +1123,7 @@ test_create_attribute_invalid_params(void) if (attr_id >= 0) { H5_FAILED(); - HDprintf(" created attribute using H5Acreate with an invalid AAPL!\n"); + printf(" created attribute using H5Acreate with an invalid AAPL!\n"); H5Aclose(attr_id); PART_ERROR(H5Acreate_invalid_aapl); } @@ -1147,7 +1146,7 @@ test_create_attribute_invalid_params(void) if (attr_id >= 0) { H5_FAILED(); - HDprintf(" created attribute using H5Acreate_by_name with an invalid loc_id!\n"); + printf(" created attribute using H5Acreate_by_name with an invalid loc_id!\n"); H5Aclose(attr_id); PART_ERROR(H5Acreate_by_name_invalid_loc_id); } @@ -1169,7 +1168,7 @@ test_create_attribute_invalid_params(void) if (attr_id >= 0) { H5_FAILED(); - HDprintf(" created attribute using H5Acreate_by_name with a NULL object name!\n"); + printf(" created attribute using H5Acreate_by_name with a NULL object name!\n"); H5Aclose(attr_id); PART_ERROR(H5Acreate_by_name_invalid_obj_name); } @@ -1183,8 +1182,7 @@ test_create_attribute_invalid_params(void) if (attr_id >= 0) { H5_FAILED(); - HDprintf( - " created attribute using H5Acreate_by_name with an invalid object name of ''!\n"); + printf(" created attribute using H5Acreate_by_name with an invalid object name of ''!\n"); H5Aclose(attr_id); PART_ERROR(H5Acreate_by_name_invalid_obj_name); } @@ -1206,7 +1204,7 @@ test_create_attribute_invalid_params(void) if (attr_id >= 0) { H5_FAILED(); - HDprintf(" created attribute using H5Acreate_by_name with a NULL attribute name!\n"); + printf(" created attribute using H5Acreate_by_name with a NULL attribute name!\n"); H5Aclose(attr_id); PART_ERROR(H5Acreate_by_name_invalid_attr_name); } @@ -1220,7 +1218,7 @@ test_create_attribute_invalid_params(void) if (attr_id >= 0) { H5_FAILED(); - HDprintf( + printf( " created attribute using H5Acreate_by_name with an invalid attribute name of ''!\n"); H5Aclose(attr_id); PART_ERROR(H5Acreate_by_name_invalid_attr_name); @@ -1244,7 +1242,7 @@ test_create_attribute_invalid_params(void) if (attr_id >= 0) { H5_FAILED(); - HDprintf(" created attribute using H5Acreate_by_name with an invalid datatype!\n"); + printf(" created attribute using H5Acreate_by_name with an invalid datatype!\n"); H5Aclose(attr_id); PART_ERROR(H5Acreate_by_name_invalid_datatype); } @@ -1267,7 +1265,7 @@ test_create_attribute_invalid_params(void) if (attr_id >= 0) { H5_FAILED(); - HDprintf(" created attribute using H5Acreate_by_name with an invalid dataspace!\n"); + printf(" created attribute using H5Acreate_by_name with an invalid dataspace!\n"); H5Aclose(attr_id); PART_ERROR(H5Acreate_by_name_invalid_dataspace); } @@ -1290,7 +1288,7 @@ test_create_attribute_invalid_params(void) if (attr_id >= 0) { H5_FAILED(); - HDprintf(" created attribute using H5Acreate_by_name with an invalid ACPL!\n"); + printf(" created attribute using H5Acreate_by_name with an invalid ACPL!\n"); H5Aclose(attr_id); PART_ERROR(H5Acreate_by_name_invalid_acpl); } @@ -1313,7 +1311,7 @@ test_create_attribute_invalid_params(void) if (attr_id >= 0) { H5_FAILED(); - HDprintf(" created attribute using H5Acreate_by_name with an invalid AAPL!\n"); + printf(" created attribute using H5Acreate_by_name with an invalid AAPL!\n"); H5Aclose(attr_id); PART_ERROR(H5Acreate_by_name_invalid_aapl); } @@ -1336,7 +1334,7 @@ test_create_attribute_invalid_params(void) if (attr_id >= 0) { H5_FAILED(); - HDprintf(" created attribute using H5Acreate_by_name with an invalid LAPL!\n"); + printf(" created attribute using H5Acreate_by_name with an invalid LAPL!\n"); H5Aclose(attr_id); PART_ERROR(H5Acreate_by_name_invalid_lapl); } @@ -1398,8 +1396,8 @@ test_open_attribute(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC)) { SKIPPED(); - HDprintf(" API functions for basic file, group, or attribute aren't supported " - "with this connector\n"); + printf(" API functions for basic file, group, or attribute aren't supported " + "with this connector\n"); return 0; } @@ -1407,26 +1405,26 @@ test_open_attribute(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, ATTRIBUTE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", ATTRIBUTE_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", ATTRIBUTE_TEST_GROUP_NAME); goto error; } if ((gcpl_id = H5Pcreate(H5P_GROUP_CREATE)) < 0) { H5_FAILED(); - HDprintf(" couldn't create GCPL for attribute creation order tracking\n"); + printf(" couldn't create GCPL for attribute creation order tracking\n"); goto error; } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (H5Pset_attr_creation_order(gcpl_id, H5P_CRT_ORDER_TRACKED) < 0) { H5_FAILED(); - HDprintf(" couldn't set attribute creation order tracking\n"); + printf(" couldn't set attribute creation order tracking\n"); goto error; } } @@ -1434,7 +1432,7 @@ test_open_attribute(void) if ((group_id = H5Gcreate2(container_group, ATTRIBUTE_OPEN_TEST_GROUP_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container group '%s'\n", ATTRIBUTE_OPEN_TEST_GROUP_NAME); + printf(" couldn't create container group '%s'\n", ATTRIBUTE_OPEN_TEST_GROUP_NAME); goto error; } @@ -1448,7 +1446,7 @@ test_open_attribute(void) if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_OPEN_TEST_ATTR_NAME, attr_type, space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create attribute '%s'\n", ATTRIBUTE_OPEN_TEST_ATTR_NAME); + printf(" couldn't create attribute '%s'\n", ATTRIBUTE_OPEN_TEST_ATTR_NAME); goto error; } @@ -1458,7 +1456,7 @@ test_open_attribute(void) if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_OPEN_TEST_ATTR_NAME2, attr_type, space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create attribute '%s'\n", ATTRIBUTE_OPEN_TEST_ATTR_NAME2); + printf(" couldn't create attribute '%s'\n", ATTRIBUTE_OPEN_TEST_ATTR_NAME2); goto error; } @@ -1468,7 +1466,7 @@ test_open_attribute(void) if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_OPEN_TEST_ATTR_NAME3, attr_type, space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create attribute '%s'\n", ATTRIBUTE_OPEN_TEST_ATTR_NAME3); + printf(" couldn't create attribute '%s'\n", ATTRIBUTE_OPEN_TEST_ATTR_NAME3); goto error; } @@ -1485,13 +1483,13 @@ test_open_attribute(void) if ((attr_id = H5Aopen(group_id, ATTRIBUTE_OPEN_TEST_ATTR_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open attribute '%s' using H5Aopen\n", ATTRIBUTE_OPEN_TEST_ATTR_NAME); + printf(" couldn't open attribute '%s' using H5Aopen\n", ATTRIBUTE_OPEN_TEST_ATTR_NAME); PART_ERROR(H5Aopen); } if (H5Aclose(attr_id) < 0) { H5_FAILED(); - HDprintf(" couldn't close attribute '%s'\n", ATTRIBUTE_OPEN_TEST_ATTR_NAME); + printf(" couldn't close attribute '%s'\n", ATTRIBUTE_OPEN_TEST_ATTR_NAME); PART_ERROR(H5Aopen); } @@ -1506,14 +1504,14 @@ test_open_attribute(void) if ((attr_id = H5Aopen_by_name(container_group, ATTRIBUTE_OPEN_TEST_GROUP_NAME, ATTRIBUTE_OPEN_TEST_ATTR_NAME, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open attribute '%s' using H5Aopen_by_name\n", - ATTRIBUTE_OPEN_TEST_ATTR_NAME); + printf(" couldn't open attribute '%s' using H5Aopen_by_name\n", + ATTRIBUTE_OPEN_TEST_ATTR_NAME); PART_ERROR(H5Aopen_by_name); } if (H5Aclose(attr_id) < 0) { H5_FAILED(); - HDprintf(" couldn't close attribute '%s'\n", ATTRIBUTE_OPEN_TEST_ATTR_NAME); + printf(" couldn't close attribute '%s'\n", ATTRIBUTE_OPEN_TEST_ATTR_NAME); PART_ERROR(H5Aopen_by_name); } @@ -1527,52 +1525,52 @@ test_open_attribute(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" creation order tracking is not supported with this VOL connector\n"); + printf(" creation order tracking is not supported with this VOL connector\n"); PART_EMPTY(H5Aopen_by_idx_crt_order_increasing); } if ((attr_id = H5Aopen_by_idx(container_group, ATTRIBUTE_OPEN_TEST_GROUP_NAME, H5_INDEX_CRT_ORDER, H5_ITER_INC, 0, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open attribute '%s' at index %d using H5Aopen_by_idx by creation " - "order in increasing order\n", - ATTRIBUTE_OPEN_TEST_ATTR_NAME, 0); + printf(" couldn't open attribute '%s' at index %d using H5Aopen_by_idx by creation " + "order in increasing order\n", + ATTRIBUTE_OPEN_TEST_ATTR_NAME, 0); PART_ERROR(H5Aopen_by_idx_crt_order_increasing); } if (H5Aclose(attr_id) < 0) { H5_FAILED(); - HDprintf(" couldn't close attribute '%s'\n", ATTRIBUTE_OPEN_TEST_ATTR_NAME); + printf(" couldn't close attribute '%s'\n", ATTRIBUTE_OPEN_TEST_ATTR_NAME); PART_ERROR(H5Aopen_by_idx_crt_order_increasing); } if ((attr_id = H5Aopen_by_idx(container_group, ATTRIBUTE_OPEN_TEST_GROUP_NAME, H5_INDEX_CRT_ORDER, H5_ITER_INC, 1, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open attribute '%s' at index %d using H5Aopen_by_idx by creation " - "order in increasing order\n", - ATTRIBUTE_OPEN_TEST_ATTR_NAME2, 1); + printf(" couldn't open attribute '%s' at index %d using H5Aopen_by_idx by creation " + "order in increasing order\n", + ATTRIBUTE_OPEN_TEST_ATTR_NAME2, 1); PART_ERROR(H5Aopen_by_idx_crt_order_increasing); } if (H5Aclose(attr_id) < 0) { H5_FAILED(); - HDprintf(" couldn't close attribute '%s'\n", ATTRIBUTE_OPEN_TEST_ATTR_NAME2); + printf(" couldn't close attribute '%s'\n", ATTRIBUTE_OPEN_TEST_ATTR_NAME2); PART_ERROR(H5Aopen_by_idx_crt_order_increasing); } if ((attr_id = H5Aopen_by_idx(container_group, ATTRIBUTE_OPEN_TEST_GROUP_NAME, H5_INDEX_CRT_ORDER, H5_ITER_INC, 2, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open attribute '%s' at index %d using H5Aopen_by_idx by creation " - "order in increasing order\n", - ATTRIBUTE_OPEN_TEST_ATTR_NAME3, 2); + printf(" couldn't open attribute '%s' at index %d using H5Aopen_by_idx by creation " + "order in increasing order\n", + ATTRIBUTE_OPEN_TEST_ATTR_NAME3, 2); PART_ERROR(H5Aopen_by_idx_crt_order_increasing); } if (H5Aclose(attr_id) < 0) { H5_FAILED(); - HDprintf(" couldn't close attribute '%s'\n", ATTRIBUTE_OPEN_TEST_ATTR_NAME3); + printf(" couldn't close attribute '%s'\n", ATTRIBUTE_OPEN_TEST_ATTR_NAME3); PART_ERROR(H5Aopen_by_idx_crt_order_increasing); } @@ -1586,52 +1584,52 @@ test_open_attribute(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" creation order tracking is not supported with this VOL connector\n"); + printf(" creation order tracking is not supported with this VOL connector\n"); PART_EMPTY(H5Aopen_by_idx_crt_order_decreasing); } if ((attr_id = H5Aopen_by_idx(container_group, ATTRIBUTE_OPEN_TEST_GROUP_NAME, H5_INDEX_CRT_ORDER, H5_ITER_DEC, 2, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open attribute '%s' at index %d using H5Aopen_by_idx by creation " - "order in decreasing order\n", - ATTRIBUTE_OPEN_TEST_ATTR_NAME, 2); + printf(" couldn't open attribute '%s' at index %d using H5Aopen_by_idx by creation " + "order in decreasing order\n", + ATTRIBUTE_OPEN_TEST_ATTR_NAME, 2); PART_ERROR(H5Aopen_by_idx_crt_order_decreasing); } if (H5Aclose(attr_id) < 0) { H5_FAILED(); - HDprintf(" couldn't close attribute '%s'\n", ATTRIBUTE_OPEN_TEST_ATTR_NAME); + printf(" couldn't close attribute '%s'\n", ATTRIBUTE_OPEN_TEST_ATTR_NAME); PART_ERROR(H5Aopen_by_idx_crt_order_decreasing); } if ((attr_id = H5Aopen_by_idx(container_group, ATTRIBUTE_OPEN_TEST_GROUP_NAME, H5_INDEX_CRT_ORDER, H5_ITER_DEC, 1, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open attribute '%s' at index %d using H5Aopen_by_idx by creation " - "order in decreasing order\n", - ATTRIBUTE_OPEN_TEST_ATTR_NAME2, 1); + printf(" couldn't open attribute '%s' at index %d using H5Aopen_by_idx by creation " + "order in decreasing order\n", + ATTRIBUTE_OPEN_TEST_ATTR_NAME2, 1); PART_ERROR(H5Aopen_by_idx_crt_order_decreasing); } if (H5Aclose(attr_id) < 0) { H5_FAILED(); - HDprintf(" couldn't close attribute '%s'\n", ATTRIBUTE_OPEN_TEST_ATTR_NAME2); + printf(" couldn't close attribute '%s'\n", ATTRIBUTE_OPEN_TEST_ATTR_NAME2); PART_ERROR(H5Aopen_by_idx_crt_order_decreasing); } if ((attr_id = H5Aopen_by_idx(container_group, ATTRIBUTE_OPEN_TEST_GROUP_NAME, H5_INDEX_CRT_ORDER, H5_ITER_DEC, 0, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open attribute '%s' at index %d using H5Aopen_by_idx by creation " - "order in decreasing order\n", - ATTRIBUTE_OPEN_TEST_ATTR_NAME3, 0); + printf(" couldn't open attribute '%s' at index %d using H5Aopen_by_idx by creation " + "order in decreasing order\n", + ATTRIBUTE_OPEN_TEST_ATTR_NAME3, 0); PART_ERROR(H5Aopen_by_idx_crt_order_decreasing); } if (H5Aclose(attr_id) < 0) { H5_FAILED(); - HDprintf(" couldn't close attribute '%s'\n", ATTRIBUTE_OPEN_TEST_ATTR_NAME3); + printf(" couldn't close attribute '%s'\n", ATTRIBUTE_OPEN_TEST_ATTR_NAME3); PART_ERROR(H5Aopen_by_idx_crt_order_decreasing); } @@ -1646,45 +1644,45 @@ test_open_attribute(void) if ((attr_id = H5Aopen_by_idx(container_group, ATTRIBUTE_OPEN_TEST_GROUP_NAME, H5_INDEX_NAME, H5_ITER_INC, 0, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open attribute '%s' at index %d using H5Aopen_by_idx by alphabetical " - "order in increasing order\n", - ATTRIBUTE_OPEN_TEST_ATTR_NAME, 0); + printf(" couldn't open attribute '%s' at index %d using H5Aopen_by_idx by alphabetical " + "order in increasing order\n", + ATTRIBUTE_OPEN_TEST_ATTR_NAME, 0); PART_ERROR(H5Aopen_by_idx_name_order_increasing); } if (H5Aclose(attr_id) < 0) { H5_FAILED(); - HDprintf(" couldn't close attribute '%s'\n", ATTRIBUTE_OPEN_TEST_ATTR_NAME); + printf(" couldn't close attribute '%s'\n", ATTRIBUTE_OPEN_TEST_ATTR_NAME); PART_ERROR(H5Aopen_by_idx_name_order_increasing); } if ((attr_id = H5Aopen_by_idx(container_group, ATTRIBUTE_OPEN_TEST_GROUP_NAME, H5_INDEX_NAME, H5_ITER_INC, 1, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open attribute '%s' at index %d using H5Aopen_by_idx by alphabetical " - "order in increasing order\n", - ATTRIBUTE_OPEN_TEST_ATTR_NAME2, 1); + printf(" couldn't open attribute '%s' at index %d using H5Aopen_by_idx by alphabetical " + "order in increasing order\n", + ATTRIBUTE_OPEN_TEST_ATTR_NAME2, 1); PART_ERROR(H5Aopen_by_idx_name_order_increasing); } if (H5Aclose(attr_id) < 0) { H5_FAILED(); - HDprintf(" couldn't close attribute '%s'\n", ATTRIBUTE_OPEN_TEST_ATTR_NAME2); + printf(" couldn't close attribute '%s'\n", ATTRIBUTE_OPEN_TEST_ATTR_NAME2); PART_ERROR(H5Aopen_by_idx_name_order_increasing); } if ((attr_id = H5Aopen_by_idx(container_group, ATTRIBUTE_OPEN_TEST_GROUP_NAME, H5_INDEX_NAME, H5_ITER_INC, 2, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open attribute '%s' at index %d using H5Aopen_by_idx by alphabetical " - "order in increasing order\n", - ATTRIBUTE_OPEN_TEST_ATTR_NAME3, 2); + printf(" couldn't open attribute '%s' at index %d using H5Aopen_by_idx by alphabetical " + "order in increasing order\n", + ATTRIBUTE_OPEN_TEST_ATTR_NAME3, 2); PART_ERROR(H5Aopen_by_idx_name_order_increasing); } if (H5Aclose(attr_id) < 0) { H5_FAILED(); - HDprintf(" couldn't close attribute '%s'\n", ATTRIBUTE_OPEN_TEST_ATTR_NAME3); + printf(" couldn't close attribute '%s'\n", ATTRIBUTE_OPEN_TEST_ATTR_NAME3); PART_ERROR(H5Aopen_by_idx_name_order_increasing); } @@ -1699,45 +1697,45 @@ test_open_attribute(void) if ((attr_id = H5Aopen_by_idx(container_group, ATTRIBUTE_OPEN_TEST_GROUP_NAME, H5_INDEX_NAME, H5_ITER_DEC, 2, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open attribute '%s' at index %d using H5Aopen_by_idx by " - "alphabetical order in decreasing order\n", - ATTRIBUTE_OPEN_TEST_ATTR_NAME, 2); + printf(" couldn't open attribute '%s' at index %d using H5Aopen_by_idx by " + "alphabetical order in decreasing order\n", + ATTRIBUTE_OPEN_TEST_ATTR_NAME, 2); PART_ERROR(H5Aopen_by_idx_name_order_decreasing); } if (H5Aclose(attr_id) < 0) { H5_FAILED(); - HDprintf(" couldn't close attribute '%s'\n", ATTRIBUTE_OPEN_TEST_ATTR_NAME); + printf(" couldn't close attribute '%s'\n", ATTRIBUTE_OPEN_TEST_ATTR_NAME); PART_ERROR(H5Aopen_by_idx_name_order_decreasing); } if ((attr_id = H5Aopen_by_idx(container_group, ATTRIBUTE_OPEN_TEST_GROUP_NAME, H5_INDEX_NAME, H5_ITER_DEC, 1, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open attribute '%s' at index %d using H5Aopen_by_idx by " - "alphabetical order in decreasing order\n", - ATTRIBUTE_OPEN_TEST_ATTR_NAME2, 1); + printf(" couldn't open attribute '%s' at index %d using H5Aopen_by_idx by " + "alphabetical order in decreasing order\n", + ATTRIBUTE_OPEN_TEST_ATTR_NAME2, 1); PART_ERROR(H5Aopen_by_idx_name_order_decreasing); } if (H5Aclose(attr_id) < 0) { H5_FAILED(); - HDprintf(" couldn't close attribute '%s'\n", ATTRIBUTE_OPEN_TEST_ATTR_NAME2); + printf(" couldn't close attribute '%s'\n", ATTRIBUTE_OPEN_TEST_ATTR_NAME2); PART_ERROR(H5Aopen_by_idx_name_order_decreasing); } if ((attr_id = H5Aopen_by_idx(container_group, ATTRIBUTE_OPEN_TEST_GROUP_NAME, H5_INDEX_NAME, H5_ITER_DEC, 0, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open attribute '%s' at index %d using H5Aopen_by_idx by " - "alphabetical order in decreasing order\n", - ATTRIBUTE_OPEN_TEST_ATTR_NAME3, 0); + printf(" couldn't open attribute '%s' at index %d using H5Aopen_by_idx by " + "alphabetical order in decreasing order\n", + ATTRIBUTE_OPEN_TEST_ATTR_NAME3, 0); PART_ERROR(H5Aopen_by_idx_name_order_decreasing); } if (H5Aclose(attr_id) < 0) { H5_FAILED(); - HDprintf(" couldn't close attribute '%s'\n", ATTRIBUTE_OPEN_TEST_ATTR_NAME3); + printf(" couldn't close attribute '%s'\n", ATTRIBUTE_OPEN_TEST_ATTR_NAME3); PART_ERROR(H5Aopen_by_idx_name_order_decreasing); } @@ -1801,7 +1799,7 @@ test_open_attribute_invalid_params(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC)) { SKIPPED(); - HDprintf( + printf( " API functions for basic file, group, or attribute aren't supported with this connector\n"); return 0; } @@ -1810,20 +1808,20 @@ test_open_attribute_invalid_params(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, ATTRIBUTE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", ATTRIBUTE_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", ATTRIBUTE_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container group '%s'\n", ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_GROUP_NAME); + printf(" couldn't create container group '%s'\n", ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_GROUP_NAME); goto error; } @@ -1837,7 +1835,7 @@ test_open_attribute_invalid_params(void) if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME, attr_type, space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create attribute '%s'\n", ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME); + printf(" couldn't create attribute '%s'\n", ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME); goto error; } @@ -1860,8 +1858,8 @@ test_open_attribute_invalid_params(void) if (attr_id >= 0) { H5_FAILED(); - HDprintf(" opened attribute '%s' using H5Aopen with an invalid loc_id!\n", - ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME); + printf(" opened attribute '%s' using H5Aopen with an invalid loc_id!\n", + ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME); H5Aclose(attr_id); PART_ERROR(H5Aopen_invalid_loc_id); } @@ -1882,8 +1880,8 @@ test_open_attribute_invalid_params(void) if (attr_id >= 0) { H5_FAILED(); - HDprintf(" opened attribute '%s' using H5Aopen with a NULL attribute name!\n", - ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME); + printf(" opened attribute '%s' using H5Aopen with a NULL attribute name!\n", + ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME); H5Aclose(attr_id); PART_ERROR(H5Aopen_invalid_attr_name); } @@ -1896,8 +1894,8 @@ test_open_attribute_invalid_params(void) if (attr_id >= 0) { H5_FAILED(); - HDprintf(" opened attribute '%s' using H5Aopen with an invalid attribute name of ''!\n", - ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME); + printf(" opened attribute '%s' using H5Aopen with an invalid attribute name of ''!\n", + ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME); H5Aclose(attr_id); PART_ERROR(H5Aopen_invalid_attr_name); } @@ -1918,8 +1916,8 @@ test_open_attribute_invalid_params(void) if (attr_id >= 0) { H5_FAILED(); - HDprintf(" opened attribute '%s' using H5Aopen with an invalid AAPL!\n", - ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME); + printf(" opened attribute '%s' using H5Aopen with an invalid AAPL!\n", + ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME); H5Aclose(attr_id); PART_ERROR(H5Aopen_invalid_aapl); } @@ -1942,8 +1940,8 @@ test_open_attribute_invalid_params(void) if (attr_id >= 0) { H5_FAILED(); - HDprintf(" opened attribute '%s' using H5Aopen_by_name with an invalid loc_id!\n", - ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME); + printf(" opened attribute '%s' using H5Aopen_by_name with an invalid loc_id!\n", + ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME); H5Aclose(attr_id); PART_ERROR(H5Aopen_by_name_invalid_loc_id); } @@ -1965,8 +1963,8 @@ test_open_attribute_invalid_params(void) if (attr_id >= 0) { H5_FAILED(); - HDprintf(" opened attribute '%s' using H5Aopen_by_name with a NULL object name!\n", - ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME); + printf(" opened attribute '%s' using H5Aopen_by_name with a NULL object name!\n", + ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME); H5Aclose(attr_id); PART_ERROR(H5Aopen_by_name_invalid_obj_name); } @@ -1980,9 +1978,8 @@ test_open_attribute_invalid_params(void) if (attr_id >= 0) { H5_FAILED(); - HDprintf( - " opened attribute '%s' using H5Aopen_by_name with an invalid object name of ''!\n", - ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME); + printf(" opened attribute '%s' using H5Aopen_by_name with an invalid object name of ''!\n", + ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME); H5Aclose(attr_id); PART_ERROR(H5Aopen_by_name_invalid_obj_name); } @@ -2004,8 +2001,8 @@ test_open_attribute_invalid_params(void) if (attr_id >= 0) { H5_FAILED(); - HDprintf(" opened attribute '%s' using H5Aopen_by_name with a NULL attribute name!\n", - ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME); + printf(" opened attribute '%s' using H5Aopen_by_name with a NULL attribute name!\n", + ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME); H5Aclose(attr_id); PART_ERROR(H5Aopen_by_name_invalid_attr_name); } @@ -2019,7 +2016,7 @@ test_open_attribute_invalid_params(void) if (attr_id >= 0) { H5_FAILED(); - HDprintf( + printf( " opened attribute '%s' using H5Aopen_by_name with an invalid attribute name of ''!\n", ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME); H5Aclose(attr_id); @@ -2044,8 +2041,8 @@ test_open_attribute_invalid_params(void) if (attr_id >= 0) { H5_FAILED(); - HDprintf(" opened attribute '%s' using H5Aopen_by_name with an invalid AAPL!\n", - ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME); + printf(" opened attribute '%s' using H5Aopen_by_name with an invalid AAPL!\n", + ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME); H5Aclose(attr_id); PART_ERROR(H5Aopen_by_name_invalid_aapl); } @@ -2068,8 +2065,8 @@ test_open_attribute_invalid_params(void) if (attr_id >= 0) { H5_FAILED(); - HDprintf(" opened attribute '%s' using H5Aopen_by_name with an invalid LAPL!\n", - ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME); + printf(" opened attribute '%s' using H5Aopen_by_name with an invalid LAPL!\n", + ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME); H5Aclose(attr_id); PART_ERROR(H5Aopen_by_name_invalid_lapl); } @@ -2091,8 +2088,8 @@ test_open_attribute_invalid_params(void) if (attr_id >= 0) { H5_FAILED(); - HDprintf(" opened attribute '%s' using H5Aopen_by_idx with an invalid loc_id!\n", - ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME); + printf(" opened attribute '%s' using H5Aopen_by_idx with an invalid loc_id!\n", + ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME); H5Aclose(attr_id); PART_ERROR(H5Aopen_by_idx_invalid_loc_id); } @@ -2114,8 +2111,8 @@ test_open_attribute_invalid_params(void) if (attr_id >= 0) { H5_FAILED(); - HDprintf(" opened attribute '%s' using H5Aopen_by_idx with a NULL object name!\n", - ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME); + printf(" opened attribute '%s' using H5Aopen_by_idx with a NULL object name!\n", + ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME); H5Aclose(attr_id); PART_ERROR(H5Aopen_by_idx_invalid_obj_name); } @@ -2129,9 +2126,8 @@ test_open_attribute_invalid_params(void) if (attr_id >= 0) { H5_FAILED(); - HDprintf( - " opened attribute '%s' using H5Aopen_by_idx with an invalid object name of ''!\n", - ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME); + printf(" opened attribute '%s' using H5Aopen_by_idx with an invalid object name of ''!\n", + ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME); H5Aclose(attr_id); PART_ERROR(H5Aopen_by_idx_invalid_obj_name); } @@ -2153,9 +2149,9 @@ test_open_attribute_invalid_params(void) if (attr_id >= 0) { H5_FAILED(); - HDprintf(" opened attribute '%s' using H5Aopen_by_idx with invalid index type " - "H5_INDEX_UNKNOWN!\n", - ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME); + printf(" opened attribute '%s' using H5Aopen_by_idx with invalid index type " + "H5_INDEX_UNKNOWN!\n", + ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME); H5Aclose(attr_id); PART_ERROR(H5Aopen_by_idx_invalid_index_type); } @@ -2169,9 +2165,8 @@ test_open_attribute_invalid_params(void) if (attr_id >= 0) { H5_FAILED(); - HDprintf( - " opened attribute '%s' using H5Aopen_by_idx with invalid index type H5_INDEX_N!\n", - ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME); + printf(" opened attribute '%s' using H5Aopen_by_idx with invalid index type H5_INDEX_N!\n", + ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME); H5Aclose(attr_id); PART_ERROR(H5Aopen_by_idx_invalid_index_type); } @@ -2193,9 +2188,9 @@ test_open_attribute_invalid_params(void) if (attr_id >= 0) { H5_FAILED(); - HDprintf(" opened attribute '%s' using H5Aopen_by_idx with invalid iteration order " - "H5_ITER_UNKNOWN!\n", - ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME); + printf(" opened attribute '%s' using H5Aopen_by_idx with invalid iteration order " + "H5_ITER_UNKNOWN!\n", + ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME); H5Aclose(attr_id); PART_ERROR(H5Aopen_by_idx_invalid_iter_order); } @@ -2209,9 +2204,9 @@ test_open_attribute_invalid_params(void) if (attr_id >= 0) { H5_FAILED(); - HDprintf(" opened attribute '%s' using H5Aopen_by_idx with invalid iteration order " - "H5_ITER_N!\n", - ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME); + printf(" opened attribute '%s' using H5Aopen_by_idx with invalid iteration order " + "H5_ITER_N!\n", + ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME); H5Aclose(attr_id); PART_ERROR(H5Aopen_by_idx_invalid_iter_order); } @@ -2233,8 +2228,8 @@ test_open_attribute_invalid_params(void) if (attr_id >= 0) { H5_FAILED(); - HDprintf(" opened attribute '%s' using H5Aopen_by_idx with an invalid AAPL!\n", - ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME); + printf(" opened attribute '%s' using H5Aopen_by_idx with an invalid AAPL!\n", + ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME); H5Aclose(attr_id); PART_ERROR(H5Aopen_by_idx_invalid_aapl); } @@ -2256,8 +2251,8 @@ test_open_attribute_invalid_params(void) if (attr_id >= 0) { H5_FAILED(); - HDprintf(" opened attribute '%s' using H5Aopen_by_idx with an invalid LAPL!\n", - ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME); + printf(" opened attribute '%s' using H5Aopen_by_idx with an invalid LAPL!\n", + ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME); H5Aclose(attr_id); PART_ERROR(H5Aopen_by_idx_invalid_lapl); } @@ -2323,27 +2318,27 @@ test_write_attribute(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_FLUSH_REFRESH)) { SKIPPED(); - HDprintf(" API functions for basic file, group, attribute, or file flush aren't supported with " - "this connector\n"); + printf(" API functions for basic file, group, attribute, or file flush aren't supported with " + "this connector\n"); return 0; } if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file\n"); + printf(" couldn't open file\n"); goto error; } if ((container_group = H5Gopen2(file_id, ATTRIBUTE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group\n"); + printf(" couldn't open container group\n"); goto error; } if ((group_id = H5Gcreate2(container_group, ATTRIBUTE_WRITE_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container group '%s'\n", ATTRIBUTE_WRITE_TEST_GROUP_NAME); + printf(" couldn't create container group '%s'\n", ATTRIBUTE_WRITE_TEST_GROUP_NAME); goto error; } @@ -2353,20 +2348,20 @@ test_write_attribute(void) if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_WRITE_TEST_ATTR_NAME, ATTRIBUTE_WRITE_TEST_ATTR_DTYPE, space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create attribute\n"); + printf(" couldn't create attribute\n"); goto error; } /* Verify the attribute has been created */ if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_WRITE_TEST_ATTR_NAME)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if attribute exists\n"); + printf(" couldn't determine if attribute exists\n"); goto error; } if (!attr_exists) { H5_FAILED(); - HDprintf(" attribute did not exist\n"); + printf(" attribute did not exist\n"); goto error; } @@ -2374,7 +2369,7 @@ test_write_attribute(void) data_size *= dims[i]; data_size *= ATTRIBUTE_WRITE_TEST_ATTR_DTYPE_SIZE; - if (NULL == (data = HDmalloc(data_size))) + if (NULL == (data = malloc(data_size))) TEST_ERROR; for (i = 0; i < data_size / ATTRIBUTE_WRITE_TEST_ATTR_DTYPE_SIZE; i++) @@ -2382,19 +2377,19 @@ test_write_attribute(void) if (H5Awrite(attr_id, ATTRIBUTE_WRITE_TEST_ATTR_DTYPE, data) < 0) { H5_FAILED(); - HDprintf(" couldn't write to attribute\n"); + printf(" couldn't write to attribute\n"); goto error; } /* Make sure that the attribute can be flushed to the file */ if (H5Fflush(file_id, H5F_SCOPE_GLOBAL) < 0) { H5_FAILED(); - HDprintf(" couldn't flush the attribute\n"); + printf(" couldn't flush the attribute\n"); goto error; } if (data) { - HDfree(data); + free(data); data = NULL; } @@ -2417,7 +2412,7 @@ error: H5E_BEGIN_TRY { if (data) - HDfree(data); + free(data); H5Sclose(space_id); H5Aclose(attr_id); H5Gclose(group_id); @@ -2453,7 +2448,7 @@ test_write_attribute_invalid_params(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC)) { SKIPPED(); - HDprintf( + printf( " API functions for basic file, group, or attribute aren't supported with this connector\n"); return 0; } @@ -2462,21 +2457,20 @@ test_write_attribute_invalid_params(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, ATTRIBUTE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", ATTRIBUTE_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", ATTRIBUTE_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, ATTRIBUTE_WRITE_INVALID_PARAMS_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container group '%s'\n", - ATTRIBUTE_WRITE_INVALID_PARAMS_TEST_GROUP_NAME); + printf(" couldn't create container group '%s'\n", ATTRIBUTE_WRITE_INVALID_PARAMS_TEST_GROUP_NAME); goto error; } @@ -2488,20 +2482,20 @@ test_write_attribute_invalid_params(void) ATTRIBUTE_WRITE_INVALID_PARAMS_TEST_ATTR_DTYPE, space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create attribute\n"); + printf(" couldn't create attribute\n"); goto error; } /* Verify the attribute has been created */ if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_WRITE_INVALID_PARAMS_TEST_ATTR_NAME)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if attribute exists\n"); + printf(" couldn't determine if attribute exists\n"); goto error; } if (!attr_exists) { H5_FAILED(); - HDprintf(" attribute did not exist\n"); + printf(" attribute did not exist\n"); goto error; } @@ -2509,7 +2503,7 @@ test_write_attribute_invalid_params(void) data_size *= dims[i]; data_size *= ATTRIBUTE_WRITE_INVALID_PARAMS_TEST_ATTR_DTYPE_SIZE; - if (NULL == (data = HDmalloc(data_size))) + if (NULL == (data = malloc(data_size))) TEST_ERROR; for (i = 0; i < data_size / ATTRIBUTE_WRITE_INVALID_PARAMS_TEST_ATTR_DTYPE_SIZE; i++) @@ -2531,7 +2525,7 @@ test_write_attribute_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" wrote to attribute using an invalid attr_id!\n"); + printf(" wrote to attribute using an invalid attr_id!\n"); PART_ERROR(H5Awrite_invalid_attr_id); } @@ -2551,7 +2545,7 @@ test_write_attribute_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" wrote to attribute using an invalid datatype!\n"); + printf(" wrote to attribute using an invalid datatype!\n"); PART_ERROR(H5Awrite_invalid_datatype); } @@ -2571,7 +2565,7 @@ test_write_attribute_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" wrote to attribute using an invalid data buffer!\n"); + printf(" wrote to attribute using an invalid data buffer!\n"); PART_ERROR(H5Awrite_invalid_data_buf); } @@ -2584,7 +2578,7 @@ test_write_attribute_invalid_params(void) TESTING_2("test cleanup"); if (data) { - HDfree(data); + free(data); data = NULL; } @@ -2607,7 +2601,7 @@ error: H5E_BEGIN_TRY { if (data) - HDfree(data); + free(data); H5Sclose(space_id); H5Aclose(attr_id); H5Gclose(group_id); @@ -2644,27 +2638,27 @@ test_read_attribute(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC)) { SKIPPED(); - HDprintf( + printf( " API functions for basic file, group, or attribute aren't supported with this connector\n"); return 0; } if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, ATTRIBUTE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", ATTRIBUTE_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", ATTRIBUTE_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, ATTRIBUTE_READ_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container group '%s'\n", ATTRIBUTE_READ_TEST_GROUP_NAME); + printf(" couldn't create container group '%s'\n", ATTRIBUTE_READ_TEST_GROUP_NAME); goto error; } @@ -2674,20 +2668,20 @@ test_read_attribute(void) if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_READ_TEST_ATTR_NAME, ATTRIBUTE_READ_TEST_ATTR_DTYPE, space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create attribute\n"); + printf(" couldn't create attribute\n"); goto error; } /* Verify the attribute has been created */ if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_READ_TEST_ATTR_NAME)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if attribute exists\n"); + printf(" couldn't determine if attribute exists\n"); goto error; } if (!attr_exists) { H5_FAILED(); - HDprintf(" attribute did not exist\n"); + printf(" attribute did not exist\n"); goto error; } @@ -2695,9 +2689,9 @@ test_read_attribute(void) data_size *= dims[i]; data_size *= ATTRIBUTE_READ_TEST_ATTR_DTYPE_SIZE; - if (NULL == (data = HDmalloc(data_size))) + if (NULL == (data = malloc(data_size))) TEST_ERROR; - if (NULL == (read_buf = HDcalloc(1, data_size))) + if (NULL == (read_buf = calloc(1, data_size))) TEST_ERROR; for (i = 0; i < data_size / ATTRIBUTE_READ_TEST_ATTR_DTYPE_SIZE; i++) @@ -2705,12 +2699,12 @@ test_read_attribute(void) if (H5Awrite(attr_id, ATTRIBUTE_READ_TEST_ATTR_DTYPE, data) < 0) { H5_FAILED(); - HDprintf(" couldn't write to attribute\n"); + printf(" couldn't write to attribute\n"); goto error; } if (data) { - HDfree(data); + free(data); data = NULL; } @@ -2719,26 +2713,26 @@ test_read_attribute(void) if ((attr_id = H5Aopen(group_id, ATTRIBUTE_READ_TEST_ATTR_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open attribute\n"); + printf(" couldn't open attribute\n"); goto error; } if (H5Aread(attr_id, ATTRIBUTE_READ_TEST_ATTR_DTYPE, read_buf) < 0) { H5_FAILED(); - HDprintf(" couldn't read from attribute\n"); + printf(" couldn't read from attribute\n"); goto error; } for (i = 0; i < data_size / ATTRIBUTE_READ_TEST_ATTR_DTYPE_SIZE; i++) { if (((int *)read_buf)[i] != (int)i) { H5_FAILED(); - HDprintf(" data verification failed\n"); + printf(" data verification failed\n"); goto error; } } if (read_buf) { - HDfree(read_buf); + free(read_buf); read_buf = NULL; } @@ -2761,9 +2755,9 @@ error: H5E_BEGIN_TRY { if (data) - HDfree(data); + free(data); if (read_buf) - HDfree(read_buf); + free(read_buf); H5Sclose(space_id); H5Aclose(attr_id); H5Gclose(group_id); @@ -2800,7 +2794,7 @@ test_read_attribute_invalid_params(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC)) { SKIPPED(); - HDprintf( + printf( " API functions for basic file, group, or attribute aren't supported with this connector\n"); return 0; } @@ -2809,20 +2803,20 @@ test_read_attribute_invalid_params(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, ATTRIBUTE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", ATTRIBUTE_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", ATTRIBUTE_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, ATTRIBUTE_READ_INVALID_PARAMS_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container group '%s'\n", ATTRIBUTE_READ_INVALID_PARAMS_TEST_GROUP_NAME); + printf(" couldn't create container group '%s'\n", ATTRIBUTE_READ_INVALID_PARAMS_TEST_GROUP_NAME); goto error; } @@ -2834,20 +2828,20 @@ test_read_attribute_invalid_params(void) ATTRIBUTE_READ_INVALID_PARAMS_TEST_ATTR_DTYPE, space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create attribute\n"); + printf(" couldn't create attribute\n"); goto error; } /* Verify the attribute has been created */ if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_READ_INVALID_PARAMS_TEST_ATTR_NAME)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if attribute exists\n"); + printf(" couldn't determine if attribute exists\n"); goto error; } if (!attr_exists) { H5_FAILED(); - HDprintf(" attribute did not exist\n"); + printf(" attribute did not exist\n"); goto error; } @@ -2855,9 +2849,9 @@ test_read_attribute_invalid_params(void) data_size *= dims[i]; data_size *= ATTRIBUTE_READ_INVALID_PARAMS_TEST_ATTR_DTYPE_SIZE; - if (NULL == (data = HDmalloc(data_size))) + if (NULL == (data = malloc(data_size))) TEST_ERROR; - if (NULL == (read_buf = HDcalloc(1, data_size))) + if (NULL == (read_buf = calloc(1, data_size))) TEST_ERROR; for (i = 0; i < data_size / ATTRIBUTE_READ_INVALID_PARAMS_TEST_ATTR_DTYPE_SIZE; i++) @@ -2865,12 +2859,12 @@ test_read_attribute_invalid_params(void) if (H5Awrite(attr_id, ATTRIBUTE_READ_INVALID_PARAMS_TEST_ATTR_DTYPE, data) < 0) { H5_FAILED(); - HDprintf(" couldn't write to attribute\n"); + printf(" couldn't write to attribute\n"); goto error; } if (data) { - HDfree(data); + free(data); data = NULL; } @@ -2879,7 +2873,7 @@ test_read_attribute_invalid_params(void) if ((attr_id = H5Aopen(group_id, ATTRIBUTE_READ_INVALID_PARAMS_TEST_ATTR_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open attribute\n"); + printf(" couldn't open attribute\n"); goto error; } @@ -2899,7 +2893,7 @@ test_read_attribute_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" read attribute with an invalid attr_id!\n"); + printf(" read attribute with an invalid attr_id!\n"); PART_ERROR(H5Aread_invalid_attr_id); } @@ -2919,7 +2913,7 @@ test_read_attribute_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" read attribute with an invalid datatype!\n"); + printf(" read attribute with an invalid datatype!\n"); PART_ERROR(H5Aread_invalid_datatype); } @@ -2939,7 +2933,7 @@ test_read_attribute_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" read attribute with an invalid read buffer!\n"); + printf(" read attribute with an invalid read buffer!\n"); PART_ERROR(H5Aread_invalid_read_buf); } @@ -2952,7 +2946,7 @@ test_read_attribute_invalid_params(void) TESTING_2("test cleanup"); if (read_buf) { - HDfree(read_buf); + free(read_buf); read_buf = NULL; } @@ -2975,9 +2969,9 @@ error: H5E_BEGIN_TRY { if (data) - HDfree(data); + free(data); if (read_buf) - HDfree(read_buf); + free(read_buf); H5Sclose(space_id); H5Aclose(attr_id); H5Gclose(group_id); @@ -3011,27 +3005,27 @@ test_read_empty_attribute(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC)) { SKIPPED(); - HDprintf( + printf( " API functions for basic file, group, or attribute aren't supported with this connector\n"); return 0; } if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, ATTRIBUTE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", ATTRIBUTE_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", ATTRIBUTE_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, ATTRIBUTE_READ_EMPTY_ATTR_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container group '%s'\n", ATTRIBUTE_READ_EMPTY_ATTR_GROUP_NAME); + printf(" couldn't create container group '%s'\n", ATTRIBUTE_READ_EMPTY_ATTR_GROUP_NAME); goto error; } @@ -3041,20 +3035,20 @@ test_read_empty_attribute(void) if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_READ_EMPTY_ATTR_NAME, ATTRIBUTE_READ_EMPTY_DTYPE, space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create attribute\n"); + printf(" couldn't create attribute\n"); goto error; } /* Verify the attribute has been created */ if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_READ_EMPTY_ATTR_NAME)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if attribute exists\n"); + printf(" couldn't determine if attribute exists\n"); goto error; } if (!attr_exists) { H5_FAILED(); - HDprintf(" attribute did not exist\n"); + printf(" attribute did not exist\n"); goto error; } @@ -3063,7 +3057,7 @@ test_read_empty_attribute(void) if ((attr_id = H5Aopen(group_id, ATTRIBUTE_READ_EMPTY_ATTR_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open attribute\n"); + printf(" couldn't open attribute\n"); goto error; } @@ -3071,17 +3065,17 @@ test_read_empty_attribute(void) data_size *= dims[i]; data_size *= ATTRIBUTE_READ_EMPTY_DTYPE_SIZE; - if (NULL == (read_buf = HDcalloc(1, data_size))) + if (NULL == (read_buf = calloc(1, data_size))) TEST_ERROR; if (H5Aread(attr_id, ATTRIBUTE_READ_EMPTY_DTYPE, read_buf) < 0) { H5_FAILED(); - HDprintf(" couldn't read from attribute\n"); + printf(" couldn't read from attribute\n"); goto error; } if (read_buf) { - HDfree(read_buf); + free(read_buf); read_buf = NULL; } @@ -3104,7 +3098,7 @@ error: H5E_BEGIN_TRY { if (read_buf) - HDfree(read_buf); + free(read_buf); H5Sclose(space_id); H5Aclose(attr_id); H5Gclose(group_id); @@ -3130,13 +3124,13 @@ test_close_attribute_invalid_id(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC)) { SKIPPED(); - HDprintf(" API functions for basic file or attribute aren't supported with this connector\n"); + printf(" API functions for basic file or attribute aren't supported with this connector\n"); return 0; } if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } @@ -3148,7 +3142,7 @@ test_close_attribute_invalid_id(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Aclose succeeded with an invalid attribute ID!\n"); + printf(" H5Aclose succeeded with an invalid attribute ID!\n"); goto error; } @@ -3195,8 +3189,8 @@ test_get_attribute_space_and_type(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_MORE)) { SKIPPED(); - HDprintf(" API functions for basic file, group, attribute, or attribute aren't supported with " - "this connector\n"); + printf(" API functions for basic file, group, attribute, or attribute aren't supported with " + "this connector\n"); return 0; } @@ -3204,20 +3198,20 @@ test_get_attribute_space_and_type(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, ATTRIBUTE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", ATTRIBUTE_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", ATTRIBUTE_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, ATTRIBUTE_GET_SPACE_TYPE_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container group '%s'\n", ATTRIBUTE_GET_SPACE_TYPE_TEST_GROUP_NAME); + printf(" couldn't create container group '%s'\n", ATTRIBUTE_GET_SPACE_TYPE_TEST_GROUP_NAME); goto error; } @@ -3231,20 +3225,20 @@ test_get_attribute_space_and_type(void) if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_GET_SPACE_TYPE_TEST_ATTR_NAME, attr_dtype, attr_space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create attribute\n"); + printf(" couldn't create attribute\n"); goto error; } /* Verify the attribute has been created */ if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_GET_SPACE_TYPE_TEST_ATTR_NAME)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if attribute exists\n"); + printf(" couldn't determine if attribute exists\n"); goto error; } if (!attr_exists) { H5_FAILED(); - HDprintf(" attribute did not exist\n"); + printf(" attribute did not exist\n"); goto error; } @@ -3259,7 +3253,7 @@ test_get_attribute_space_and_type(void) if ((tmp_type_id = H5Aget_type(attr_id)) < 0) { H5_FAILED(); - HDprintf(" couldn't retrieve attribute's datatype\n"); + printf(" couldn't retrieve attribute's datatype\n"); PART_ERROR(H5Aget_type); } @@ -3268,13 +3262,13 @@ test_get_attribute_space_and_type(void) if (types_equal < 0) { H5_FAILED(); - HDprintf(" datatype was invalid\n"); + printf(" datatype was invalid\n"); PART_ERROR(H5Aget_type); } if (!types_equal) { H5_FAILED(); - HDprintf(" attribute's datatype did not match\n"); + printf(" attribute's datatype did not match\n"); PART_ERROR(H5Aget_type); } } @@ -3289,7 +3283,7 @@ test_get_attribute_space_and_type(void) if ((tmp_space_id = H5Aget_space(attr_id)) < 0) { H5_FAILED(); - HDprintf(" couldn't retrieve attribute's dataspace\n"); + printf(" couldn't retrieve attribute's dataspace\n"); PART_ERROR(H5Aget_space); } @@ -3298,14 +3292,14 @@ test_get_attribute_space_and_type(void) if (H5Sget_simple_extent_dims(tmp_space_id, space_dims, NULL) < 0) { H5_FAILED(); - HDprintf(" couldn't retrieve dimensions of dataspace\n"); + printf(" couldn't retrieve dimensions of dataspace\n"); PART_ERROR(H5Aget_space); } for (i = 0; i < ATTRIBUTE_GET_SPACE_TYPE_TEST_SPACE_RANK; i++) if (space_dims[i] != attr_dims[i]) { H5_FAILED(); - HDprintf(" attribute's dataspace dims didn't match\n"); + printf(" attribute's dataspace dims didn't match\n"); PART_ERROR(H5Aget_space); } } @@ -3348,13 +3342,13 @@ test_get_attribute_space_and_type(void) if ((attr_id = H5Aopen(group_id, ATTRIBUTE_GET_SPACE_TYPE_TEST_ATTR_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open attribute '%s'\n", ATTRIBUTE_GET_SPACE_TYPE_TEST_ATTR_NAME); + printf(" couldn't open attribute '%s'\n", ATTRIBUTE_GET_SPACE_TYPE_TEST_ATTR_NAME); PART_ERROR(H5Aget_type_reopened); } if ((tmp_type_id = H5Aget_type(attr_id)) < 0) { H5_FAILED(); - HDprintf(" couldn't retrieve attribute's datatype\n"); + printf(" couldn't retrieve attribute's datatype\n"); PART_ERROR(H5Aget_type_reopened); } @@ -3363,13 +3357,13 @@ test_get_attribute_space_and_type(void) if (types_equal < 0) { H5_FAILED(); - HDprintf(" datatype was invalid\n"); + printf(" datatype was invalid\n"); PART_ERROR(H5Aget_type_reopened); } if (!types_equal) { H5_FAILED(); - HDprintf(" attribute's datatype did not match\n"); + printf(" attribute's datatype did not match\n"); PART_ERROR(H5Aget_type_reopened); } } @@ -3393,13 +3387,13 @@ test_get_attribute_space_and_type(void) if ((attr_id = H5Aopen(group_id, ATTRIBUTE_GET_SPACE_TYPE_TEST_ATTR_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open attribute '%s'\n", ATTRIBUTE_GET_SPACE_TYPE_TEST_ATTR_NAME); + printf(" couldn't open attribute '%s'\n", ATTRIBUTE_GET_SPACE_TYPE_TEST_ATTR_NAME); PART_ERROR(H5Aget_space_reopened); } if ((tmp_space_id = H5Aget_space(attr_id)) < 0) { H5_FAILED(); - HDprintf(" couldn't retrieve attribute's dataspace\n"); + printf(" couldn't retrieve attribute's dataspace\n"); PART_ERROR(H5Aget_space_reopened); } @@ -3408,14 +3402,14 @@ test_get_attribute_space_and_type(void) if (H5Sget_simple_extent_dims(tmp_space_id, space_dims, NULL) < 0) { H5_FAILED(); - HDprintf(" couldn't retrieve dimensions of dataspace\n"); + printf(" couldn't retrieve dimensions of dataspace\n"); PART_ERROR(H5Aget_space_reopened); } for (i = 0; i < ATTRIBUTE_GET_SPACE_TYPE_TEST_SPACE_RANK; i++) { if (space_dims[i] != attr_dims[i]) { H5_FAILED(); - HDprintf(" dataspace dims didn't match!\n"); + printf(" dataspace dims didn't match!\n"); PART_ERROR(H5Aget_space_reopened); } } @@ -3498,7 +3492,7 @@ test_get_attribute_space_and_type_invalid_params(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_MORE)) { SKIPPED(); - HDprintf( + printf( " API functions for basic file, group, or attribute aren't supported with this connector\n"); return 0; } @@ -3507,21 +3501,21 @@ test_get_attribute_space_and_type_invalid_params(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, ATTRIBUTE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", ATTRIBUTE_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", ATTRIBUTE_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, ATTRIBUTE_GET_SPACE_TYPE_INVALID_PARAMS_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container group '%s'\n", - ATTRIBUTE_GET_SPACE_TYPE_INVALID_PARAMS_TEST_GROUP_NAME); + printf(" couldn't create container group '%s'\n", + ATTRIBUTE_GET_SPACE_TYPE_INVALID_PARAMS_TEST_GROUP_NAME); goto error; } @@ -3535,20 +3529,20 @@ test_get_attribute_space_and_type_invalid_params(void) if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_GET_SPACE_TYPE_INVALID_PARAMS_TEST_ATTR_NAME, attr_dtype, attr_space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create attribute\n"); + printf(" couldn't create attribute\n"); goto error; } /* Verify the attribute has been created */ if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_GET_SPACE_TYPE_INVALID_PARAMS_TEST_ATTR_NAME)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if attribute exists\n"); + printf(" couldn't determine if attribute exists\n"); goto error; } if (!attr_exists) { H5_FAILED(); - HDprintf(" attribute did not exist\n"); + printf(" attribute did not exist\n"); goto error; } @@ -3569,7 +3563,7 @@ test_get_attribute_space_and_type_invalid_params(void) if (tmp_type_id >= 0) { H5_FAILED(); - HDprintf(" retrieved copy of attribute's datatype using an invalid attr_id!\n"); + printf(" retrieved copy of attribute's datatype using an invalid attr_id!\n"); PART_ERROR(H5Aget_type_invalid_attr_id); } @@ -3589,7 +3583,7 @@ test_get_attribute_space_and_type_invalid_params(void) if (tmp_space_id >= 0) { H5_FAILED(); - HDprintf(" retrieved copy of attribute's dataspace using an invalid attr_id!\n"); + printf(" retrieved copy of attribute's dataspace using an invalid attr_id!\n"); PART_ERROR(H5Aget_space_invalid_attr_id); } @@ -3658,8 +3652,8 @@ test_attribute_property_lists(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GET_PLIST)) { SKIPPED(); - HDprintf(" API functions for basic file, group, attribute, or getting property list aren't " - "supported with this connector\n"); + printf(" API functions for basic file, group, attribute, or getting property list aren't " + "supported with this connector\n"); return 0; } @@ -3667,20 +3661,20 @@ test_attribute_property_lists(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file\n"); + printf(" couldn't open file\n"); goto error; } if ((container_group = H5Gopen2(file_id, ATTRIBUTE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group\n"); + printf(" couldn't open container group\n"); goto error; } if ((group_id = H5Gcreate2(container_group, ATTRIBUTE_PROPERTY_LIST_TEST_SUBGROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container sub-group\n"); + printf(" couldn't create container sub-group\n"); goto error; } @@ -3694,27 +3688,27 @@ test_attribute_property_lists(void) if ((acpl_id1 = H5Pcreate(H5P_ATTRIBUTE_CREATE)) < 0) { H5_FAILED(); - HDprintf(" couldn't create ACPL\n"); + printf(" couldn't create ACPL\n"); goto error; } if (H5Pset_char_encoding(acpl_id1, encoding) < 0) { H5_FAILED(); - HDprintf(" couldn't set ACPL property value\n"); + printf(" couldn't set ACPL property value\n"); goto error; } if ((attr_id1 = H5Acreate2(group_id, ATTRIBUTE_PROPERTY_LIST_TEST_ATTRIBUTE_NAME1, attr_dtype1, space_id, acpl_id1, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create attribute\n"); + printf(" couldn't create attribute\n"); goto error; } if ((attr_id2 = H5Acreate2(group_id, ATTRIBUTE_PROPERTY_LIST_TEST_ATTRIBUTE_NAME2, attr_dtype2, space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create attribute\n"); + printf(" couldn't create attribute\n"); goto error; } @@ -3724,25 +3718,25 @@ test_attribute_property_lists(void) /* Verify the attributes have been created */ if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_PROPERTY_LIST_TEST_ATTRIBUTE_NAME1)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if attribute exists\n"); + printf(" couldn't determine if attribute exists\n"); goto error; } if (!attr_exists) { H5_FAILED(); - HDprintf(" attribute did not exist\n"); + printf(" attribute did not exist\n"); goto error; } if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_PROPERTY_LIST_TEST_ATTRIBUTE_NAME2)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if attribute exists\n"); + printf(" couldn't determine if attribute exists\n"); goto error; } if (!attr_exists) { H5_FAILED(); - HDprintf(" attribute did not exist\n"); + printf(" attribute did not exist\n"); goto error; } @@ -3758,13 +3752,13 @@ test_attribute_property_lists(void) * does not */ if ((acpl_id1 = H5Aget_create_plist(attr_id1)) < 0) { H5_FAILED(); - HDprintf(" couldn't get property list\n"); + printf(" couldn't get property list\n"); PART_ERROR(H5Aget_create_plist); } if ((acpl_id2 = H5Aget_create_plist(attr_id2)) < 0) { H5_FAILED(); - HDprintf(" couldn't get property list\n"); + printf(" couldn't get property list\n"); PART_ERROR(H5Aget_create_plist); } @@ -3773,13 +3767,13 @@ test_attribute_property_lists(void) if (H5Pget_char_encoding(acpl_id1, &encoding) < 0) { H5_FAILED(); - HDprintf(" couldn't retrieve ACPL property value\n"); + printf(" couldn't retrieve ACPL property value\n"); PART_ERROR(H5Aget_create_plist); } if (H5T_CSET_UTF8 != encoding) { H5_FAILED(); - HDprintf(" ACPL property value was incorrect\n"); + printf(" ACPL property value was incorrect\n"); PART_ERROR(H5Aget_create_plist); } @@ -3787,13 +3781,13 @@ test_attribute_property_lists(void) if (H5Pget_char_encoding(acpl_id2, &encoding) < 0) { H5_FAILED(); - HDprintf(" couldn't retrieve ACPL property value\n"); + printf(" couldn't retrieve ACPL property value\n"); PART_ERROR(H5Aget_create_plist); } if (H5T_CSET_UTF8 == encoding) { H5_FAILED(); - HDprintf(" ACPL property value was set!\n"); + printf(" ACPL property value was set!\n"); PART_ERROR(H5Aget_create_plist); } @@ -3844,26 +3838,26 @@ test_attribute_property_lists(void) if ((attr_id1 = H5Aopen(group_id, ATTRIBUTE_PROPERTY_LIST_TEST_ATTRIBUTE_NAME1, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open attribute '%s'\n", ATTRIBUTE_PROPERTY_LIST_TEST_ATTRIBUTE_NAME1); + printf(" couldn't open attribute '%s'\n", ATTRIBUTE_PROPERTY_LIST_TEST_ATTRIBUTE_NAME1); PART_ERROR(H5Aget_create_plist_reopened); } if ((attr_id2 = H5Aopen(group_id, ATTRIBUTE_PROPERTY_LIST_TEST_ATTRIBUTE_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open attribute '%s'\n", ATTRIBUTE_PROPERTY_LIST_TEST_ATTRIBUTE_NAME2); + printf(" couldn't open attribute '%s'\n", ATTRIBUTE_PROPERTY_LIST_TEST_ATTRIBUTE_NAME2); PART_ERROR(H5Aget_create_plist_reopened); } if ((acpl_id1 = H5Aget_create_plist(attr_id1)) < 0) { H5_FAILED(); - HDprintf(" couldn't get property list\n"); + printf(" couldn't get property list\n"); PART_ERROR(H5Aget_create_plist_reopened); } if ((acpl_id2 = H5Aget_create_plist(attr_id2)) < 0) { H5_FAILED(); - HDprintf(" couldn't get property list\n"); + printf(" couldn't get property list\n"); PART_ERROR(H5Aget_create_plist_reopened); } @@ -3945,8 +3939,8 @@ test_get_attribute_name(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_MORE)) { SKIPPED(); - HDprintf(" API functions for basic file, group, or attribute aren't supported " - "with this connector\n"); + printf(" API functions for basic file, group, or attribute aren't supported " + "with this connector\n"); return 0; } @@ -3954,26 +3948,26 @@ test_get_attribute_name(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, ATTRIBUTE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", ATTRIBUTE_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", ATTRIBUTE_TEST_GROUP_NAME); goto error; } if ((gcpl_id = H5Pcreate(H5P_GROUP_CREATE)) < 0) { H5_FAILED(); - HDprintf(" couldn't create GCPL for attribute creation order tracking\n"); + printf(" couldn't create GCPL for attribute creation order tracking\n"); goto error; } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (H5Pset_attr_creation_order(gcpl_id, H5P_CRT_ORDER_TRACKED) < 0) { H5_FAILED(); - HDprintf(" couldn't set attribute creation order tracking\n"); + printf(" couldn't set attribute creation order tracking\n"); goto error; } } @@ -3981,7 +3975,7 @@ test_get_attribute_name(void) if ((group_id = H5Gcreate2(container_group, ATTRIBUTE_GET_NAME_TEST_GROUP_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container group '%s'\n", ATTRIBUTE_GET_NAME_TEST_GROUP_NAME); + printf(" couldn't create container group '%s'\n", ATTRIBUTE_GET_NAME_TEST_GROUP_NAME); goto error; } @@ -3995,7 +3989,7 @@ test_get_attribute_name(void) if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME, attr_dtype, space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create attribute '%s'\n", ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME); + printf(" couldn't create attribute '%s'\n", ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME); goto error; } @@ -4005,7 +3999,7 @@ test_get_attribute_name(void) if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME2, attr_dtype, space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create attribute '%s'\n", ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME2); + printf(" couldn't create attribute '%s'\n", ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME2); goto error; } @@ -4015,7 +4009,7 @@ test_get_attribute_name(void) if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME3, attr_dtype, space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create attribute '%s'\n", ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME3); + printf(" couldn't create attribute '%s'\n", ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME3); goto error; } @@ -4025,47 +4019,45 @@ test_get_attribute_name(void) /* Verify the attributes have been created */ if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if attribute '%s' exists\n", ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME); + printf(" couldn't determine if attribute '%s' exists\n", ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME); goto error; } if (!attr_exists) { H5_FAILED(); - HDprintf(" attribute '%s' did not exist\n", ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME); + printf(" attribute '%s' did not exist\n", ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME); goto error; } if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME2)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if attribute '%s' exists\n", - ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME2); + printf(" couldn't determine if attribute '%s' exists\n", ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME2); goto error; } if (!attr_exists) { H5_FAILED(); - HDprintf(" attribute '%s' did not exist\n", ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME2); + printf(" attribute '%s' did not exist\n", ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME2); goto error; } if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME3)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if attribute '%s' exists\n", - ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME3); + printf(" couldn't determine if attribute '%s' exists\n", ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME3); goto error; } if (!attr_exists) { H5_FAILED(); - HDprintf(" attribute '%s' did not exist\n", ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME3); + printf(" attribute '%s' did not exist\n", ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME3); goto error; } /* Allocate the name buffer */ name_buf_size = strlen(ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME) + 2; - if (NULL == (name_buf = (char *)HDmalloc((size_t)name_buf_size))) { + if (NULL == (name_buf = (char *)malloc((size_t)name_buf_size))) { H5_FAILED(); - HDprintf(" couldn't allocate buffer for storing attribute's name\n"); + printf(" couldn't allocate buffer for storing attribute's name\n"); goto error; } @@ -4079,28 +4071,28 @@ test_get_attribute_name(void) if ((attr_id = H5Aopen(group_id, ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open attribute '%s'\n", ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME); + printf(" couldn't open attribute '%s'\n", ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME); PART_ERROR(H5Aget_name); } *name_buf = '\0'; if (H5Aget_name(attr_id, (size_t)name_buf_size, name_buf) < 0) { H5_FAILED(); - HDprintf(" couldn't retrieve attribute name\n"); + printf(" couldn't retrieve attribute name\n"); PART_ERROR(H5Aget_name); } if (HDstrncmp(name_buf, ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME, strlen(ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME) + 1)) { H5_FAILED(); - HDprintf(" retrieved attribute name '%s' didn't match '%s'\n", name_buf, - ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME); + printf(" retrieved attribute name '%s' didn't match '%s'\n", name_buf, + ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME); PART_ERROR(H5Aget_name); } if (H5Aclose(attr_id) < 0) { H5_FAILED(); - HDprintf(" failed to close attribute '%s'\n", ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME); + printf(" failed to close attribute '%s'\n", ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME); PART_ERROR(H5Aget_name); } @@ -4121,7 +4113,7 @@ test_get_attribute_name(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" creation order tracking isn't supported with this VOL connector\n"); + printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Aget_name_by_idx_crt_order_increasing); } @@ -4129,17 +4121,17 @@ test_get_attribute_name(void) if (H5Aget_name_by_idx(container_group, ATTRIBUTE_GET_NAME_TEST_GROUP_NAME, H5_INDEX_CRT_ORDER, H5_ITER_INC, 0, name_buf, (size_t)name_buf_size, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't retrieve name of attribute at index %d using H5Aget_name_by_index by " - "creation order in increasing order\n", - 0); + printf(" couldn't retrieve name of attribute at index %d using H5Aget_name_by_index by " + "creation order in increasing order\n", + 0); PART_ERROR(H5Aget_name_by_idx_crt_order_increasing); } if (HDstrncmp(name_buf, ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME, strlen(ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME) + 1)) { H5_FAILED(); - HDprintf(" retrieved attribute name '%s' didn't match '%s'\n", name_buf, - ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME); + printf(" retrieved attribute name '%s' didn't match '%s'\n", name_buf, + ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME); PART_ERROR(H5Aget_name_by_idx_crt_order_increasing); } @@ -4147,17 +4139,17 @@ test_get_attribute_name(void) if (H5Aget_name_by_idx(container_group, ATTRIBUTE_GET_NAME_TEST_GROUP_NAME, H5_INDEX_CRT_ORDER, H5_ITER_INC, 1, name_buf, (size_t)name_buf_size, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't retrieve name of attribute at index %d using H5Aget_name_by_index by " - "creation order in increasing order\n", - 1); + printf(" couldn't retrieve name of attribute at index %d using H5Aget_name_by_index by " + "creation order in increasing order\n", + 1); PART_ERROR(H5Aget_name_by_idx_crt_order_increasing); } if (HDstrncmp(name_buf, ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME2, strlen(ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME2) + 1)) { H5_FAILED(); - HDprintf(" retrieved attribute name '%s' didn't match '%s'\n", name_buf, - ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME2); + printf(" retrieved attribute name '%s' didn't match '%s'\n", name_buf, + ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME2); PART_ERROR(H5Aget_name_by_idx_crt_order_increasing); } @@ -4165,17 +4157,17 @@ test_get_attribute_name(void) if (H5Aget_name_by_idx(container_group, ATTRIBUTE_GET_NAME_TEST_GROUP_NAME, H5_INDEX_CRT_ORDER, H5_ITER_INC, 2, name_buf, (size_t)name_buf_size, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't retrieve name of attribute at index %d using H5Aget_name_by_index by " - "creation order in increasing order\n", - 2); + printf(" couldn't retrieve name of attribute at index %d using H5Aget_name_by_index by " + "creation order in increasing order\n", + 2); PART_ERROR(H5Aget_name_by_idx_crt_order_increasing); } if (HDstrncmp(name_buf, ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME3, strlen(ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME3) + 1)) { H5_FAILED(); - HDprintf(" retrieved attribute name '%s' didn't match '%s'\n", name_buf, - ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME3); + printf(" retrieved attribute name '%s' didn't match '%s'\n", name_buf, + ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME3); PART_ERROR(H5Aget_name_by_idx_crt_order_increasing); } @@ -4189,7 +4181,7 @@ test_get_attribute_name(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" creation order tracking isn't supported with this VOL connector\n"); + printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Aget_name_by_idx_crt_order_decreasing); } @@ -4197,17 +4189,17 @@ test_get_attribute_name(void) if (H5Aget_name_by_idx(container_group, ATTRIBUTE_GET_NAME_TEST_GROUP_NAME, H5_INDEX_CRT_ORDER, H5_ITER_DEC, 2, name_buf, (size_t)name_buf_size, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't retrieve name of attribute at index %d using H5Aget_name_by_index by " - "creation order in decreasing order\n", - 2); + printf(" couldn't retrieve name of attribute at index %d using H5Aget_name_by_index by " + "creation order in decreasing order\n", + 2); PART_ERROR(H5Aget_name_by_idx_crt_order_decreasing); } if (HDstrncmp(name_buf, ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME, strlen(ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME) + 1)) { H5_FAILED(); - HDprintf(" retrieved attribute name '%s' didn't match '%s'\n", name_buf, - ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME); + printf(" retrieved attribute name '%s' didn't match '%s'\n", name_buf, + ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME); PART_ERROR(H5Aget_name_by_idx_crt_order_decreasing); } @@ -4215,17 +4207,17 @@ test_get_attribute_name(void) if (H5Aget_name_by_idx(container_group, ATTRIBUTE_GET_NAME_TEST_GROUP_NAME, H5_INDEX_CRT_ORDER, H5_ITER_DEC, 1, name_buf, (size_t)name_buf_size, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't retrieve name of attribute at index %d using H5Aget_name_by_index by " - "creation order in decreasing order\n", - 1); + printf(" couldn't retrieve name of attribute at index %d using H5Aget_name_by_index by " + "creation order in decreasing order\n", + 1); PART_ERROR(H5Aget_name_by_idx_crt_order_decreasing); } if (HDstrncmp(name_buf, ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME2, strlen(ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME2) + 1)) { H5_FAILED(); - HDprintf(" retrieved attribute name '%s' didn't match '%s'\n", name_buf, - ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME2); + printf(" retrieved attribute name '%s' didn't match '%s'\n", name_buf, + ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME2); PART_ERROR(H5Aget_name_by_idx_crt_order_decreasing); } @@ -4233,17 +4225,17 @@ test_get_attribute_name(void) if (H5Aget_name_by_idx(container_group, ATTRIBUTE_GET_NAME_TEST_GROUP_NAME, H5_INDEX_CRT_ORDER, H5_ITER_DEC, 0, name_buf, (size_t)name_buf_size, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't retrieve name of attribute at index %d using H5Aget_name_by_index by " - "creation order in decreasing order\n", - 0); + printf(" couldn't retrieve name of attribute at index %d using H5Aget_name_by_index by " + "creation order in decreasing order\n", + 0); PART_ERROR(H5Aget_name_by_idx_crt_order_decreasing); } if (HDstrncmp(name_buf, ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME3, strlen(ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME3) + 1)) { H5_FAILED(); - HDprintf(" retrieved attribute name '%s' didn't match '%s'\n", name_buf, - ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME3); + printf(" retrieved attribute name '%s' didn't match '%s'\n", name_buf, + ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME3); PART_ERROR(H5Aget_name_by_idx_crt_order_decreasing); } @@ -4259,17 +4251,17 @@ test_get_attribute_name(void) if (H5Aget_name_by_idx(container_group, ATTRIBUTE_GET_NAME_TEST_GROUP_NAME, H5_INDEX_NAME, H5_ITER_INC, 0, name_buf, (size_t)name_buf_size, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't retrieve name of attribute at index %d using H5Aget_name_by_index by " - "alphabetical order in increasing order\n", - 0); + printf(" couldn't retrieve name of attribute at index %d using H5Aget_name_by_index by " + "alphabetical order in increasing order\n", + 0); PART_ERROR(H5Aget_name_by_idx_name_order_increasing); } if (HDstrncmp(name_buf, ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME, strlen(ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME) + 1)) { H5_FAILED(); - HDprintf(" retrieved attribute name '%s' didn't match '%s'\n", name_buf, - ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME); + printf(" retrieved attribute name '%s' didn't match '%s'\n", name_buf, + ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME); PART_ERROR(H5Aget_name_by_idx_name_order_increasing); } @@ -4277,17 +4269,17 @@ test_get_attribute_name(void) if (H5Aget_name_by_idx(container_group, ATTRIBUTE_GET_NAME_TEST_GROUP_NAME, H5_INDEX_NAME, H5_ITER_INC, 1, name_buf, (size_t)name_buf_size, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't retrieve name of attribute at index %d using H5Aget_name_by_index by " - "alphabetical order in increasing order\n", - 1); + printf(" couldn't retrieve name of attribute at index %d using H5Aget_name_by_index by " + "alphabetical order in increasing order\n", + 1); PART_ERROR(H5Aget_name_by_idx_name_order_increasing); } if (HDstrncmp(name_buf, ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME2, strlen(ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME2) + 1)) { H5_FAILED(); - HDprintf(" retrieved attribute name '%s' didn't match '%s'\n", name_buf, - ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME2); + printf(" retrieved attribute name '%s' didn't match '%s'\n", name_buf, + ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME2); PART_ERROR(H5Aget_name_by_idx_name_order_increasing); } @@ -4295,17 +4287,17 @@ test_get_attribute_name(void) if (H5Aget_name_by_idx(container_group, ATTRIBUTE_GET_NAME_TEST_GROUP_NAME, H5_INDEX_NAME, H5_ITER_INC, 2, name_buf, (size_t)name_buf_size, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't retrieve name of attribute at index %d using H5Aget_name_by_index by " - "alphabetical order in increasing order\n", - 2); + printf(" couldn't retrieve name of attribute at index %d using H5Aget_name_by_index by " + "alphabetical order in increasing order\n", + 2); PART_ERROR(H5Aget_name_by_idx_name_order_increasing); } if (HDstrncmp(name_buf, ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME3, strlen(ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME3) + 1)) { H5_FAILED(); - HDprintf(" retrieved attribute name '%s' didn't match '%s'\n", name_buf, - ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME3); + printf(" retrieved attribute name '%s' didn't match '%s'\n", name_buf, + ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME3); PART_ERROR(H5Aget_name_by_idx_name_order_increasing); } @@ -4321,17 +4313,17 @@ test_get_attribute_name(void) if (H5Aget_name_by_idx(container_group, ATTRIBUTE_GET_NAME_TEST_GROUP_NAME, H5_INDEX_NAME, H5_ITER_DEC, 2, name_buf, (size_t)name_buf_size, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't retrieve name of attribute at index %d using H5Aget_name_by_index " - "by alphabetical order in decreasing order\n", - 2); + printf(" couldn't retrieve name of attribute at index %d using H5Aget_name_by_index " + "by alphabetical order in decreasing order\n", + 2); PART_ERROR(H5Aget_name_by_idx_name_order_decreasing); } if (HDstrncmp(name_buf, ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME, strlen(ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME) + 1)) { H5_FAILED(); - HDprintf(" retrieved attribute name '%s' didn't match '%s'\n", name_buf, - ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME); + printf(" retrieved attribute name '%s' didn't match '%s'\n", name_buf, + ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME); PART_ERROR(H5Aget_name_by_idx_name_order_decreasing); } @@ -4339,17 +4331,17 @@ test_get_attribute_name(void) if (H5Aget_name_by_idx(container_group, ATTRIBUTE_GET_NAME_TEST_GROUP_NAME, H5_INDEX_NAME, H5_ITER_DEC, 1, name_buf, (size_t)name_buf_size, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't retrieve name of attribute at index %d using H5Aget_name_by_index " - "by alphabetical order in decreasing order\n", - 1); + printf(" couldn't retrieve name of attribute at index %d using H5Aget_name_by_index " + "by alphabetical order in decreasing order\n", + 1); PART_ERROR(H5Aget_name_by_idx_name_order_decreasing); } if (HDstrncmp(name_buf, ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME2, strlen(ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME2) + 1)) { H5_FAILED(); - HDprintf(" retrieved attribute name '%s' didn't match '%s'\n", name_buf, - ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME2); + printf(" retrieved attribute name '%s' didn't match '%s'\n", name_buf, + ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME2); PART_ERROR(H5Aget_name_by_idx_name_order_decreasing); } @@ -4357,17 +4349,17 @@ test_get_attribute_name(void) if (H5Aget_name_by_idx(container_group, ATTRIBUTE_GET_NAME_TEST_GROUP_NAME, H5_INDEX_NAME, H5_ITER_DEC, 0, name_buf, (size_t)name_buf_size, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't retrieve name of attribute at index %d using H5Aget_name_by_index " - "by alphabetical order in decreasing order\n", - 0); + printf(" couldn't retrieve name of attribute at index %d using H5Aget_name_by_index " + "by alphabetical order in decreasing order\n", + 0); PART_ERROR(H5Aget_name_by_idx_name_order_decreasing); } if (HDstrncmp(name_buf, ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME3, strlen(ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME3) + 1)) { H5_FAILED(); - HDprintf(" retrieved attribute name '%s' didn't match '%s'\n", name_buf, - ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME3); + printf(" retrieved attribute name '%s' didn't match '%s'\n", name_buf, + ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME3); PART_ERROR(H5Aget_name_by_idx_name_order_decreasing); } @@ -4380,7 +4372,7 @@ test_get_attribute_name(void) TESTING_2("test cleanup"); if (name_buf) { - HDfree(name_buf); + free(name_buf); name_buf = NULL; } @@ -4405,7 +4397,7 @@ error: H5E_BEGIN_TRY { if (name_buf) - HDfree(name_buf); + free(name_buf); H5Sclose(space_id); H5Tclose(attr_dtype); H5Aclose(attr_id); @@ -4443,7 +4435,7 @@ test_get_attribute_name_invalid_params(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_MORE)) { SKIPPED(); - HDprintf( + printf( " API functions for basic file, group, or attribute aren't supported with this connector\n"); return 0; } @@ -4452,21 +4444,21 @@ test_get_attribute_name_invalid_params(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, ATTRIBUTE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", ATTRIBUTE_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", ATTRIBUTE_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, ATTRIBUTE_GET_NAME_INVALID_PARAMS_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container group '%s'\n", - ATTRIBUTE_GET_NAME_INVALID_PARAMS_TEST_GROUP_NAME); + printf(" couldn't create container group '%s'\n", + ATTRIBUTE_GET_NAME_INVALID_PARAMS_TEST_GROUP_NAME); goto error; } @@ -4480,20 +4472,20 @@ test_get_attribute_name_invalid_params(void) if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_GET_NAME_INVALID_PARAMS_TEST_ATTRIBUTE_NAME, attr_dtype, space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create attribute\n"); + printf(" couldn't create attribute\n"); goto error; } /* Verify the attribute has been created */ if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_GET_NAME_INVALID_PARAMS_TEST_ATTRIBUTE_NAME)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if attribute exists\n"); + printf(" couldn't determine if attribute exists\n"); goto error; } if (!attr_exists) { H5_FAILED(); - HDprintf(" attribute did not exist\n"); + printf(" attribute did not exist\n"); goto error; } @@ -4503,11 +4495,11 @@ test_get_attribute_name_invalid_params(void) if ((name_buf_size = H5Aget_name(attr_id, 0, NULL)) < 0) { H5_FAILED(); - HDprintf(" couldn't retrieve name buf size\n"); + printf(" couldn't retrieve name buf size\n"); goto error; } - if (NULL == (name_buf = (char *)HDmalloc((size_t)name_buf_size + 1))) + if (NULL == (name_buf = (char *)malloc((size_t)name_buf_size + 1))) TEST_ERROR; PASSED(); @@ -4526,7 +4518,7 @@ test_get_attribute_name_invalid_params(void) if (name_buf_size >= 0) { H5_FAILED(); - HDprintf(" retrieved attribute name using H5Aget_name with an invalid attr_id!\n"); + printf(" retrieved attribute name using H5Aget_name with an invalid attr_id!\n"); PART_ERROR(H5Aget_name_invalid_attr_id); } @@ -4547,7 +4539,7 @@ test_get_attribute_name_invalid_params(void) if (name_buf_size >= 0) { H5_FAILED(); - HDprintf(" retrieved attribute name using H5Aget_name with an invalid name buffer!\n"); + printf(" retrieved attribute name using H5Aget_name with an invalid name buffer!\n"); PART_ERROR(H5Aget_name_invalid_name_buf); } @@ -4569,7 +4561,7 @@ test_get_attribute_name_invalid_params(void) if (name_buf_size >= 0) { H5_FAILED(); - HDprintf(" retrieved attribute name using H5Aget_name_by_idx with an invalid loc_id!\n"); + printf(" retrieved attribute name using H5Aget_name_by_idx with an invalid loc_id!\n"); PART_ERROR(H5Aget_name_by_idx_invalid_loc_id); } @@ -4590,7 +4582,7 @@ test_get_attribute_name_invalid_params(void) if (name_buf_size >= 0) { H5_FAILED(); - HDprintf(" retrieved attribute name using H5Aget_name_by_idx with a NULL object name!\n"); + printf(" retrieved attribute name using H5Aget_name_by_idx with a NULL object name!\n"); PART_ERROR(H5Aget_name_by_idx_invalid_obj_name); } @@ -4603,8 +4595,8 @@ test_get_attribute_name_invalid_params(void) if (name_buf_size >= 0) { H5_FAILED(); - HDprintf(" retrieved attribute name using H5Aget_name_by_idx with an invalid object name " - "of ''!\n"); + printf(" retrieved attribute name using H5Aget_name_by_idx with an invalid object name " + "of ''!\n"); PART_ERROR(H5Aget_name_by_idx_invalid_obj_name); } @@ -4626,8 +4618,8 @@ test_get_attribute_name_invalid_params(void) if (name_buf_size >= 0) { H5_FAILED(); - HDprintf(" retrieved attribute name using H5Aget_name_by_idx with invalid index type " - "H5_INDEX_UNKNOWN!\n"); + printf(" retrieved attribute name using H5Aget_name_by_idx with invalid index type " + "H5_INDEX_UNKNOWN!\n"); PART_ERROR(H5Aget_name_by_idx_invalid_index_type); } @@ -4641,8 +4633,8 @@ test_get_attribute_name_invalid_params(void) if (name_buf_size >= 0) { H5_FAILED(); - HDprintf(" retrieved attribute name using H5Aget_name_by_idx with invalid index type " - "H5_INDEX_N!\n"); + printf(" retrieved attribute name using H5Aget_name_by_idx with invalid index type " + "H5_INDEX_N!\n"); PART_ERROR(H5Aget_name_by_idx_invalid_index_type); } @@ -4664,8 +4656,8 @@ test_get_attribute_name_invalid_params(void) if (name_buf_size >= 0) { H5_FAILED(); - HDprintf(" retrieved attribute name using H5Aget_name_by_idx with invalid iteration order " - "H5_ITER_UNKNOWN!\n"); + printf(" retrieved attribute name using H5Aget_name_by_idx with invalid iteration order " + "H5_ITER_UNKNOWN!\n"); PART_ERROR(H5Aget_name_by_idx_invalid_iter_order); } @@ -4679,8 +4671,8 @@ test_get_attribute_name_invalid_params(void) if (name_buf_size >= 0) { H5_FAILED(); - HDprintf(" retrieved attribute name using H5Aget_name_by_idx with invalid iteration order " - "H5_ITER_N!\n"); + printf(" retrieved attribute name using H5Aget_name_by_idx with invalid iteration order " + "H5_ITER_N!\n"); PART_ERROR(H5Aget_name_by_idx_invalid_iter_order); } @@ -4703,7 +4695,7 @@ test_get_attribute_name_invalid_params(void) if (name_buf_size >= 0) { H5_FAILED(); - HDprintf( + printf( " retrieved attribute name using H5Aget_name_by_idx with an invalid name buffer!\n"); PART_ERROR(H5Aget_name_by_idx_invalid_name_buf); } @@ -4726,7 +4718,7 @@ test_get_attribute_name_invalid_params(void) if (name_buf_size >= 0) { H5_FAILED(); - HDprintf(" retrieved attribute name using H5Aget_name_by_idx with an invalid LAPL!\n"); + printf(" retrieved attribute name using H5Aget_name_by_idx with an invalid LAPL!\n"); PART_ERROR(H5Aget_name_by_idx_invalid_lapl); } @@ -4739,7 +4731,7 @@ test_get_attribute_name_invalid_params(void) TESTING_2("test cleanup"); if (name_buf) { - HDfree(name_buf); + free(name_buf); name_buf = NULL; } @@ -4764,7 +4756,7 @@ error: H5E_BEGIN_TRY { if (name_buf) - HDfree(name_buf); + free(name_buf); H5Sclose(space_id); H5Tclose(attr_dtype); H5Aclose(attr_id); @@ -4812,8 +4804,8 @@ test_get_attribute_info(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_MORE)) { SKIPPED(); - HDprintf(" API functions for basic file, group, or attribute aren't supported " - "with this connector\n"); + printf(" API functions for basic file, group, or attribute aren't supported " + "with this connector\n"); return 0; } @@ -4821,26 +4813,26 @@ test_get_attribute_info(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file\n"); + printf(" couldn't open file\n"); goto error; } if ((container_group = H5Gopen2(file_id, ATTRIBUTE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group\n"); + printf(" couldn't open container group\n"); goto error; } if ((gcpl_id = H5Pcreate(H5P_GROUP_CREATE)) < 0) { H5_FAILED(); - HDprintf(" couldn't create GCPL for attribute creation order tracking\n"); + printf(" couldn't create GCPL for attribute creation order tracking\n"); goto error; } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (H5Pset_attr_creation_order(gcpl_id, H5P_CRT_ORDER_TRACKED) < 0) { H5_FAILED(); - HDprintf(" couldn't set attribute creation order tracking\n"); + printf(" couldn't set attribute creation order tracking\n"); goto error; } } @@ -4848,7 +4840,7 @@ test_get_attribute_info(void) if ((group_id = H5Gcreate2(container_group, ATTRIBUTE_GET_INFO_TEST_GROUP_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container group '%s'\n", ATTRIBUTE_GET_INFO_TEST_GROUP_NAME); + printf(" couldn't create container group '%s'\n", ATTRIBUTE_GET_INFO_TEST_GROUP_NAME); goto error; } @@ -4862,7 +4854,7 @@ test_get_attribute_info(void) if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_GET_INFO_TEST_ATTR_NAME, attr_dtype, space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create attribute '%s'\n", ATTRIBUTE_GET_INFO_TEST_ATTR_NAME); + printf(" couldn't create attribute '%s'\n", ATTRIBUTE_GET_INFO_TEST_ATTR_NAME); goto error; } @@ -4872,7 +4864,7 @@ test_get_attribute_info(void) if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_GET_INFO_TEST_ATTR_NAME2, attr_dtype, space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create attribute '%s'\n", ATTRIBUTE_GET_INFO_TEST_ATTR_NAME2); + printf(" couldn't create attribute '%s'\n", ATTRIBUTE_GET_INFO_TEST_ATTR_NAME2); goto error; } @@ -4882,7 +4874,7 @@ test_get_attribute_info(void) if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_GET_INFO_TEST_ATTR_NAME3, attr_dtype, space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create attribute '%s'\n", ATTRIBUTE_GET_INFO_TEST_ATTR_NAME3); + printf(" couldn't create attribute '%s'\n", ATTRIBUTE_GET_INFO_TEST_ATTR_NAME3); goto error; } @@ -4892,37 +4884,37 @@ test_get_attribute_info(void) /* Verify the attributes have been created */ if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_GET_INFO_TEST_ATTR_NAME)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if attribute '%s' exists\n", ATTRIBUTE_GET_INFO_TEST_ATTR_NAME); + printf(" couldn't determine if attribute '%s' exists\n", ATTRIBUTE_GET_INFO_TEST_ATTR_NAME); goto error; } if (!attr_exists) { H5_FAILED(); - HDprintf(" attribute '%s' did not exist\n", ATTRIBUTE_GET_INFO_TEST_ATTR_NAME); + printf(" attribute '%s' did not exist\n", ATTRIBUTE_GET_INFO_TEST_ATTR_NAME); goto error; } if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_GET_INFO_TEST_ATTR_NAME2)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if attribute '%s' exists\n", ATTRIBUTE_GET_INFO_TEST_ATTR_NAME2); + printf(" couldn't determine if attribute '%s' exists\n", ATTRIBUTE_GET_INFO_TEST_ATTR_NAME2); goto error; } if (!attr_exists) { H5_FAILED(); - HDprintf(" attribute '%s' did not exist\n", ATTRIBUTE_GET_INFO_TEST_ATTR_NAME2); + printf(" attribute '%s' did not exist\n", ATTRIBUTE_GET_INFO_TEST_ATTR_NAME2); goto error; } if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_GET_INFO_TEST_ATTR_NAME3)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if attribute '%s' exists\n", ATTRIBUTE_GET_INFO_TEST_ATTR_NAME3); + printf(" couldn't determine if attribute '%s' exists\n", ATTRIBUTE_GET_INFO_TEST_ATTR_NAME3); goto error; } if (!attr_exists) { H5_FAILED(); - HDprintf(" attribute '%s' did not exist\n", ATTRIBUTE_GET_INFO_TEST_ATTR_NAME3); + printf(" attribute '%s' did not exist\n", ATTRIBUTE_GET_INFO_TEST_ATTR_NAME3); goto error; } @@ -4936,21 +4928,21 @@ test_get_attribute_info(void) if ((attr_id = H5Aopen(group_id, ATTRIBUTE_GET_INFO_TEST_ATTR_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open attribute '%s'\n", ATTRIBUTE_GET_INFO_TEST_ATTR_NAME); + printf(" couldn't open attribute '%s'\n", ATTRIBUTE_GET_INFO_TEST_ATTR_NAME); PART_ERROR(H5Aget_info); } - HDmemset(&attr_info, 0, sizeof(attr_info)); + memset(&attr_info, 0, sizeof(attr_info)); if (H5Aget_info(attr_id, &attr_info) < 0) { H5_FAILED(); - HDprintf(" couldn't get attribute info\n"); + printf(" couldn't get attribute info\n"); PART_ERROR(H5Aget_info); } if (attr_info.corder_valid && (attr_info.corder != 0)) { H5_FAILED(); - HDprintf(" attribute's creation order value '%lld' did not match expected value '%lld'\n", - (long long)attr_info.corder, (long long)0); + printf(" attribute's creation order value '%lld' did not match expected value '%lld'\n", + (long long)attr_info.corder, (long long)0); PART_ERROR(H5Aget_info); } @@ -4958,13 +4950,13 @@ test_get_attribute_info(void) if (attr_info.cset != H5T_CSET_ASCII && attr_info.cset != H5T_CSET_UTF8 && attr_info.cset != H5T_CSET_ERROR) { H5_FAILED(); - HDprintf(" attribute info's 'cset' field wasn't set to a meaningful value\n"); + printf(" attribute info's 'cset' field wasn't set to a meaningful value\n"); PART_ERROR(H5Aget_info); } if (H5Aclose(attr_id) < 0) { H5_FAILED(); - HDprintf(" couldn't close attribute '%s'\n", ATTRIBUTE_GET_INFO_TEST_ATTR_NAME); + printf(" couldn't close attribute '%s'\n", ATTRIBUTE_GET_INFO_TEST_ATTR_NAME); PART_ERROR(H5Aget_info); } @@ -4983,18 +4975,18 @@ test_get_attribute_info(void) { TESTING_2("H5Aget_info_by_name"); - HDmemset(&attr_info, 0, sizeof(attr_info)); + memset(&attr_info, 0, sizeof(attr_info)); if (H5Aget_info_by_name(group_id, ".", ATTRIBUTE_GET_INFO_TEST_ATTR_NAME, &attr_info, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't get attribute info by name '%s'\n", ATTRIBUTE_GET_INFO_TEST_ATTR_NAME); + printf(" couldn't get attribute info by name '%s'\n", ATTRIBUTE_GET_INFO_TEST_ATTR_NAME); PART_ERROR(H5Aget_info_by_name); } if (attr_info.corder_valid && (attr_info.corder != 0)) { H5_FAILED(); - HDprintf(" attribute's creation order value '%lld' did not match expected value '%lld'\n", - (long long)attr_info.corder, (long long)0); + printf(" attribute's creation order value '%lld' did not match expected value '%lld'\n", + (long long)attr_info.corder, (long long)0); PART_ERROR(H5Aget_info_by_name); } @@ -5002,23 +4994,22 @@ test_get_attribute_info(void) if (attr_info.cset != H5T_CSET_ASCII && attr_info.cset != H5T_CSET_UTF8 && attr_info.cset != H5T_CSET_ERROR) { H5_FAILED(); - HDprintf(" attribute info's 'cset' field wasn't set to a meaningful value\n"); + printf(" attribute info's 'cset' field wasn't set to a meaningful value\n"); PART_ERROR(H5Aget_info_by_name); } - HDmemset(&attr_info, 0, sizeof(attr_info)); + memset(&attr_info, 0, sizeof(attr_info)); if (H5Aget_info_by_name(group_id, ".", ATTRIBUTE_GET_INFO_TEST_ATTR_NAME2, &attr_info, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't get attribute info by name '%s'\n", - ATTRIBUTE_GET_INFO_TEST_ATTR_NAME2); + printf(" couldn't get attribute info by name '%s'\n", ATTRIBUTE_GET_INFO_TEST_ATTR_NAME2); PART_ERROR(H5Aget_info_by_name); } if (attr_info.corder_valid && (attr_info.corder != 1)) { H5_FAILED(); - HDprintf(" attribute's creation order value '%lld' did not match expected value '%lld'\n", - (long long)attr_info.corder, (long long)1); + printf(" attribute's creation order value '%lld' did not match expected value '%lld'\n", + (long long)attr_info.corder, (long long)1); PART_ERROR(H5Aget_info_by_name); } @@ -5026,23 +5017,22 @@ test_get_attribute_info(void) if (attr_info.cset != H5T_CSET_ASCII && attr_info.cset != H5T_CSET_UTF8 && attr_info.cset != H5T_CSET_ERROR) { H5_FAILED(); - HDprintf(" attribute info's 'cset' field wasn't set to a meaningful value\n"); + printf(" attribute info's 'cset' field wasn't set to a meaningful value\n"); PART_ERROR(H5Aget_info_by_name); } - HDmemset(&attr_info, 0, sizeof(attr_info)); + memset(&attr_info, 0, sizeof(attr_info)); if (H5Aget_info_by_name(group_id, ".", ATTRIBUTE_GET_INFO_TEST_ATTR_NAME3, &attr_info, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't get attribute info by name '%s'\n", - ATTRIBUTE_GET_INFO_TEST_ATTR_NAME3); + printf(" couldn't get attribute info by name '%s'\n", ATTRIBUTE_GET_INFO_TEST_ATTR_NAME3); PART_ERROR(H5Aget_info_by_name); } if (attr_info.corder_valid && (attr_info.corder != 2)) { H5_FAILED(); - HDprintf(" attribute's creation order value '%lld' did not match expected value '%lld'\n", - (long long)attr_info.corder, (long long)2); + printf(" attribute's creation order value '%lld' did not match expected value '%lld'\n", + (long long)attr_info.corder, (long long)2); PART_ERROR(H5Aget_info_by_name); } @@ -5050,7 +5040,7 @@ test_get_attribute_info(void) if (attr_info.cset != H5T_CSET_ASCII && attr_info.cset != H5T_CSET_UTF8 && attr_info.cset != H5T_CSET_ERROR) { H5_FAILED(); - HDprintf(" attribute info's 'cset' field wasn't set to a meaningful value\n"); + printf(" attribute info's 'cset' field wasn't set to a meaningful value\n"); PART_ERROR(H5Aget_info_by_name); } @@ -5064,24 +5054,24 @@ test_get_attribute_info(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" creation order tracking isn't supported with this VOL connector\n"); + printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Aget_info_by_idx_crt_order_increasing); } - HDmemset(&attr_info, 0, sizeof(attr_info)); + memset(&attr_info, 0, sizeof(attr_info)); if (H5Aget_info_by_idx(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 0, &attr_info, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't get info for attribute at index %d using H5Aget_info_by_idx by " - "creation order in increasing order\n", - 0); + printf(" couldn't get info for attribute at index %d using H5Aget_info_by_idx by " + "creation order in increasing order\n", + 0); PART_ERROR(H5Aget_info_by_idx_crt_order_increasing); } if (attr_info.corder_valid && (attr_info.corder != 0)) { H5_FAILED(); - HDprintf(" attribute's creation order value '%lld' did not match expected value '%lld'\n", - (long long)attr_info.corder, (long long)0); + printf(" attribute's creation order value '%lld' did not match expected value '%lld'\n", + (long long)attr_info.corder, (long long)0); PART_ERROR(H5Aget_info_by_idx_crt_order_increasing); } @@ -5089,24 +5079,24 @@ test_get_attribute_info(void) if (attr_info.cset != H5T_CSET_ASCII && attr_info.cset != H5T_CSET_UTF8 && attr_info.cset != H5T_CSET_ERROR) { H5_FAILED(); - HDprintf(" attribute info's 'cset' field wasn't set to a meaningful value\n"); + printf(" attribute info's 'cset' field wasn't set to a meaningful value\n"); PART_ERROR(H5Aget_info_by_idx_crt_order_increasing); } - HDmemset(&attr_info, 0, sizeof(attr_info)); + memset(&attr_info, 0, sizeof(attr_info)); if (H5Aget_info_by_idx(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 1, &attr_info, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't get info for attribute at index %d using H5Aget_info_by_idx by " - "creation order in increasing order\n", - 1); + printf(" couldn't get info for attribute at index %d using H5Aget_info_by_idx by " + "creation order in increasing order\n", + 1); PART_ERROR(H5Aget_info_by_idx_crt_order_increasing); } if (attr_info.corder_valid && (attr_info.corder != 1)) { H5_FAILED(); - HDprintf(" attribute's creation order value '%lld' did not match expected value '%lld'\n", - (long long)attr_info.corder, (long long)1); + printf(" attribute's creation order value '%lld' did not match expected value '%lld'\n", + (long long)attr_info.corder, (long long)1); PART_ERROR(H5Aget_info_by_idx_crt_order_increasing); } @@ -5114,24 +5104,24 @@ test_get_attribute_info(void) if (attr_info.cset != H5T_CSET_ASCII && attr_info.cset != H5T_CSET_UTF8 && attr_info.cset != H5T_CSET_ERROR) { H5_FAILED(); - HDprintf(" attribute info's 'cset' field wasn't set to a meaningful value\n"); + printf(" attribute info's 'cset' field wasn't set to a meaningful value\n"); PART_ERROR(H5Aget_info_by_idx_crt_order_increasing); } - HDmemset(&attr_info, 0, sizeof(attr_info)); + memset(&attr_info, 0, sizeof(attr_info)); if (H5Aget_info_by_idx(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 2, &attr_info, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't get info for attribute at index %d using H5Aget_info_by_idx by " - "creation order in increasing order\n", - 2); + printf(" couldn't get info for attribute at index %d using H5Aget_info_by_idx by " + "creation order in increasing order\n", + 2); PART_ERROR(H5Aget_info_by_idx_crt_order_increasing); } if (attr_info.corder_valid && (attr_info.corder != 2)) { H5_FAILED(); - HDprintf(" attribute's creation order value '%lld' did not match expected value '%lld'\n", - (long long)attr_info.corder, (long long)2); + printf(" attribute's creation order value '%lld' did not match expected value '%lld'\n", + (long long)attr_info.corder, (long long)2); PART_ERROR(H5Aget_info_by_idx_crt_order_increasing); } @@ -5139,7 +5129,7 @@ test_get_attribute_info(void) if (attr_info.cset != H5T_CSET_ASCII && attr_info.cset != H5T_CSET_UTF8 && attr_info.cset != H5T_CSET_ERROR) { H5_FAILED(); - HDprintf(" attribute info's 'cset' field wasn't set to a meaningful value\n"); + printf(" attribute info's 'cset' field wasn't set to a meaningful value\n"); PART_ERROR(H5Aget_info_by_idx_crt_order_increasing); } @@ -5153,24 +5143,24 @@ test_get_attribute_info(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" creation order tracking isn't supported with this VOL connector\n"); + printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Aget_info_by_idx_crt_order_decreasing); } - HDmemset(&attr_info, 0, sizeof(attr_info)); + memset(&attr_info, 0, sizeof(attr_info)); if (H5Aget_info_by_idx(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 2, &attr_info, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't get info for attribute at index %d using H5Aget_info_by_idx by " - "creation order in decreasing order\n", - 2); + printf(" couldn't get info for attribute at index %d using H5Aget_info_by_idx by " + "creation order in decreasing order\n", + 2); PART_ERROR(H5Aget_info_by_idx_crt_order_decreasing); } if (attr_info.corder_valid && (attr_info.corder != 0)) { H5_FAILED(); - HDprintf(" attribute's creation order value '%lld' did not match expected value '%lld'\n", - (long long)attr_info.corder, (long long)0); + printf(" attribute's creation order value '%lld' did not match expected value '%lld'\n", + (long long)attr_info.corder, (long long)0); PART_ERROR(H5Aget_info_by_idx_crt_order_decreasing); } @@ -5178,24 +5168,24 @@ test_get_attribute_info(void) if (attr_info.cset != H5T_CSET_ASCII && attr_info.cset != H5T_CSET_UTF8 && attr_info.cset != H5T_CSET_ERROR) { H5_FAILED(); - HDprintf(" attribute info's 'cset' field wasn't set to a meaningful value\n"); + printf(" attribute info's 'cset' field wasn't set to a meaningful value\n"); PART_ERROR(H5Aget_info_by_idx_crt_order_decreasing); } - HDmemset(&attr_info, 0, sizeof(attr_info)); + memset(&attr_info, 0, sizeof(attr_info)); if (H5Aget_info_by_idx(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 1, &attr_info, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't get info for attribute at index %d using H5Aget_info_by_idx by " - "creation order in decreasing order\n", - 1); + printf(" couldn't get info for attribute at index %d using H5Aget_info_by_idx by " + "creation order in decreasing order\n", + 1); PART_ERROR(H5Aget_info_by_idx_crt_order_decreasing); } if (attr_info.corder_valid && (attr_info.corder != 1)) { H5_FAILED(); - HDprintf(" attribute's creation order value '%lld' did not match expected value '%lld'\n", - (long long)attr_info.corder, (long long)1); + printf(" attribute's creation order value '%lld' did not match expected value '%lld'\n", + (long long)attr_info.corder, (long long)1); PART_ERROR(H5Aget_info_by_idx_crt_order_decreasing); } @@ -5203,24 +5193,24 @@ test_get_attribute_info(void) if (attr_info.cset != H5T_CSET_ASCII && attr_info.cset != H5T_CSET_UTF8 && attr_info.cset != H5T_CSET_ERROR) { H5_FAILED(); - HDprintf(" attribute info's 'cset' field wasn't set to a meaningful value\n"); + printf(" attribute info's 'cset' field wasn't set to a meaningful value\n"); PART_ERROR(H5Aget_info_by_idx_crt_order_decreasing); } - HDmemset(&attr_info, 0, sizeof(attr_info)); + memset(&attr_info, 0, sizeof(attr_info)); if (H5Aget_info_by_idx(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 0, &attr_info, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't get info for attribute at index %d using H5Aget_info_by_idx by " - "creation order in decreasing order\n", - 0); + printf(" couldn't get info for attribute at index %d using H5Aget_info_by_idx by " + "creation order in decreasing order\n", + 0); PART_ERROR(H5Aget_info_by_idx_crt_order_decreasing); } if (attr_info.corder_valid && (attr_info.corder != 2)) { H5_FAILED(); - HDprintf(" attribute's creation order value '%lld' did not match expected value '%lld'\n", - (long long)attr_info.corder, (long long)2); + printf(" attribute's creation order value '%lld' did not match expected value '%lld'\n", + (long long)attr_info.corder, (long long)2); PART_ERROR(H5Aget_info_by_idx_crt_order_decreasing); } @@ -5228,7 +5218,7 @@ test_get_attribute_info(void) if (attr_info.cset != H5T_CSET_ASCII && attr_info.cset != H5T_CSET_UTF8 && attr_info.cset != H5T_CSET_ERROR) { H5_FAILED(); - HDprintf(" attribute info's 'cset' field wasn't set to a meaningful value\n"); + printf(" attribute info's 'cset' field wasn't set to a meaningful value\n"); PART_ERROR(H5Aget_info_by_idx_crt_order_decreasing); } @@ -5240,20 +5230,20 @@ test_get_attribute_info(void) { TESTING_2("H5Aget_info_by_idx by alphabetical order in increasing order"); - HDmemset(&attr_info, 0, sizeof(attr_info)); + memset(&attr_info, 0, sizeof(attr_info)); if (H5Aget_info_by_idx(group_id, ".", H5_INDEX_NAME, H5_ITER_INC, 0, &attr_info, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't get info for attribute at index %d using H5Aget_info_by_idx by " - "alphabetical order in increasing order\n", - 0); + printf(" couldn't get info for attribute at index %d using H5Aget_info_by_idx by " + "alphabetical order in increasing order\n", + 0); PART_ERROR(H5Aget_info_by_idx_name_order_increasing); } if (attr_info.corder_valid && (attr_info.corder != 0)) { H5_FAILED(); - HDprintf(" attribute's creation order value '%lld' did not match expected value '%lld'\n", - (long long)attr_info.corder, (long long)0); + printf(" attribute's creation order value '%lld' did not match expected value '%lld'\n", + (long long)attr_info.corder, (long long)0); PART_ERROR(H5Aget_info_by_idx_name_order_increasing); } @@ -5261,24 +5251,24 @@ test_get_attribute_info(void) if (attr_info.cset != H5T_CSET_ASCII && attr_info.cset != H5T_CSET_UTF8 && attr_info.cset != H5T_CSET_ERROR) { H5_FAILED(); - HDprintf(" attribute info's 'cset' field wasn't set to a meaningful value\n"); + printf(" attribute info's 'cset' field wasn't set to a meaningful value\n"); PART_ERROR(H5Aget_info_by_idx_name_order_increasing); } - HDmemset(&attr_info, 0, sizeof(attr_info)); + memset(&attr_info, 0, sizeof(attr_info)); if (H5Aget_info_by_idx(group_id, ".", H5_INDEX_NAME, H5_ITER_INC, 1, &attr_info, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't get info for attribute at index %d using H5Aget_info_by_idx by " - "alphabetical order in increasing order\n", - 1); + printf(" couldn't get info for attribute at index %d using H5Aget_info_by_idx by " + "alphabetical order in increasing order\n", + 1); PART_ERROR(H5Aget_info_by_idx_name_order_increasing); } if (attr_info.corder_valid && (attr_info.corder != 1)) { H5_FAILED(); - HDprintf(" attribute's creation order value '%lld' did not match expected value '%lld'\n", - (long long)attr_info.corder, (long long)1); + printf(" attribute's creation order value '%lld' did not match expected value '%lld'\n", + (long long)attr_info.corder, (long long)1); PART_ERROR(H5Aget_info_by_idx_name_order_increasing); } @@ -5286,24 +5276,24 @@ test_get_attribute_info(void) if (attr_info.cset != H5T_CSET_ASCII && attr_info.cset != H5T_CSET_UTF8 && attr_info.cset != H5T_CSET_ERROR) { H5_FAILED(); - HDprintf(" attribute info's 'cset' field wasn't set to a meaningful value\n"); + printf(" attribute info's 'cset' field wasn't set to a meaningful value\n"); PART_ERROR(H5Aget_info_by_idx_name_order_increasing); } - HDmemset(&attr_info, 0, sizeof(attr_info)); + memset(&attr_info, 0, sizeof(attr_info)); if (H5Aget_info_by_idx(group_id, ".", H5_INDEX_NAME, H5_ITER_INC, 2, &attr_info, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't get info for attribute at index %d using H5Aget_info_by_idx by " - "alphabetical order in increasing order\n", - 2); + printf(" couldn't get info for attribute at index %d using H5Aget_info_by_idx by " + "alphabetical order in increasing order\n", + 2); PART_ERROR(H5Aget_info_by_idx_name_order_increasing); } if (attr_info.corder_valid && (attr_info.corder != 2)) { H5_FAILED(); - HDprintf(" attribute's creation order value '%lld' did not match expected value '%lld'\n", - (long long)attr_info.corder, (long long)2); + printf(" attribute's creation order value '%lld' did not match expected value '%lld'\n", + (long long)attr_info.corder, (long long)2); PART_ERROR(H5Aget_info_by_idx_name_order_increasing); } @@ -5311,7 +5301,7 @@ test_get_attribute_info(void) if (attr_info.cset != H5T_CSET_ASCII && attr_info.cset != H5T_CSET_UTF8 && attr_info.cset != H5T_CSET_ERROR) { H5_FAILED(); - HDprintf(" attribute info's 'cset' field wasn't set to a meaningful value\n"); + printf(" attribute info's 'cset' field wasn't set to a meaningful value\n"); PART_ERROR(H5Aget_info_by_idx_name_order_increasing); } @@ -5323,20 +5313,20 @@ test_get_attribute_info(void) { TESTING_2("H5Aget_info_by_idx by alphabetical order in decreasing order"); - HDmemset(&attr_info, 0, sizeof(attr_info)); + memset(&attr_info, 0, sizeof(attr_info)); if (H5Aget_info_by_idx(group_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 2, &attr_info, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't get info for attribute at index %d using H5Aget_info_by_idx by " - "alphabetical order in decreasing order\n", - 2); + printf(" couldn't get info for attribute at index %d using H5Aget_info_by_idx by " + "alphabetical order in decreasing order\n", + 2); PART_ERROR(H5Aget_info_by_idx_name_order_decreasing); } if (attr_info.corder_valid && (attr_info.corder != 0)) { H5_FAILED(); - HDprintf(" attribute's creation order value '%lld' did not match expected value '%lld'\n", - (long long)attr_info.corder, (long long)0); + printf(" attribute's creation order value '%lld' did not match expected value '%lld'\n", + (long long)attr_info.corder, (long long)0); PART_ERROR(H5Aget_info_by_idx_name_order_decreasing); } @@ -5344,24 +5334,24 @@ test_get_attribute_info(void) if (attr_info.cset != H5T_CSET_ASCII && attr_info.cset != H5T_CSET_UTF8 && attr_info.cset != H5T_CSET_ERROR) { H5_FAILED(); - HDprintf(" attribute info's 'cset' field wasn't set to a meaningful value\n"); + printf(" attribute info's 'cset' field wasn't set to a meaningful value\n"); PART_ERROR(H5Aget_info_by_idx_name_order_decreasing); } - HDmemset(&attr_info, 0, sizeof(attr_info)); + memset(&attr_info, 0, sizeof(attr_info)); if (H5Aget_info_by_idx(group_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 1, &attr_info, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't get info for attribute at index %d using H5Aget_info_by_idx by " - "alphabetical order in decreasing order\n", - 1); + printf(" couldn't get info for attribute at index %d using H5Aget_info_by_idx by " + "alphabetical order in decreasing order\n", + 1); PART_ERROR(H5Aget_info_by_idx_name_order_decreasing); } if (attr_info.corder_valid && (attr_info.corder != 1)) { H5_FAILED(); - HDprintf(" attribute's creation order value '%lld' did not match expected value '%lld'\n", - (long long)attr_info.corder, (long long)1); + printf(" attribute's creation order value '%lld' did not match expected value '%lld'\n", + (long long)attr_info.corder, (long long)1); PART_ERROR(H5Aget_info_by_idx_name_order_decreasing); } @@ -5369,24 +5359,24 @@ test_get_attribute_info(void) if (attr_info.cset != H5T_CSET_ASCII && attr_info.cset != H5T_CSET_UTF8 && attr_info.cset != H5T_CSET_ERROR) { H5_FAILED(); - HDprintf(" attribute info's 'cset' field wasn't set to a meaningful value\n"); + printf(" attribute info's 'cset' field wasn't set to a meaningful value\n"); PART_ERROR(H5Aget_info_by_idx_name_order_decreasing); } - HDmemset(&attr_info, 0, sizeof(attr_info)); + memset(&attr_info, 0, sizeof(attr_info)); if (H5Aget_info_by_idx(group_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 0, &attr_info, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't get info for attribute at index %d using H5Aget_info_by_idx by " - "alphabetical order in decreasing order\n", - 0); + printf(" couldn't get info for attribute at index %d using H5Aget_info_by_idx by " + "alphabetical order in decreasing order\n", + 0); PART_ERROR(H5Aget_info_by_idx_name_order_decreasing); } if (attr_info.corder_valid && (attr_info.corder != 2)) { H5_FAILED(); - HDprintf(" attribute's creation order value '%lld' did not match expected value '%lld'\n", - (long long)attr_info.corder, (long long)2); + printf(" attribute's creation order value '%lld' did not match expected value '%lld'\n", + (long long)attr_info.corder, (long long)2); PART_ERROR(H5Aget_info_by_idx_name_order_decreasing); } @@ -5394,7 +5384,7 @@ test_get_attribute_info(void) if (attr_info.cset != H5T_CSET_ASCII && attr_info.cset != H5T_CSET_UTF8 && attr_info.cset != H5T_CSET_ERROR) { H5_FAILED(); - HDprintf(" attribute info's 'cset' field wasn't set to a meaningful value\n"); + printf(" attribute info's 'cset' field wasn't set to a meaningful value\n"); PART_ERROR(H5Aget_info_by_idx_name_order_decreasing); } @@ -5462,7 +5452,7 @@ test_get_attribute_info_invalid_params(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_MORE)) { SKIPPED(); - HDprintf( + printf( " API functions for basic file, group, or attribute aren't supported with this connector\n"); return 0; } @@ -5471,21 +5461,21 @@ test_get_attribute_info_invalid_params(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, ATTRIBUTE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", ATTRIBUTE_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", ATTRIBUTE_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, ATTRIBUTE_GET_INFO_INVALID_PARAMS_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container group '%s'\n", - ATTRIBUTE_GET_INFO_INVALID_PARAMS_TEST_GROUP_NAME); + printf(" couldn't create container group '%s'\n", + ATTRIBUTE_GET_INFO_INVALID_PARAMS_TEST_GROUP_NAME); goto error; } @@ -5499,20 +5489,20 @@ test_get_attribute_info_invalid_params(void) if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_GET_INFO_INVALID_PARAMS_TEST_ATTR_NAME, attr_dtype, space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create attribute\n"); + printf(" couldn't create attribute\n"); goto error; } /* Verify the attribute has been created */ if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_GET_INFO_INVALID_PARAMS_TEST_ATTR_NAME)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if attribute exists\n"); + printf(" couldn't determine if attribute exists\n"); goto error; } if (!attr_exists) { H5_FAILED(); - HDprintf(" attribute did not exist\n"); + printf(" attribute did not exist\n"); goto error; } @@ -5532,7 +5522,7 @@ test_get_attribute_info_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" retrieved attribute info using H5Aget_info with an invalid attr_id!\n"); + printf(" retrieved attribute info using H5Aget_info with an invalid attr_id!\n"); PART_ERROR(H5Aget_info_invalid_attr_id); } @@ -5552,7 +5542,7 @@ test_get_attribute_info_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" retrieved attribute info using H5Aget_info with an invalid attr_id!\n"); + printf(" retrieved attribute info using H5Aget_info with an invalid attr_id!\n"); PART_ERROR(H5Aget_info_invalid_attr_info_pointer); } @@ -5574,7 +5564,7 @@ test_get_attribute_info_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" retrieved attribute info using H5Aget_info_by_name with an invalid loc_id!\n"); + printf(" retrieved attribute info using H5Aget_info_by_name with an invalid loc_id!\n"); PART_ERROR(H5Aget_info_by_name_invalid_loc_id); } @@ -5596,7 +5586,7 @@ test_get_attribute_info_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" retrieved attribute info using H5Aget_info_by_name with a NULL object name!\n"); + printf(" retrieved attribute info using H5Aget_info_by_name with a NULL object name!\n"); PART_ERROR(H5Aget_info_by_name_invalid_obj_name); } @@ -5609,8 +5599,8 @@ test_get_attribute_info_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" retrieved attribute info using H5Aget_info_by_name with an invalid object name " - "of ''!\n"); + printf(" retrieved attribute info using H5Aget_info_by_name with an invalid object name " + "of ''!\n"); PART_ERROR(H5Aget_info_by_name_invalid_obj_name); } @@ -5630,7 +5620,7 @@ test_get_attribute_info_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf( + printf( " retrieved attribute info using H5Aget_info_by_name with a NULL attribute name!\n"); PART_ERROR(H5Aget_info_by_name_invalid_attr_name); } @@ -5643,8 +5633,8 @@ test_get_attribute_info_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" retrieved attribute info using H5Aget_info_by_name with an invalid attribute " - "name of ''!\n"); + printf(" retrieved attribute info using H5Aget_info_by_name with an invalid attribute " + "name of ''!\n"); PART_ERROR(H5Aget_info_by_name_invalid_attr_name); } @@ -5665,8 +5655,8 @@ test_get_attribute_info_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" retrieved attribute info using H5Aget_info_by_name with an invalid attribute " - "info pointer!\n"); + printf(" retrieved attribute info using H5Aget_info_by_name with an invalid attribute " + "info pointer!\n"); PART_ERROR(H5Aget_info_by_name_invalid_attr_info_pointer); } @@ -5687,7 +5677,7 @@ test_get_attribute_info_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" retrieved attribute info using H5Aget_info_by_name with an invalid LAPL!\n"); + printf(" retrieved attribute info using H5Aget_info_by_name with an invalid LAPL!\n"); PART_ERROR(H5Aget_info_by_name_invalid_lapl); } @@ -5708,7 +5698,7 @@ test_get_attribute_info_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" retrieved attribute info using H5Aget_info_by_idx with an invalid loc_id!\n"); + printf(" retrieved attribute info using H5Aget_info_by_idx with an invalid loc_id!\n"); PART_ERROR(H5Aget_info_by_idx_invalid_loc_id); } @@ -5729,7 +5719,7 @@ test_get_attribute_info_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" retrieved attribute info using H5Aget_info_by_idx with a NULL object name!\n"); + printf(" retrieved attribute info using H5Aget_info_by_idx with a NULL object name!\n"); PART_ERROR(H5Aget_info_by_idx_invalid_obj_name); } @@ -5742,8 +5732,8 @@ test_get_attribute_info_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" retrieved attribute info using H5Aget_info_by_idx with an invalid object name " - "of ''!\n"); + printf(" retrieved attribute info using H5Aget_info_by_idx with an invalid object name " + "of ''!\n"); PART_ERROR(H5Aget_info_by_idx_invalid_obj_name); } @@ -5764,8 +5754,8 @@ test_get_attribute_info_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" retrieved attribute info using H5Aget_info_by_idx with invalid index type " - "H5_INDEX_UNKNOWN!\n"); + printf(" retrieved attribute info using H5Aget_info_by_idx with invalid index type " + "H5_INDEX_UNKNOWN!\n"); PART_ERROR(H5Aget_info_by_idx_invalid_index_type); } @@ -5778,8 +5768,8 @@ test_get_attribute_info_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" retrieved attribute info using H5Aget_info_by_idx with invalid index type " - "H5_INDEX_N!\n"); + printf(" retrieved attribute info using H5Aget_info_by_idx with invalid index type " + "H5_INDEX_N!\n"); PART_ERROR(H5Aget_info_by_idx_invalid_index_type); } @@ -5800,8 +5790,8 @@ test_get_attribute_info_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" retrieved attribute info using H5Aget_info_by_idx with invalid iteration order " - "H5_ITER_UNKNOWN!\n"); + printf(" retrieved attribute info using H5Aget_info_by_idx with invalid iteration order " + "H5_ITER_UNKNOWN!\n"); PART_ERROR(H5Aget_info_by_idx_invalid_iter_order); } @@ -5814,8 +5804,8 @@ test_get_attribute_info_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" retrieved attribute info using H5Aget_info_by_idx with invalid iteration order " - "H5_ITER_N!\n"); + printf(" retrieved attribute info using H5Aget_info_by_idx with invalid iteration order " + "H5_ITER_N!\n"); PART_ERROR(H5Aget_info_by_idx_invalid_iter_order); } @@ -5835,8 +5825,8 @@ test_get_attribute_info_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" retrieved attribute info using H5Aget_info_by_idx with an invalid attribute " - "info pointer!\n"); + printf(" retrieved attribute info using H5Aget_info_by_idx with an invalid attribute " + "info pointer!\n"); PART_ERROR(H5Aget_info_by_idx_invalid_attr_info_pointer); } @@ -5857,7 +5847,7 @@ test_get_attribute_info_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" retrieved attribute info using H5Aget_info_by_idx with an invalid LAPL!\n"); + printf(" retrieved attribute info using H5Aget_info_by_idx with an invalid LAPL!\n"); PART_ERROR(H5Aget_info_by_idx_invalid_lapl); } @@ -5922,7 +5912,7 @@ test_rename_attribute(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_MORE)) { SKIPPED(); - HDprintf( + printf( " API functions for basic file, group, or attribute aren't supported with this connector\n"); return 0; } @@ -5931,20 +5921,20 @@ test_rename_attribute(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, ATTRIBUTE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", ATTRIBUTE_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", ATTRIBUTE_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, ATTRIBUTE_RENAME_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container group '%s'\n", ATTRIBUTE_RENAME_TEST_GROUP_NAME); + printf(" couldn't create container group '%s'\n", ATTRIBUTE_RENAME_TEST_GROUP_NAME); goto error; } @@ -5957,39 +5947,39 @@ test_rename_attribute(void) if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_RENAME_TEST_ATTR_NAME, attr_dtype, attr_space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create attribute\n"); + printf(" couldn't create attribute\n"); goto error; } if ((attr_id2 = H5Acreate2(group_id, ATTRIBUTE_RENAME_TEST_ATTR_NAME2, attr_dtype, attr_space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create attribute\n"); + printf(" couldn't create attribute\n"); goto error; } /* Verify the attributes have been created */ if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_RENAME_TEST_ATTR_NAME)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if attribute exists\n"); + printf(" couldn't determine if attribute exists\n"); goto error; } if (!attr_exists) { H5_FAILED(); - HDprintf(" attribute did not exist\n"); + printf(" attribute did not exist\n"); goto error; } if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_RENAME_TEST_ATTR_NAME2)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if attribute exists\n"); + printf(" couldn't determine if attribute exists\n"); goto error; } if (!attr_exists) { H5_FAILED(); - HDprintf(" attribute did not exist\n"); + printf(" attribute did not exist\n"); goto error; } @@ -6003,33 +5993,33 @@ test_rename_attribute(void) if (H5Arename(group_id, ATTRIBUTE_RENAME_TEST_ATTR_NAME, ATTRIBUTE_RENAME_TEST_NEW_NAME) < 0) { H5_FAILED(); - HDprintf(" couldn't rename attribute '%s' to '%s' using H5Arename\n", - ATTRIBUTE_RENAME_TEST_ATTR_NAME, ATTRIBUTE_RENAME_TEST_NEW_NAME); + printf(" couldn't rename attribute '%s' to '%s' using H5Arename\n", + ATTRIBUTE_RENAME_TEST_ATTR_NAME, ATTRIBUTE_RENAME_TEST_NEW_NAME); PART_ERROR(H5Arename); } /* Verify the attribute has been renamed */ if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_RENAME_TEST_ATTR_NAME)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if attribute exists\n"); + printf(" couldn't determine if attribute exists\n"); PART_ERROR(H5Arename); } if (attr_exists) { H5_FAILED(); - HDprintf(" attribute did not get renamed!\n"); + printf(" attribute did not get renamed!\n"); PART_ERROR(H5Arename); } if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_RENAME_TEST_NEW_NAME)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if attribute exists\n"); + printf(" couldn't determine if attribute exists\n"); PART_ERROR(H5Arename); } if (!attr_exists) { H5_FAILED(); - HDprintf(" attribute did not get renamed!\n"); + printf(" attribute did not get renamed!\n"); PART_ERROR(H5Arename); } @@ -6045,33 +6035,33 @@ test_rename_attribute(void) ATTRIBUTE_RENAME_TEST_ATTR_NAME2, ATTRIBUTE_RENAME_TEST_NEW_NAME2, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't rename attribute '%s' to '%s' using H5Arename_by_name\n", - ATTRIBUTE_RENAME_TEST_ATTR_NAME2, ATTRIBUTE_RENAME_TEST_NEW_NAME2); + printf(" couldn't rename attribute '%s' to '%s' using H5Arename_by_name\n", + ATTRIBUTE_RENAME_TEST_ATTR_NAME2, ATTRIBUTE_RENAME_TEST_NEW_NAME2); PART_ERROR(H5Arename_by_name); } /* Verify the attribute has been renamed */ if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_RENAME_TEST_ATTR_NAME2)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if attribute exists\n"); + printf(" couldn't determine if attribute exists\n"); PART_ERROR(H5Arename_by_name); } if (attr_exists) { H5_FAILED(); - HDprintf(" attribute did not get renamed!\n"); + printf(" attribute did not get renamed!\n"); PART_ERROR(H5Arename_by_name); } if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_RENAME_TEST_NEW_NAME2)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if attribute exists\n"); + printf(" couldn't determine if attribute exists\n"); PART_ERROR(H5Arename_by_name); } if (!attr_exists) { H5_FAILED(); - HDprintf(" attribute did not get renamed!\n"); + printf(" attribute did not get renamed!\n"); PART_ERROR(H5Arename_by_name); } @@ -6140,7 +6130,7 @@ test_rename_attribute_invalid_params(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_MORE)) { SKIPPED(); - HDprintf( + printf( " API functions for basic file, group, or attribute aren't supported with this connector\n"); return 0; } @@ -6149,21 +6139,20 @@ test_rename_attribute_invalid_params(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, ATTRIBUTE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", ATTRIBUTE_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", ATTRIBUTE_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, ATTRIBUTE_RENAME_INVALID_PARAMS_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container group '%s'\n", - ATTRIBUTE_RENAME_INVALID_PARAMS_TEST_GROUP_NAME); + printf(" couldn't create container group '%s'\n", ATTRIBUTE_RENAME_INVALID_PARAMS_TEST_GROUP_NAME); goto error; } @@ -6177,39 +6166,39 @@ test_rename_attribute_invalid_params(void) if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_RENAME_INVALID_PARAMS_TEST_ATTR_NAME, attr_dtype, attr_space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create attribute\n"); + printf(" couldn't create attribute\n"); goto error; } if ((attr_id2 = H5Acreate2(group_id, ATTRIBUTE_RENAME_INVALID_PARAMS_TEST_ATTR_NAME2, attr_dtype, attr_space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create attribute\n"); + printf(" couldn't create attribute\n"); goto error; } /* Verify the attributes have been created */ if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_RENAME_INVALID_PARAMS_TEST_ATTR_NAME)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if attribute exists\n"); + printf(" couldn't determine if attribute exists\n"); goto error; } if (!attr_exists) { H5_FAILED(); - HDprintf(" attribute did not exist\n"); + printf(" attribute did not exist\n"); goto error; } if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_RENAME_INVALID_PARAMS_TEST_ATTR_NAME2)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if attribute exists\n"); + printf(" couldn't determine if attribute exists\n"); goto error; } if (!attr_exists) { H5_FAILED(); - HDprintf(" attribute did not exist\n"); + printf(" attribute did not exist\n"); goto error; } @@ -6230,7 +6219,7 @@ test_rename_attribute_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" renamed attribute using H5Arename with an invalid loc_id!\n"); + printf(" renamed attribute using H5Arename with an invalid loc_id!\n"); PART_ERROR(H5Arename_invalid_loc_id); } @@ -6250,7 +6239,7 @@ test_rename_attribute_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" renamed attribute using H5Arename with a NULL old attribute name!\n"); + printf(" renamed attribute using H5Arename with a NULL old attribute name!\n"); PART_ERROR(H5Arename_invalid_old_attr_name); } @@ -6262,7 +6251,7 @@ test_rename_attribute_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" renamed attribute using H5Arename with an invalid old attribute name of ''!\n"); + printf(" renamed attribute using H5Arename with an invalid old attribute name of ''!\n"); PART_ERROR(H5Arename_invalid_old_attr_name); } @@ -6282,7 +6271,7 @@ test_rename_attribute_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" renamed attribute using H5Arename with a NULL new attribute name!\n"); + printf(" renamed attribute using H5Arename with a NULL new attribute name!\n"); PART_ERROR(H5Arename_invalid_new_attr_name); } @@ -6294,7 +6283,7 @@ test_rename_attribute_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" renamed attribute using H5Arename with an invalid new attribute name of ''!\n"); + printf(" renamed attribute using H5Arename with an invalid new attribute name of ''!\n"); PART_ERROR(H5Arename_invalid_new_attr_name); } @@ -6316,7 +6305,7 @@ test_rename_attribute_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" renamed attribute using H5Arename_by_name with an invalid loc_id!\n"); + printf(" renamed attribute using H5Arename_by_name with an invalid loc_id!\n"); PART_ERROR(H5Arename_by_name_invalid_loc_id); } @@ -6337,7 +6326,7 @@ test_rename_attribute_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" renamed attribute using H5Arename_by_name with a NULL object name!\n"); + printf(" renamed attribute using H5Arename_by_name with a NULL object name!\n"); PART_ERROR(H5Arename_by_name_invalid_obj_name); } @@ -6350,8 +6339,7 @@ test_rename_attribute_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf( - " renamed attribute using H5Arename_by_name with an invalid object name of ''!\n"); + printf(" renamed attribute using H5Arename_by_name with an invalid object name of ''!\n"); PART_ERROR(H5Arename_by_name_invalid_obj_name); } @@ -6372,7 +6360,7 @@ test_rename_attribute_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" renamed attribute using H5Arename_by_name with a NULL old attribute name!\n"); + printf(" renamed attribute using H5Arename_by_name with a NULL old attribute name!\n"); PART_ERROR(H5Arename_by_name_invalid_old_attr_name); } @@ -6385,8 +6373,8 @@ test_rename_attribute_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" renamed attribute using H5Arename_by_name with an invalid old attribute name " - "of ''!\n"); + printf(" renamed attribute using H5Arename_by_name with an invalid old attribute name " + "of ''!\n"); PART_ERROR(H5Arename_by_name_invalid_old_attr_name); } @@ -6407,7 +6395,7 @@ test_rename_attribute_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" renamed attribute using H5Arename_by_name with a NULL new attribute name!\n"); + printf(" renamed attribute using H5Arename_by_name with a NULL new attribute name!\n"); PART_ERROR(H5Arename_by_name_invalid_new_attr_name); } @@ -6420,8 +6408,8 @@ test_rename_attribute_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" renamed attribute using H5Arename_by_name with an invalid new attribute name " - "of ''!\n"); + printf(" renamed attribute using H5Arename_by_name with an invalid new attribute name " + "of ''!\n"); PART_ERROR(H5Arename_by_name_invalid_new_attr_name); } @@ -6442,7 +6430,7 @@ test_rename_attribute_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" renamed attribute using H5Arename_by_name with an invalid LAPL!\n"); + printf(" renamed attribute using H5Arename_by_name with an invalid LAPL!\n"); PART_ERROR(H5Arename_by_name_invalid_lapl); } @@ -6515,8 +6503,8 @@ test_attribute_iterate_group(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ITERATE)) { SKIPPED(); - HDprintf(" API functions for basic file, group, attribute, or iterate aren't " - "supported with this connector\n"); + printf(" API functions for basic file, group, attribute, or iterate aren't " + "supported with this connector\n"); return 0; } @@ -6524,26 +6512,26 @@ test_attribute_iterate_group(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, ATTRIBUTE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group\n"); + printf(" couldn't open container group\n"); goto error; } if ((gcpl_id = H5Pcreate(H5P_GROUP_CREATE)) < 0) { H5_FAILED(); - HDprintf(" couldn't create GCPL for attribute creation order tracking\n"); + printf(" couldn't create GCPL for attribute creation order tracking\n"); goto error; } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (H5Pset_attr_creation_order(gcpl_id, H5P_CRT_ORDER_TRACKED) < 0) { H5_FAILED(); - HDprintf(" couldn't set attribute creation order tracking\n"); + printf(" couldn't set attribute creation order tracking\n"); goto error; } } @@ -6551,7 +6539,7 @@ test_attribute_iterate_group(void) if ((group_id = H5Gcreate2(container_group, ATTRIBUTE_ITERATE_TEST_GRP_SUBGROUP_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container subgroup '%s'\n", ATTRIBUTE_ITERATE_TEST_GRP_SUBGROUP_NAME); + printf(" couldn't create container subgroup '%s'\n", ATTRIBUTE_ITERATE_TEST_GRP_SUBGROUP_NAME); goto error; } @@ -6571,26 +6559,26 @@ test_attribute_iterate_group(void) if ((attr_id = H5Acreate2(group_id, attr_name, attr_dtype, attr_space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create attribute '%s'\n", attr_name); + printf(" couldn't create attribute '%s'\n", attr_name); goto error; } /* Verify the attribute has been created */ if ((attr_exists = H5Aexists(group_id, attr_name)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if attribute '%s' exists\n", attr_name); + printf(" couldn't determine if attribute '%s' exists\n", attr_name); goto error; } if (!attr_exists) { H5_FAILED(); - HDprintf(" attribute '%s' did not exist\n", attr_name); + printf(" attribute '%s' did not exist\n", attr_name); goto error; } if (H5Aclose(attr_id) < 0) { H5_FAILED(); - HDprintf(" failed to close attribute '%s'\n", attr_name); + printf(" failed to close attribute '%s'\n", attr_name); goto error; } } @@ -6617,15 +6605,15 @@ test_attribute_iterate_group(void) if (H5Aiterate2(group_id, H5_INDEX_NAME, H5_ITER_INC, NULL, attr_iter_callback1, &link_counter) < 0) { H5_FAILED(); - HDprintf(" H5Aiterate2 by index type name in increasing order failed\n"); + printf(" H5Aiterate2 by index type name in increasing order failed\n"); PART_ERROR(H5Aiterate2_name_increasing); } /* Make sure that the attribute iteration callback was actually called */ if (link_counter == 0) { H5_FAILED(); - HDprintf(" H5Aiterate sentinel value is unchanged; supplied callback function must not " - "have been called!\n"); + printf(" H5Aiterate sentinel value is unchanged; supplied callback function must not " + "have been called!\n"); PART_ERROR(H5Aiterate2_name_increasing); } @@ -6642,15 +6630,15 @@ test_attribute_iterate_group(void) if (H5Aiterate2(group_id, H5_INDEX_NAME, H5_ITER_DEC, NULL, attr_iter_callback1, &link_counter) < 0) { H5_FAILED(); - HDprintf(" H5Aiterate2 by index type name in decreasing order failed\n"); + printf(" H5Aiterate2 by index type name in decreasing order failed\n"); PART_ERROR(H5Aiterate2_name_decreasing); } /* Make sure that the attribute iteration callback was actually called */ if (link_counter == ATTRIBUTE_ITERATE_TEST_NUM_ATTRS) { H5_FAILED(); - HDprintf(" H5Aiterate sentinel value is unchanged; supplied callback function must not " - "have been called!\n"); + printf(" H5Aiterate sentinel value is unchanged; supplied callback function must not " + "have been called!\n"); PART_ERROR(H5Aiterate2_name_decreasing); } @@ -6664,7 +6652,7 @@ test_attribute_iterate_group(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" creation order tracking isn't supported with this VOL connector\n"); + printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Aiterate2_creation_increasing); } @@ -6674,15 +6662,15 @@ test_attribute_iterate_group(void) if (H5Aiterate2(group_id, H5_INDEX_CRT_ORDER, H5_ITER_INC, NULL, attr_iter_callback1, &link_counter) < 0) { H5_FAILED(); - HDprintf(" H5Aiterate2 by index type creation order in increasing order failed\n"); + printf(" H5Aiterate2 by index type creation order in increasing order failed\n"); PART_ERROR(H5Aiterate2_creation_increasing); } /* Make sure that the attribute iteration callback was actually called */ if (link_counter == 2 * ATTRIBUTE_ITERATE_TEST_NUM_ATTRS) { H5_FAILED(); - HDprintf(" H5Aiterate sentinel value is unchanged; supplied callback function must not " - "have been called!\n"); + printf(" H5Aiterate sentinel value is unchanged; supplied callback function must not " + "have been called!\n"); PART_ERROR(H5Aiterate2_creation_increasing); } @@ -6696,7 +6684,7 @@ test_attribute_iterate_group(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" creation order tracking isn't supported with this VOL connector\n"); + printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Aiterate2_creation_decreasing); } @@ -6706,15 +6694,15 @@ test_attribute_iterate_group(void) if (H5Aiterate2(group_id, H5_INDEX_CRT_ORDER, H5_ITER_DEC, NULL, attr_iter_callback1, &link_counter) < 0) { H5_FAILED(); - HDprintf(" H5Aiterate2 by index type creation order in decreasing order failed\n"); + printf(" H5Aiterate2 by index type creation order in decreasing order failed\n"); PART_ERROR(H5Aiterate2_creation_decreasing); } /* Make sure that the attribute iteration callback was actually called */ if (link_counter == 3 * ATTRIBUTE_ITERATE_TEST_NUM_ATTRS) { H5_FAILED(); - HDprintf(" H5Aiterate sentinel value is unchanged; supplied callback function must not " - "have been called!\n"); + printf(" H5Aiterate sentinel value is unchanged; supplied callback function must not " + "have been called!\n"); PART_ERROR(H5Aiterate2_creation_decreasing); } @@ -6733,15 +6721,15 @@ test_attribute_iterate_group(void) file_id, "/" ATTRIBUTE_TEST_GROUP_NAME "/" ATTRIBUTE_ITERATE_TEST_GRP_SUBGROUP_NAME, H5_INDEX_NAME, H5_ITER_INC, NULL, attr_iter_callback1, &link_counter, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" H5Aiterate_by_name by index type name in increasing order failed\n"); + printf(" H5Aiterate_by_name by index type name in increasing order failed\n"); PART_ERROR(H5Aiterate_by_name_name_increasing); } /* Make sure that the attribute iteration callback was actually called */ if (link_counter == 0) { H5_FAILED(); - HDprintf(" H5Aiterate_by_name sentinel value is unchanged; supplied callback function " - "must not have been called!\n"); + printf(" H5Aiterate_by_name sentinel value is unchanged; supplied callback function " + "must not have been called!\n"); PART_ERROR(H5Aiterate_by_name_name_increasing); } @@ -6760,15 +6748,15 @@ test_attribute_iterate_group(void) file_id, "/" ATTRIBUTE_TEST_GROUP_NAME "/" ATTRIBUTE_ITERATE_TEST_GRP_SUBGROUP_NAME, H5_INDEX_NAME, H5_ITER_DEC, NULL, attr_iter_callback1, &link_counter, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" H5Aiterate_by_name by index type name in decreasing order failed\n"); + printf(" H5Aiterate_by_name by index type name in decreasing order failed\n"); PART_ERROR(H5Aiterate_by_name_name_decreasing); } /* Make sure that the attribute iteration callback was actually called */ if (link_counter == ATTRIBUTE_ITERATE_TEST_NUM_ATTRS) { H5_FAILED(); - HDprintf(" H5Aiterate_by_name sentinel value is unchanged; supplied callback function " - "must not have been called!\n"); + printf(" H5Aiterate_by_name sentinel value is unchanged; supplied callback function " + "must not have been called!\n"); PART_ERROR(H5Aiterate_by_name_name_decreasing); } @@ -6782,7 +6770,7 @@ test_attribute_iterate_group(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" creation order tracking isn't supported with this VOL connector\n"); + printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Aiterate_by_name_creation_increasing); } @@ -6794,15 +6782,15 @@ test_attribute_iterate_group(void) H5_INDEX_CRT_ORDER, H5_ITER_INC, NULL, attr_iter_callback1, &link_counter, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" H5Aiterate_by_name by index type creation order in increasing order failed\n"); + printf(" H5Aiterate_by_name by index type creation order in increasing order failed\n"); PART_ERROR(H5Aiterate_by_name_creation_increasing); } /* Make sure that the attribute iteration callback was actually called */ if (link_counter == 2 * ATTRIBUTE_ITERATE_TEST_NUM_ATTRS) { H5_FAILED(); - HDprintf(" H5Aiterate_by_name sentinel value is unchanged; supplied callback function " - "must not have been called!\n"); + printf(" H5Aiterate_by_name sentinel value is unchanged; supplied callback function " + "must not have been called!\n"); PART_ERROR(H5Aiterate_by_name_creation_increasing); } @@ -6816,7 +6804,7 @@ test_attribute_iterate_group(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" creation order tracking isn't supported with this VOL connector\n"); + printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Aiterate_by_name_creation_decreasing); } @@ -6828,15 +6816,15 @@ test_attribute_iterate_group(void) H5_INDEX_CRT_ORDER, H5_ITER_DEC, NULL, attr_iter_callback1, &link_counter, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" H5Aiterate_by_name by index type creation order in decreasing order failed\n"); + printf(" H5Aiterate_by_name by index type creation order in decreasing order failed\n"); PART_ERROR(H5Aiterate_by_name_creation_decreasing); } /* Make sure that the attribute iteration callback was actually called */ if (link_counter == 3 * ATTRIBUTE_ITERATE_TEST_NUM_ATTRS) { H5_FAILED(); - HDprintf(" H5Aiterate_by_name sentinel value is unchanged; supplied callback function " - "must not have been called!\n"); + printf(" H5Aiterate_by_name sentinel value is unchanged; supplied callback function " + "must not have been called!\n"); PART_ERROR(H5Aiterate_by_name_creation_decreasing); } @@ -6911,8 +6899,8 @@ test_attribute_iterate_dataset(void) !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ITERATE) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC)) { SKIPPED(); - HDprintf(" API functions for basic file, group, dataset, attribute, or iterate " - "aren't supported with this connector\n"); + printf(" API functions for basic file, group, dataset, attribute, or iterate " + "aren't supported with this connector\n"); return 0; } @@ -6920,33 +6908,33 @@ test_attribute_iterate_dataset(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, ATTRIBUTE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group\n"); + printf(" couldn't open container group\n"); goto error; } if ((group_id = H5Gcreate2(container_group, ATTRIBUTE_ITERATE_TEST_DSET_SUBGROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container subgroup '%s'\n", ATTRIBUTE_ITERATE_TEST_DSET_SUBGROUP_NAME); + printf(" couldn't create container subgroup '%s'\n", ATTRIBUTE_ITERATE_TEST_DSET_SUBGROUP_NAME); goto error; } if ((dcpl_id = H5Pcreate(H5P_DATASET_CREATE)) < 0) { H5_FAILED(); - HDprintf(" couldn't create DCPL for attribute creation order tracking\n"); + printf(" couldn't create DCPL for attribute creation order tracking\n"); goto error; } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (H5Pset_attr_creation_order(dcpl_id, H5P_CRT_ORDER_TRACKED) < 0) { H5_FAILED(); - HDprintf(" couldn't set attribute creation order tracking\n"); + printf(" couldn't set attribute creation order tracking\n"); goto error; } } @@ -6966,7 +6954,7 @@ test_attribute_iterate_dataset(void) if ((dset_id = H5Dcreate2(group_id, ATTRIBUTE_ITERATE_TEST_DSET_NAME, dset_dtype, dset_space_id, H5P_DEFAULT, dcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create dataset '%s'\n", ATTRIBUTE_ITERATE_TEST_DSET_NAME); + printf(" couldn't create dataset '%s'\n", ATTRIBUTE_ITERATE_TEST_DSET_NAME); goto error; } @@ -6980,26 +6968,26 @@ test_attribute_iterate_dataset(void) if ((attr_id = H5Acreate2(dset_id, attr_name, attr_dtype, attr_space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create attribute '%s'\n", attr_name); + printf(" couldn't create attribute '%s'\n", attr_name); goto error; } /* Verify the attribute has been created */ if ((attr_exists = H5Aexists(dset_id, attr_name)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if attribute '%s' exists\n", attr_name); + printf(" couldn't determine if attribute '%s' exists\n", attr_name); goto error; } if (!attr_exists) { H5_FAILED(); - HDprintf(" attribute '%s' did not exist\n", attr_name); + printf(" attribute '%s' did not exist\n", attr_name); goto error; } if (H5Aclose(attr_id) < 0) { H5_FAILED(); - HDprintf(" failed to close attribute '%s'\n", attr_name); + printf(" failed to close attribute '%s'\n", attr_name); goto error; } } @@ -7026,15 +7014,15 @@ test_attribute_iterate_dataset(void) if (H5Aiterate2(dset_id, H5_INDEX_NAME, H5_ITER_INC, NULL, attr_iter_callback1, &link_counter) < 0) { H5_FAILED(); - HDprintf(" H5Aiterate2 by index type name in increasing order failed\n"); + printf(" H5Aiterate2 by index type name in increasing order failed\n"); PART_ERROR(H5Aiterate2_name_increasing); } /* Make sure that the attribute iteration callback was actually called */ if (link_counter == 0) { H5_FAILED(); - HDprintf(" H5Aiterate sentinel value is unchanged; supplied callback function must not " - "have been called!\n"); + printf(" H5Aiterate sentinel value is unchanged; supplied callback function must not " + "have been called!\n"); PART_ERROR(H5Aiterate2_name_increasing); } @@ -7051,15 +7039,15 @@ test_attribute_iterate_dataset(void) if (H5Aiterate2(dset_id, H5_INDEX_NAME, H5_ITER_DEC, NULL, attr_iter_callback1, &link_counter) < 0) { H5_FAILED(); - HDprintf(" H5Aiterate2 by index type name in decreasing order failed\n"); + printf(" H5Aiterate2 by index type name in decreasing order failed\n"); PART_ERROR(H5Aiterate2_name_decreasing); } /* Make sure that the attribute iteration callback was actually called */ if (link_counter == ATTRIBUTE_ITERATE_TEST_NUM_ATTRS) { H5_FAILED(); - HDprintf(" H5Aiterate sentinel value is unchanged; supplied callback function must not " - "have been called!\n"); + printf(" H5Aiterate sentinel value is unchanged; supplied callback function must not " + "have been called!\n"); PART_ERROR(H5Aiterate2_name_decreasing); } @@ -7073,7 +7061,7 @@ test_attribute_iterate_dataset(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" creation order tracking isn't supported with this VOL connector\n"); + printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Aiterate2_creation_increasing); } @@ -7083,15 +7071,15 @@ test_attribute_iterate_dataset(void) if (H5Aiterate2(dset_id, H5_INDEX_CRT_ORDER, H5_ITER_INC, NULL, attr_iter_callback1, &link_counter) < 0) { H5_FAILED(); - HDprintf(" H5Aiterate2 by index type creation order in increasing order failed\n"); + printf(" H5Aiterate2 by index type creation order in increasing order failed\n"); PART_ERROR(H5Aiterate2_creation_increasing); } /* Make sure that the attribute iteration callback was actually called */ if (link_counter == 2 * ATTRIBUTE_ITERATE_TEST_NUM_ATTRS) { H5_FAILED(); - HDprintf(" H5Aiterate sentinel value is unchanged; supplied callback function must not " - "have been called!\n"); + printf(" H5Aiterate sentinel value is unchanged; supplied callback function must not " + "have been called!\n"); PART_ERROR(H5Aiterate2_creation_increasing); } @@ -7105,7 +7093,7 @@ test_attribute_iterate_dataset(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" creation order tracking isn't supported with this VOL connector\n"); + printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Aiterate2_creation_decreasing); } @@ -7115,15 +7103,15 @@ test_attribute_iterate_dataset(void) if (H5Aiterate2(dset_id, H5_INDEX_CRT_ORDER, H5_ITER_DEC, NULL, attr_iter_callback1, &link_counter) < 0) { H5_FAILED(); - HDprintf(" H5Aiterate2 by index type creation order in decreasing order failed\n"); + printf(" H5Aiterate2 by index type creation order in decreasing order failed\n"); PART_ERROR(H5Aiterate2_creation_decreasing); } /* Make sure that the attribute iteration callback was actually called */ if (link_counter == 3 * ATTRIBUTE_ITERATE_TEST_NUM_ATTRS) { H5_FAILED(); - HDprintf(" H5Aiterate sentinel value is unchanged; supplied callback function must not " - "have been called!\n"); + printf(" H5Aiterate sentinel value is unchanged; supplied callback function must not " + "have been called!\n"); PART_ERROR(H5Aiterate2_creation_decreasing); } @@ -7144,15 +7132,15 @@ test_attribute_iterate_dataset(void) H5_INDEX_NAME, H5_ITER_INC, NULL, attr_iter_callback1, &link_counter, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" H5Aiterate_by_name by index type name in increasing order failed\n"); + printf(" H5Aiterate_by_name by index type name in increasing order failed\n"); PART_ERROR(H5Aiterate_by_name_name_increasing); } /* Make sure that the attribute iteration callback was actually called */ if (link_counter == 0) { H5_FAILED(); - HDprintf(" H5Aiterate_by_name sentinel value is unchanged; supplied callback function " - "must not have been called!\n"); + printf(" H5Aiterate_by_name sentinel value is unchanged; supplied callback function " + "must not have been called!\n"); PART_ERROR(H5Aiterate_by_name_name_increasing); } @@ -7173,15 +7161,15 @@ test_attribute_iterate_dataset(void) H5_INDEX_NAME, H5_ITER_DEC, NULL, attr_iter_callback1, &link_counter, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" H5Aiterate_by_name by index type name in decreasing order failed\n"); + printf(" H5Aiterate_by_name by index type name in decreasing order failed\n"); PART_ERROR(H5Aiterate_by_name_name_decreasing); } /* Make sure that the attribute iteration callback was actually called */ if (link_counter == ATTRIBUTE_ITERATE_TEST_NUM_ATTRS) { H5_FAILED(); - HDprintf(" H5Aiterate_by_name sentinel value is unchanged; supplied callback function " - "must not have been called!\n"); + printf(" H5Aiterate_by_name sentinel value is unchanged; supplied callback function " + "must not have been called!\n"); PART_ERROR(H5Aiterate_by_name_name_decreasing); } @@ -7195,7 +7183,7 @@ test_attribute_iterate_dataset(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" creation order tracking isn't supported with this VOL connector\n"); + printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Aiterate_by_name_creation_increasing); } @@ -7208,15 +7196,15 @@ test_attribute_iterate_dataset(void) H5_INDEX_CRT_ORDER, H5_ITER_INC, NULL, attr_iter_callback1, &link_counter, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" H5Aiterate_by_name by index type creation order in increasing order failed\n"); + printf(" H5Aiterate_by_name by index type creation order in increasing order failed\n"); PART_ERROR(H5Aiterate_by_name_creation_increasing); } /* Make sure that the attribute iteration callback was actually called */ if (link_counter == 2 * ATTRIBUTE_ITERATE_TEST_NUM_ATTRS) { H5_FAILED(); - HDprintf(" H5Aiterate_by_name sentinel value is unchanged; supplied callback function " - "must not have been called!\n"); + printf(" H5Aiterate_by_name sentinel value is unchanged; supplied callback function " + "must not have been called!\n"); PART_ERROR(H5Aiterate_by_name_creation_increasing); } @@ -7230,7 +7218,7 @@ test_attribute_iterate_dataset(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" creation order tracking isn't supported with this VOL connector\n"); + printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Aiterate_by_name_creation_decreasing); } @@ -7243,15 +7231,15 @@ test_attribute_iterate_dataset(void) H5_INDEX_CRT_ORDER, H5_ITER_DEC, NULL, attr_iter_callback1, &link_counter, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" H5Aiterate_by_name by index type creation order in decreasing order failed\n"); + printf(" H5Aiterate_by_name by index type creation order in decreasing order failed\n"); PART_ERROR(H5Aiterate_by_name_creation_decreasing); } /* Make sure that the attribute iteration callback was actually called */ if (link_counter == 3 * ATTRIBUTE_ITERATE_TEST_NUM_ATTRS) { H5_FAILED(); - HDprintf(" H5Aiterate_by_name sentinel value is unchanged; supplied callback function " - "must not have been called!\n"); + printf(" H5Aiterate_by_name sentinel value is unchanged; supplied callback function " + "must not have been called!\n"); PART_ERROR(H5Aiterate_by_name_creation_decreasing); } @@ -7333,8 +7321,8 @@ test_attribute_iterate_datatype(void) !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ITERATE) || !(vol_cap_flags_g & H5VL_CAP_FLAG_STORED_DATATYPES)) { SKIPPED(); - HDprintf(" API functions for basic file, group, stored datatype, attribute, or iterate " - "aren't supported with this connector\n"); + printf(" API functions for basic file, group, stored datatype, attribute, or iterate " + "aren't supported with this connector\n"); return 0; } @@ -7342,33 +7330,33 @@ test_attribute_iterate_datatype(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, ATTRIBUTE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group\n"); + printf(" couldn't open container group\n"); goto error; } if ((group_id = H5Gcreate2(container_group, ATTRIBUTE_ITERATE_TEST_DTYPE_SUBGROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container subgroup '%s'\n", ATTRIBUTE_ITERATE_TEST_DTYPE_SUBGROUP_NAME); + printf(" couldn't create container subgroup '%s'\n", ATTRIBUTE_ITERATE_TEST_DTYPE_SUBGROUP_NAME); goto error; } if ((tcpl_id = H5Pcreate(H5P_DATATYPE_CREATE)) < 0) { H5_FAILED(); - HDprintf(" couldn't create TCPL for attribute creation order tracking\n"); + printf(" couldn't create TCPL for attribute creation order tracking\n"); goto error; } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (H5Pset_attr_creation_order(tcpl_id, H5P_CRT_ORDER_TRACKED) < 0) { H5_FAILED(); - HDprintf(" couldn't set attribute creation order tracking\n"); + printf(" couldn't set attribute creation order tracking\n"); goto error; } } @@ -7385,7 +7373,7 @@ test_attribute_iterate_datatype(void) if (H5Tcommit2(group_id, ATTRIBUTE_ITERATE_TEST_DTYPE_NAME, type_id, H5P_DEFAULT, tcpl_id, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't commit datatype '%s'\n", ATTRIBUTE_ITERATE_TEST_DTYPE_NAME); + printf(" couldn't commit datatype '%s'\n", ATTRIBUTE_ITERATE_TEST_DTYPE_NAME); goto error; } @@ -7399,26 +7387,26 @@ test_attribute_iterate_datatype(void) if ((attr_id = H5Acreate2(type_id, attr_name, attr_dtype, attr_space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create attribute '%s'\n", attr_name); + printf(" couldn't create attribute '%s'\n", attr_name); goto error; } /* Verify the attribute has been created */ if ((attr_exists = H5Aexists(type_id, attr_name)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if attribute '%s' exists\n", attr_name); + printf(" couldn't determine if attribute '%s' exists\n", attr_name); goto error; } if (!attr_exists) { H5_FAILED(); - HDprintf(" attribute '%s' did not exist\n", attr_name); + printf(" attribute '%s' did not exist\n", attr_name); goto error; } if (H5Aclose(attr_id) < 0) { H5_FAILED(); - HDprintf(" failed to close attribute '%s'\n", attr_name); + printf(" failed to close attribute '%s'\n", attr_name); goto error; } } @@ -7445,15 +7433,15 @@ test_attribute_iterate_datatype(void) if (H5Aiterate2(type_id, H5_INDEX_NAME, H5_ITER_INC, NULL, attr_iter_callback1, &link_counter) < 0) { H5_FAILED(); - HDprintf(" H5Aiterate2 by index type name in increasing order failed\n"); + printf(" H5Aiterate2 by index type name in increasing order failed\n"); PART_ERROR(H5Aiterate2_name_increasing); } /* Make sure that the attribute iteration callback was actually called */ if (link_counter == 0) { H5_FAILED(); - HDprintf(" H5Aiterate sentinel value is unchanged; supplied callback function must not " - "have been called!\n"); + printf(" H5Aiterate sentinel value is unchanged; supplied callback function must not " + "have been called!\n"); PART_ERROR(H5Aiterate2_name_increasing); } @@ -7470,15 +7458,15 @@ test_attribute_iterate_datatype(void) if (H5Aiterate2(type_id, H5_INDEX_NAME, H5_ITER_DEC, NULL, attr_iter_callback1, &link_counter) < 0) { H5_FAILED(); - HDprintf(" H5Aiterate2 by index type name in decreasing order failed\n"); + printf(" H5Aiterate2 by index type name in decreasing order failed\n"); PART_ERROR(H5Aiterate2_name_decreasing); } /* Make sure that the attribute iteration callback was actually called */ if (link_counter == ATTRIBUTE_ITERATE_TEST_NUM_ATTRS) { H5_FAILED(); - HDprintf(" H5Aiterate sentinel value is unchanged; supplied callback function must not " - "have been called!\n"); + printf(" H5Aiterate sentinel value is unchanged; supplied callback function must not " + "have been called!\n"); PART_ERROR(H5Aiterate2_name_decreasing); } @@ -7492,7 +7480,7 @@ test_attribute_iterate_datatype(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" creation order tracking isn't supported with this VOL connector\n"); + printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Aiterate2_creation_increasing); } @@ -7502,15 +7490,15 @@ test_attribute_iterate_datatype(void) if (H5Aiterate2(type_id, H5_INDEX_CRT_ORDER, H5_ITER_INC, NULL, attr_iter_callback1, &link_counter) < 0) { H5_FAILED(); - HDprintf(" H5Aiterate2 by index type creation order in increasing order failed\n"); + printf(" H5Aiterate2 by index type creation order in increasing order failed\n"); PART_ERROR(H5Aiterate2_creation_increasing); } /* Make sure that the attribute iteration callback was actually called */ if (link_counter == 2 * ATTRIBUTE_ITERATE_TEST_NUM_ATTRS) { H5_FAILED(); - HDprintf(" H5Aiterate sentinel value is unchanged; supplied callback function must not " - "have been called!\n"); + printf(" H5Aiterate sentinel value is unchanged; supplied callback function must not " + "have been called!\n"); PART_ERROR(H5Aiterate2_creation_increasing); } @@ -7524,7 +7512,7 @@ test_attribute_iterate_datatype(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" creation order tracking isn't supported with this VOL connector\n"); + printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Aiterate2_creation_decreasing); } @@ -7534,15 +7522,15 @@ test_attribute_iterate_datatype(void) if (H5Aiterate2(type_id, H5_INDEX_CRT_ORDER, H5_ITER_DEC, NULL, attr_iter_callback1, &link_counter) < 0) { H5_FAILED(); - HDprintf(" H5Aiterate2 by index type creation order in decreasing order failed\n"); + printf(" H5Aiterate2 by index type creation order in decreasing order failed\n"); PART_ERROR(H5Aiterate2_creation_decreasing); } /* Make sure that the attribute iteration callback was actually called */ if (link_counter == 3 * ATTRIBUTE_ITERATE_TEST_NUM_ATTRS) { H5_FAILED(); - HDprintf(" H5Aiterate sentinel value is unchanged; supplied callback function must not " - "have been called!\n"); + printf(" H5Aiterate sentinel value is unchanged; supplied callback function must not " + "have been called!\n"); PART_ERROR(H5Aiterate2_creation_decreasing); } @@ -7563,15 +7551,15 @@ test_attribute_iterate_datatype(void) "/" ATTRIBUTE_ITERATE_TEST_DTYPE_NAME, H5_INDEX_NAME, H5_ITER_INC, NULL, attr_iter_callback1, &link_counter, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" H5Aiterate_by_name by index type name in increasing order failed\n"); + printf(" H5Aiterate_by_name by index type name in increasing order failed\n"); PART_ERROR(H5Aiterate_by_name_name_increasing); } /* Make sure that the attribute iteration callback was actually called */ if (link_counter == 0) { H5_FAILED(); - HDprintf(" H5Aiterate_by_name sentinel value is unchanged; supplied callback function " - "must not have been called!\n"); + printf(" H5Aiterate_by_name sentinel value is unchanged; supplied callback function " + "must not have been called!\n"); PART_ERROR(H5Aiterate_by_name_name_increasing); } @@ -7592,15 +7580,15 @@ test_attribute_iterate_datatype(void) "/" ATTRIBUTE_ITERATE_TEST_DTYPE_NAME, H5_INDEX_NAME, H5_ITER_DEC, NULL, attr_iter_callback1, &link_counter, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" H5Aiterate_by_name by index type name in decreasing order failed\n"); + printf(" H5Aiterate_by_name by index type name in decreasing order failed\n"); PART_ERROR(H5Aiterate_by_name_name_decreasing); } /* Make sure that the attribute iteration callback was actually called */ if (link_counter == ATTRIBUTE_ITERATE_TEST_NUM_ATTRS) { H5_FAILED(); - HDprintf(" H5Aiterate_by_name sentinel value is unchanged; supplied callback function " - "must not have been called!\n"); + printf(" H5Aiterate_by_name sentinel value is unchanged; supplied callback function " + "must not have been called!\n"); PART_ERROR(H5Aiterate_by_name_name_decreasing); } @@ -7614,7 +7602,7 @@ test_attribute_iterate_datatype(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" creation order tracking isn't supported with this VOL connector\n"); + printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Aiterate_by_name_creation_increasing); } @@ -7628,15 +7616,15 @@ test_attribute_iterate_datatype(void) H5_INDEX_CRT_ORDER, H5_ITER_INC, NULL, attr_iter_callback1, &link_counter, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" H5Aiterate_by_name by index type creation order in increasing order failed\n"); + printf(" H5Aiterate_by_name by index type creation order in increasing order failed\n"); PART_ERROR(H5Aiterate_by_name_creation_increasing); } /* Make sure that the attribute iteration callback was actually called */ if (link_counter == 2 * ATTRIBUTE_ITERATE_TEST_NUM_ATTRS) { H5_FAILED(); - HDprintf(" H5Aiterate_by_name sentinel value is unchanged; supplied callback function " - "must not have been called!\n"); + printf(" H5Aiterate_by_name sentinel value is unchanged; supplied callback function " + "must not have been called!\n"); PART_ERROR(H5Aiterate_by_name_creation_increasing); } @@ -7650,7 +7638,7 @@ test_attribute_iterate_datatype(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" creation order tracking isn't supported with this VOL connector\n"); + printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Aiterate_by_name_creation_decreasing); } @@ -7664,15 +7652,15 @@ test_attribute_iterate_datatype(void) H5_INDEX_CRT_ORDER, H5_ITER_DEC, NULL, attr_iter_callback1, &link_counter, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" H5Aiterate_by_name by index type creation order in decreasing order failed\n"); + printf(" H5Aiterate_by_name by index type creation order in decreasing order failed\n"); PART_ERROR(H5Aiterate_by_name_creation_decreasing); } /* Make sure that the attribute iteration callback was actually called */ if (link_counter == 3 * ATTRIBUTE_ITERATE_TEST_NUM_ATTRS) { H5_FAILED(); - HDprintf(" H5Aiterate_by_name sentinel value is unchanged; supplied callback function " - "must not have been called!\n"); + printf(" H5Aiterate_by_name sentinel value is unchanged; supplied callback function " + "must not have been called!\n"); PART_ERROR(H5Aiterate_by_name_creation_decreasing); } @@ -7760,8 +7748,8 @@ test_attribute_iterate_invalid_params(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ITERATE)) { SKIPPED(); - HDprintf(" API functions for basic file, group, attribute, or iterate aren't supported with this " - "connector\n"); + printf(" API functions for basic file, group, attribute, or iterate aren't supported with this " + "connector\n"); return 0; } @@ -7769,20 +7757,20 @@ test_attribute_iterate_invalid_params(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file\n"); + printf(" couldn't open file\n"); goto error; } if ((container_group = H5Gopen2(file_id, ATTRIBUTE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group\n"); + printf(" couldn't open container group\n"); goto error; } if ((group_id = H5Gcreate2(container_group, ATTRIBUTE_ITERATE_INVALID_PARAMS_TEST_SUBGROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container subgroup\n"); + printf(" couldn't create container subgroup\n"); goto error; } @@ -7796,77 +7784,77 @@ test_attribute_iterate_invalid_params(void) if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_ITERATE_INVALID_PARAMS_TEST_ATTR_NAME, attr_dtype, attr_space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create attribute\n"); + printf(" couldn't create attribute\n"); goto error; } if ((attr_id2 = H5Acreate2(group_id, ATTRIBUTE_ITERATE_INVALID_PARAMS_TEST_ATTR_NAME2, attr_dtype, attr_space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create attribute\n"); + printf(" couldn't create attribute\n"); goto error; } if ((attr_id3 = H5Acreate2(group_id, ATTRIBUTE_ITERATE_INVALID_PARAMS_TEST_ATTR_NAME3, attr_dtype, attr_space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create attribute\n"); + printf(" couldn't create attribute\n"); goto error; } if ((attr_id4 = H5Acreate2(group_id, ATTRIBUTE_ITERATE_INVALID_PARAMS_TEST_ATTR_NAME4, attr_dtype, attr_space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create attribute\n"); + printf(" couldn't create attribute\n"); goto error; } /* Verify the attributes have been created */ if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_ITERATE_INVALID_PARAMS_TEST_ATTR_NAME)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if attribute exists\n"); + printf(" couldn't determine if attribute exists\n"); goto error; } if (!attr_exists) { H5_FAILED(); - HDprintf(" attribute did not exist\n"); + printf(" attribute did not exist\n"); goto error; } if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_ITERATE_INVALID_PARAMS_TEST_ATTR_NAME2)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if attribute exists\n"); + printf(" couldn't determine if attribute exists\n"); goto error; } if (!attr_exists) { H5_FAILED(); - HDprintf(" attribute did not exist\n"); + printf(" attribute did not exist\n"); goto error; } if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_ITERATE_INVALID_PARAMS_TEST_ATTR_NAME3)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if attribute exists\n"); + printf(" couldn't determine if attribute exists\n"); goto error; } if (!attr_exists) { H5_FAILED(); - HDprintf(" attribute did not exist\n"); + printf(" attribute did not exist\n"); goto error; } if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_ITERATE_INVALID_PARAMS_TEST_ATTR_NAME4)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if attribute exists\n"); + printf(" couldn't determine if attribute exists\n"); goto error; } if (!attr_exists) { H5_FAILED(); - HDprintf(" attribute did not exist\n"); + printf(" attribute did not exist\n"); goto error; } @@ -7887,7 +7875,7 @@ test_attribute_iterate_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" iterated over attributes using H5Aiterate with an invalid loc_id!\n"); + printf(" iterated over attributes using H5Aiterate with an invalid loc_id!\n"); PART_ERROR(H5Aiterate_invalid_loc_id); } @@ -7908,8 +7896,8 @@ test_attribute_iterate_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" iterated over attributes using H5Aiterate with invalid index type " - "H5_INDEX_UNKNOWN!\n"); + printf(" iterated over attributes using H5Aiterate with invalid index type " + "H5_INDEX_UNKNOWN!\n"); PART_ERROR(H5Aiterate_invalid_index_type); } @@ -7921,8 +7909,7 @@ test_attribute_iterate_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf( - " iterated over attributes using H5Aiterate with invalid index type H5_INDEX_N!\n"); + printf(" iterated over attributes using H5Aiterate with invalid index type H5_INDEX_N!\n"); PART_ERROR(H5Aiterate_invalid_index_type); } @@ -7943,8 +7930,8 @@ test_attribute_iterate_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" iterated over attributes using H5Aiterate with invalid index ordering " - "H5_ITER_UNKNOWN!\n"); + printf(" iterated over attributes using H5Aiterate with invalid index ordering " + "H5_ITER_UNKNOWN!\n"); PART_ERROR(H5Aiterate_invalid_index_order); } @@ -7956,7 +7943,7 @@ test_attribute_iterate_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf( + printf( " iterated over attributes using H5Aiterate with invalid index ordering H5_ITER_N!\n"); PART_ERROR(H5Aiterate_invalid_index_order); } @@ -7978,7 +7965,7 @@ test_attribute_iterate_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" iterated over attributes using H5Aiterate_by_name with an invalid loc_id!\n"); + printf(" iterated over attributes using H5Aiterate_by_name with an invalid loc_id!\n"); PART_ERROR(H5Aiterate_by_name_invalid_loc_id); } @@ -7999,7 +7986,7 @@ test_attribute_iterate_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" iterated over attributes using H5Aiterate_by_name with a NULL object name!\n"); + printf(" iterated over attributes using H5Aiterate_by_name with a NULL object name!\n"); PART_ERROR(H5Aiterate_by_name_invalid_obj_name); } @@ -8012,8 +7999,8 @@ test_attribute_iterate_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" iterated over attributes using H5Aiterate_by_name with an invalid object name " - "of ''!\n"); + printf(" iterated over attributes using H5Aiterate_by_name with an invalid object name " + "of ''!\n"); PART_ERROR(H5Aiterate_by_name_invalid_obj_name); } @@ -8034,8 +8021,8 @@ test_attribute_iterate_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" iterated over attributes using H5Aiterate_by_name with invalid index type " - "H5_INDEX_UNKNOWN!\n"); + printf(" iterated over attributes using H5Aiterate_by_name with invalid index type " + "H5_INDEX_UNKNOWN!\n"); PART_ERROR(H5Aiterate_by_name_invalid_index_type); } @@ -8048,8 +8035,8 @@ test_attribute_iterate_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" iterated over attributes using H5Aiterate_by_name with invalid index type " - "H5_INDEX_N!\n"); + printf(" iterated over attributes using H5Aiterate_by_name with invalid index type " + "H5_INDEX_N!\n"); PART_ERROR(H5Aiterate_by_name_invalid_index_type); } @@ -8070,8 +8057,8 @@ test_attribute_iterate_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" iterated over attributes using H5Aiterate_by_name with invalid index ordering " - "H5_ITER_UNKNOWN!\n"); + printf(" iterated over attributes using H5Aiterate_by_name with invalid index ordering " + "H5_ITER_UNKNOWN!\n"); PART_ERROR(H5Aiterate_by_name_invalid_index_order); } @@ -8084,8 +8071,8 @@ test_attribute_iterate_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" iterated over attributes using H5Aiterate_by_name with invalid index ordering " - "H5_ITER_N!\n"); + printf(" iterated over attributes using H5Aiterate_by_name with invalid index ordering " + "H5_ITER_N!\n"); PART_ERROR(H5Aiterate_by_name_invalid_index_order); } @@ -8106,7 +8093,7 @@ test_attribute_iterate_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" iterated over attributes using H5Aiterate_by_name with an invalid LAPL!\n"); + printf(" iterated over attributes using H5Aiterate_by_name with an invalid LAPL!\n"); PART_ERROR(H5Aiterate_by_name_invalid_lapl); } @@ -8180,8 +8167,8 @@ test_attribute_iterate_0_attributes(void) !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ITERATE) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC)) { SKIPPED(); - HDprintf(" API functions for basic file, group, dataset, attribute, or iterate " - "aren't supported with this connector\n"); + printf(" API functions for basic file, group, dataset, attribute, or iterate " + "aren't supported with this connector\n"); return 0; } @@ -8189,20 +8176,20 @@ test_attribute_iterate_0_attributes(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file\n"); + printf(" couldn't open file\n"); goto error; } if ((container_group = H5Gopen2(file_id, ATTRIBUTE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group\n"); + printf(" couldn't open container group\n"); goto error; } if ((group_id = H5Gcreate2(container_group, ATTRIBUTE_ITERATE_TEST_0_ATTRIBUTES_SUBGROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container subgroup\n"); + printf(" couldn't create container subgroup\n"); goto error; } @@ -8216,7 +8203,7 @@ test_attribute_iterate_0_attributes(void) if ((dset_id = H5Dcreate2(group_id, ATTRIBUTE_ITERATE_TEST_0_ATTRIBUTES_DSET_NAME, dset_dtype, dset_space_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create dataset\n"); + printf(" couldn't create dataset\n"); goto error; } @@ -8230,7 +8217,7 @@ test_attribute_iterate_0_attributes(void) if (H5Aiterate2(dset_id, H5_INDEX_NAME, H5_ITER_NATIVE, NULL, attr_iter_callback2, NULL) < 0) { H5_FAILED(); - HDprintf(" H5Aiterate2 on object with 0 attributes failed\n"); + printf(" H5Aiterate2 on object with 0 attributes failed\n"); PART_ERROR(H5Aiterate_0_attributes_native); } @@ -8244,7 +8231,7 @@ test_attribute_iterate_0_attributes(void) if (H5Aiterate2(dset_id, H5_INDEX_NAME, H5_ITER_INC, NULL, attr_iter_callback2, NULL) < 0) { H5_FAILED(); - HDprintf(" H5Aiterate2 on object with 0 attributes failed\n"); + printf(" H5Aiterate2 on object with 0 attributes failed\n"); PART_ERROR(H5Aiterate_0_attributes_inc); } @@ -8258,7 +8245,7 @@ test_attribute_iterate_0_attributes(void) if (H5Aiterate2(dset_id, H5_INDEX_NAME, H5_ITER_DEC, NULL, attr_iter_callback2, NULL) < 0) { H5_FAILED(); - HDprintf(" H5Aiterate2 on object with 0 attributes failed\n"); + printf(" H5Aiterate2 on object with 0 attributes failed\n"); PART_ERROR(H5Aiterate_0_attributes_dec); } @@ -8273,7 +8260,7 @@ test_attribute_iterate_0_attributes(void) if (H5Aiterate_by_name(group_id, ATTRIBUTE_ITERATE_TEST_0_ATTRIBUTES_DSET_NAME, H5_INDEX_NAME, H5_ITER_NATIVE, NULL, attr_iter_callback2, NULL, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" H5Aiterate_by_name on object with 0 attributes failed\n"); + printf(" H5Aiterate_by_name on object with 0 attributes failed\n"); PART_ERROR(H5Aiterate_by_name_0_attributes_native); } @@ -8288,7 +8275,7 @@ test_attribute_iterate_0_attributes(void) if (H5Aiterate_by_name(group_id, ATTRIBUTE_ITERATE_TEST_0_ATTRIBUTES_DSET_NAME, H5_INDEX_NAME, H5_ITER_INC, NULL, attr_iter_callback2, NULL, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" H5Aiterate_by_name on object with 0 attributes failed\n"); + printf(" H5Aiterate_by_name on object with 0 attributes failed\n"); PART_ERROR(H5Aiterate_by_name_0_attributes_inc); } @@ -8302,7 +8289,7 @@ test_attribute_iterate_0_attributes(void) if (H5Aiterate_by_name(group_id, ATTRIBUTE_ITERATE_TEST_0_ATTRIBUTES_DSET_NAME, H5_INDEX_NAME, H5_ITER_DEC, NULL, attr_iter_callback2, NULL, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" H5Aiterate_by_name on object with 0 attributes failed\n"); + printf(" H5Aiterate_by_name on object with 0 attributes failed\n"); PART_ERROR(H5Aiterate_by_name_0_attributes_dec); } @@ -8368,8 +8355,8 @@ test_delete_attribute(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC)) { SKIPPED(); - HDprintf(" API functions for basic file, group, or attribute aren't supported " - "with this connector\n"); + printf(" API functions for basic file, group, or attribute aren't supported " + "with this connector\n"); return 0; } @@ -8377,26 +8364,26 @@ test_delete_attribute(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, ATTRIBUTE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", ATTRIBUTE_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", ATTRIBUTE_TEST_GROUP_NAME); goto error; } if ((gcpl_id = H5Pcreate(H5P_GROUP_CREATE)) < 0) { H5_FAILED(); - HDprintf(" couldn't create GCPL for attribute creation order tracking\n"); + printf(" couldn't create GCPL for attribute creation order tracking\n"); goto error; } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (H5Pset_attr_creation_order(gcpl_id, H5P_CRT_ORDER_TRACKED) < 0) { H5_FAILED(); - HDprintf(" couldn't set attribute creation order tracking\n"); + printf(" couldn't set attribute creation order tracking\n"); goto error; } } @@ -8404,7 +8391,7 @@ test_delete_attribute(void) if ((group_id = H5Gcreate2(container_group, ATTRIBUTE_DELETION_TEST_GROUP_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container group '%s'\n", ATTRIBUTE_DELETION_TEST_GROUP_NAME); + printf(" couldn't create container group '%s'\n", ATTRIBUTE_DELETION_TEST_GROUP_NAME); goto error; } @@ -8426,49 +8413,49 @@ test_delete_attribute(void) if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME, attr_dtype, space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME); + printf(" couldn't create attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME); PART_ERROR(H5Adelete); } /* Verify the attribute has been created */ if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if attribute '%s' exists\n", - ATTRIBUTE_DELETION_TEST_ATTR_NAME); + printf(" couldn't determine if attribute '%s' exists\n", + ATTRIBUTE_DELETION_TEST_ATTR_NAME); PART_ERROR(H5Adelete); } if (!attr_exists) { H5_FAILED(); - HDprintf(" attribute '%s' didn't exist before deletion\n", - ATTRIBUTE_DELETION_TEST_ATTR_NAME); + printf(" attribute '%s' didn't exist before deletion\n", + ATTRIBUTE_DELETION_TEST_ATTR_NAME); PART_ERROR(H5Adelete); } /* Delete the attribute */ if (H5Adelete(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME) < 0) { H5_FAILED(); - HDprintf(" failed to delete attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME); + printf(" failed to delete attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME); PART_ERROR(H5Adelete); } /* Verify the attribute has been deleted */ if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if attribute '%s' exists\n", - ATTRIBUTE_DELETION_TEST_ATTR_NAME); + printf(" couldn't determine if attribute '%s' exists\n", + ATTRIBUTE_DELETION_TEST_ATTR_NAME); PART_ERROR(H5Adelete); } if (attr_exists) { H5_FAILED(); - HDprintf(" attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME); + printf(" attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME); PART_ERROR(H5Adelete); } if (H5Aclose(attr_id) < 0) { H5_FAILED(); - HDprintf(" failed to close attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME); + printf(" failed to close attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME); PART_ERROR(H5Adelete); } @@ -8491,22 +8478,22 @@ test_delete_attribute(void) if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME, attr_dtype, space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME); + printf(" couldn't create attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME); PART_ERROR(H5Adelete_by_name); } /* Verify the attribute has been created */ if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if attribute '%s' exists\n", - ATTRIBUTE_DELETION_TEST_ATTR_NAME); + printf(" couldn't determine if attribute '%s' exists\n", + ATTRIBUTE_DELETION_TEST_ATTR_NAME); PART_ERROR(H5Adelete_by_name); } if (!attr_exists) { H5_FAILED(); - HDprintf(" attribute '%s' didn't exist before deletion\n", - ATTRIBUTE_DELETION_TEST_ATTR_NAME); + printf(" attribute '%s' didn't exist before deletion\n", + ATTRIBUTE_DELETION_TEST_ATTR_NAME); PART_ERROR(H5Adelete_by_name); } @@ -8514,27 +8501,27 @@ test_delete_attribute(void) if (H5Adelete_by_name(container_group, ATTRIBUTE_DELETION_TEST_GROUP_NAME, ATTRIBUTE_DELETION_TEST_ATTR_NAME, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to delete attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME); + printf(" failed to delete attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME); PART_ERROR(H5Adelete_by_name); } /* Verify the attribute has been deleted */ if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if attribute '%s' exists\n", - ATTRIBUTE_DELETION_TEST_ATTR_NAME); + printf(" couldn't determine if attribute '%s' exists\n", + ATTRIBUTE_DELETION_TEST_ATTR_NAME); PART_ERROR(H5Adelete_by_name); } if (attr_exists) { H5_FAILED(); - HDprintf(" attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME); + printf(" attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME); PART_ERROR(H5Adelete_by_name); } if (H5Aclose(attr_id) < 0) { H5_FAILED(); - HDprintf(" failed to close attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME); + printf(" failed to close attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME); PART_ERROR(H5Adelete_by_name); } @@ -8555,7 +8542,7 @@ test_delete_attribute(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" creation order tracking isn't supported with this VOL connector\n"); + printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Adelete_by_idx_crt_order_increasing); } @@ -8563,82 +8550,82 @@ test_delete_attribute(void) if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME, attr_dtype, space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME); + printf(" couldn't create attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME); PART_ERROR(H5Adelete_by_idx_crt_order_increasing); } if (H5Aclose(attr_id) < 0) { H5_FAILED(); - HDprintf(" failed to close attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME); + printf(" failed to close attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME); PART_ERROR(H5Adelete_by_idx_crt_order_increasing); } if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME2, attr_dtype, space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME2); + printf(" couldn't create attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME2); PART_ERROR(H5Adelete_by_idx_crt_order_increasing); } if (H5Aclose(attr_id) < 0) { H5_FAILED(); - HDprintf(" failed to close attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME2); + printf(" failed to close attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME2); PART_ERROR(H5Adelete_by_idx_crt_order_increasing); } if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME3, attr_dtype, space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME3); + printf(" couldn't create attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME3); PART_ERROR(H5Adelete_by_idx_crt_order_increasing); } if (H5Aclose(attr_id) < 0) { H5_FAILED(); - HDprintf(" failed to close attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME3); + printf(" failed to close attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME3); PART_ERROR(H5Adelete_by_idx_crt_order_increasing); } /* Verify the attributes have been created */ if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if attribute '%s' exists\n", - ATTRIBUTE_DELETION_TEST_ATTR_NAME); + printf(" couldn't determine if attribute '%s' exists\n", + ATTRIBUTE_DELETION_TEST_ATTR_NAME); PART_ERROR(H5Adelete_by_idx_crt_order_increasing); } if (!attr_exists) { H5_FAILED(); - HDprintf(" attribute '%s' didn't exist before deletion\n", - ATTRIBUTE_DELETION_TEST_ATTR_NAME); + printf(" attribute '%s' didn't exist before deletion\n", + ATTRIBUTE_DELETION_TEST_ATTR_NAME); PART_ERROR(H5Adelete_by_idx_crt_order_increasing); } if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME2)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if attribute '%s' exists\n", - ATTRIBUTE_DELETION_TEST_ATTR_NAME2); + printf(" couldn't determine if attribute '%s' exists\n", + ATTRIBUTE_DELETION_TEST_ATTR_NAME2); PART_ERROR(H5Adelete_by_idx_crt_order_increasing); } if (!attr_exists) { H5_FAILED(); - HDprintf(" attribute '%s' didn't exist before deletion\n", - ATTRIBUTE_DELETION_TEST_ATTR_NAME2); + printf(" attribute '%s' didn't exist before deletion\n", + ATTRIBUTE_DELETION_TEST_ATTR_NAME2); PART_ERROR(H5Adelete_by_idx_crt_order_increasing); } if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME3)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if attribute '%s' exists\n", - ATTRIBUTE_DELETION_TEST_ATTR_NAME3); + printf(" couldn't determine if attribute '%s' exists\n", + ATTRIBUTE_DELETION_TEST_ATTR_NAME3); PART_ERROR(H5Adelete_by_idx_crt_order_increasing); } if (!attr_exists) { H5_FAILED(); - HDprintf(" attribute '%s' didn't exist before deletion\n", - ATTRIBUTE_DELETION_TEST_ATTR_NAME3); + printf(" attribute '%s' didn't exist before deletion\n", + ATTRIBUTE_DELETION_TEST_ATTR_NAME3); PART_ERROR(H5Adelete_by_idx_crt_order_increasing); } @@ -8646,50 +8633,50 @@ test_delete_attribute(void) if (H5Adelete_by_idx(container_group, ATTRIBUTE_DELETION_TEST_GROUP_NAME, H5_INDEX_CRT_ORDER, H5_ITER_INC, 0, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to delete attribute using H5Adelete_by_idx by creation order in " - "increasing order\n"); + printf(" failed to delete attribute using H5Adelete_by_idx by creation order in " + "increasing order\n"); PART_ERROR(H5Adelete_by_idx_crt_order_increasing); } /* Ensure that the attribute is gone and others remain */ if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if attribute '%s' exists\n", - ATTRIBUTE_DELETION_TEST_ATTR_NAME); + printf(" couldn't determine if attribute '%s' exists\n", + ATTRIBUTE_DELETION_TEST_ATTR_NAME); PART_ERROR(H5Adelete_by_idx_crt_order_increasing); } if (attr_exists) { H5_FAILED(); - HDprintf(" attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME); + printf(" attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME); PART_ERROR(H5Adelete_by_idx_crt_order_increasing); } if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME2)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if attribute '%s' exists\n", - ATTRIBUTE_DELETION_TEST_ATTR_NAME2); + printf(" couldn't determine if attribute '%s' exists\n", + ATTRIBUTE_DELETION_TEST_ATTR_NAME2); PART_ERROR(H5Adelete_by_idx_crt_order_increasing); } if (!attr_exists) { H5_FAILED(); - HDprintf(" attribute '%s' doesn't exist after deletion of a different attribute!\n", - ATTRIBUTE_DELETION_TEST_ATTR_NAME2); + printf(" attribute '%s' doesn't exist after deletion of a different attribute!\n", + ATTRIBUTE_DELETION_TEST_ATTR_NAME2); PART_ERROR(H5Adelete_by_idx_crt_order_increasing); } if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME3)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if attribute '%s' exists\n", - ATTRIBUTE_DELETION_TEST_ATTR_NAME3); + printf(" couldn't determine if attribute '%s' exists\n", + ATTRIBUTE_DELETION_TEST_ATTR_NAME3); PART_ERROR(H5Adelete_by_idx_crt_order_increasing); } if (!attr_exists) { H5_FAILED(); - HDprintf(" attribute '%s' doesn't exist after deletion of a different attribute!\n", - ATTRIBUTE_DELETION_TEST_ATTR_NAME3); + printf(" attribute '%s' doesn't exist after deletion of a different attribute!\n", + ATTRIBUTE_DELETION_TEST_ATTR_NAME3); PART_ERROR(H5Adelete_by_idx_crt_order_increasing); } @@ -8697,95 +8684,95 @@ test_delete_attribute(void) if (H5Adelete_by_idx(container_group, ATTRIBUTE_DELETION_TEST_GROUP_NAME, H5_INDEX_CRT_ORDER, H5_ITER_INC, 0, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to delete attribute using H5Adelete_by_idx by creation order in " - "increasing order\n"); + printf(" failed to delete attribute using H5Adelete_by_idx by creation order in " + "increasing order\n"); PART_ERROR(H5Adelete_by_idx_crt_order_increasing); } if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if attribute '%s' exists\n", - ATTRIBUTE_DELETION_TEST_ATTR_NAME); + printf(" couldn't determine if attribute '%s' exists\n", + ATTRIBUTE_DELETION_TEST_ATTR_NAME); PART_ERROR(H5Adelete_by_idx_crt_order_increasing); } if (attr_exists) { H5_FAILED(); - HDprintf(" attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME); + printf(" attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME); PART_ERROR(H5Adelete_by_idx_crt_order_increasing); } if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME2)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if attribute '%s' exists\n", - ATTRIBUTE_DELETION_TEST_ATTR_NAME2); + printf(" couldn't determine if attribute '%s' exists\n", + ATTRIBUTE_DELETION_TEST_ATTR_NAME2); PART_ERROR(H5Adelete_by_idx_crt_order_increasing); } if (attr_exists) { H5_FAILED(); - HDprintf(" attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME2); + printf(" attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME2); PART_ERROR(H5Adelete_by_idx_crt_order_increasing); } if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME3)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if attribute '%s' exists\n", - ATTRIBUTE_DELETION_TEST_ATTR_NAME3); + printf(" couldn't determine if attribute '%s' exists\n", + ATTRIBUTE_DELETION_TEST_ATTR_NAME3); PART_ERROR(H5Adelete_by_idx_crt_order_increasing); } if (!attr_exists) { H5_FAILED(); - HDprintf(" attribute '%s' doesn't exist after deletion of a different attribute!\n", - ATTRIBUTE_DELETION_TEST_ATTR_NAME3); + printf(" attribute '%s' doesn't exist after deletion of a different attribute!\n", + ATTRIBUTE_DELETION_TEST_ATTR_NAME3); PART_ERROR(H5Adelete_by_idx_crt_order_increasing); } if (H5Adelete_by_idx(container_group, ATTRIBUTE_DELETION_TEST_GROUP_NAME, H5_INDEX_CRT_ORDER, H5_ITER_INC, 0, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to delete attribute using H5Adelete_by_idx by creation order in " - "increasing order\n"); + printf(" failed to delete attribute using H5Adelete_by_idx by creation order in " + "increasing order\n"); PART_ERROR(H5Adelete_by_idx_crt_order_increasing); } if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if attribute '%s' exists\n", - ATTRIBUTE_DELETION_TEST_ATTR_NAME); + printf(" couldn't determine if attribute '%s' exists\n", + ATTRIBUTE_DELETION_TEST_ATTR_NAME); PART_ERROR(H5Adelete_by_idx_crt_order_increasing); } if (attr_exists) { H5_FAILED(); - HDprintf(" attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME); + printf(" attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME); PART_ERROR(H5Adelete_by_idx_crt_order_increasing); } if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME2)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if attribute '%s' exists\n", - ATTRIBUTE_DELETION_TEST_ATTR_NAME2); + printf(" couldn't determine if attribute '%s' exists\n", + ATTRIBUTE_DELETION_TEST_ATTR_NAME2); PART_ERROR(H5Adelete_by_idx_crt_order_increasing); } if (attr_exists) { H5_FAILED(); - HDprintf(" attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME2); + printf(" attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME2); PART_ERROR(H5Adelete_by_idx_crt_order_increasing); } if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME3)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if attribute '%s' exists\n", - ATTRIBUTE_DELETION_TEST_ATTR_NAME3); + printf(" couldn't determine if attribute '%s' exists\n", + ATTRIBUTE_DELETION_TEST_ATTR_NAME3); PART_ERROR(H5Adelete_by_idx_crt_order_increasing); } if (attr_exists) { H5_FAILED(); - HDprintf(" attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME3); + printf(" attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME3); PART_ERROR(H5Adelete_by_idx_crt_order_increasing); } @@ -8806,7 +8793,7 @@ test_delete_attribute(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" creation order tracking isn't supported with this VOL connector\n"); + printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Adelete_by_idx_crt_order_decreasing); } @@ -8814,82 +8801,82 @@ test_delete_attribute(void) if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME, attr_dtype, space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME); + printf(" couldn't create attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME); PART_ERROR(H5Adelete_by_idx_crt_order_decreasing); } if (H5Aclose(attr_id) < 0) { H5_FAILED(); - HDprintf(" failed to close attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME); + printf(" failed to close attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME); PART_ERROR(H5Adelete_by_idx_crt_order_decreasing); } if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME2, attr_dtype, space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME2); + printf(" couldn't create attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME2); PART_ERROR(H5Adelete_by_idx_crt_order_decreasing); } if (H5Aclose(attr_id) < 0) { H5_FAILED(); - HDprintf(" failed to close attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME2); + printf(" failed to close attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME2); PART_ERROR(H5Adelete_by_idx_crt_order_decreasing); } if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME3, attr_dtype, space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME3); + printf(" couldn't create attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME3); PART_ERROR(H5Adelete_by_idx_crt_order_decreasing); } if (H5Aclose(attr_id) < 0) { H5_FAILED(); - HDprintf(" failed to close attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME3); + printf(" failed to close attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME3); PART_ERROR(H5Adelete_by_idx_crt_order_decreasing); } /* Verify the attributes have been created */ if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if attribute '%s' exists\n", - ATTRIBUTE_DELETION_TEST_ATTR_NAME); + printf(" couldn't determine if attribute '%s' exists\n", + ATTRIBUTE_DELETION_TEST_ATTR_NAME); PART_ERROR(H5Adelete_by_idx_crt_order_decreasing); } if (!attr_exists) { H5_FAILED(); - HDprintf(" attribute '%s' didn't exist before deletion\n", - ATTRIBUTE_DELETION_TEST_ATTR_NAME); + printf(" attribute '%s' didn't exist before deletion\n", + ATTRIBUTE_DELETION_TEST_ATTR_NAME); PART_ERROR(H5Adelete_by_idx_crt_order_decreasing); } if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME2)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if attribute '%s' exists\n", - ATTRIBUTE_DELETION_TEST_ATTR_NAME2); + printf(" couldn't determine if attribute '%s' exists\n", + ATTRIBUTE_DELETION_TEST_ATTR_NAME2); PART_ERROR(H5Adelete_by_idx_crt_order_decreasing); } if (!attr_exists) { H5_FAILED(); - HDprintf(" attribute '%s' didn't exist before deletion\n", - ATTRIBUTE_DELETION_TEST_ATTR_NAME2); + printf(" attribute '%s' didn't exist before deletion\n", + ATTRIBUTE_DELETION_TEST_ATTR_NAME2); PART_ERROR(H5Adelete_by_idx_crt_order_decreasing); } if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME3)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if attribute '%s' exists\n", - ATTRIBUTE_DELETION_TEST_ATTR_NAME3); + printf(" couldn't determine if attribute '%s' exists\n", + ATTRIBUTE_DELETION_TEST_ATTR_NAME3); PART_ERROR(H5Adelete_by_idx_crt_order_decreasing); } if (!attr_exists) { H5_FAILED(); - HDprintf(" attribute '%s' didn't exist before deletion\n", - ATTRIBUTE_DELETION_TEST_ATTR_NAME3); + printf(" attribute '%s' didn't exist before deletion\n", + ATTRIBUTE_DELETION_TEST_ATTR_NAME3); PART_ERROR(H5Adelete_by_idx_crt_order_decreasing); } @@ -8897,50 +8884,50 @@ test_delete_attribute(void) if (H5Adelete_by_idx(container_group, ATTRIBUTE_DELETION_TEST_GROUP_NAME, H5_INDEX_CRT_ORDER, H5_ITER_DEC, 2, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to delete attribute using H5Adelete_by_idx by creation order in " - "decreasing order\n"); + printf(" failed to delete attribute using H5Adelete_by_idx by creation order in " + "decreasing order\n"); PART_ERROR(H5Adelete_by_idx_crt_order_decreasing); } /* Ensure that the attribute is gone and others remain */ if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if attribute '%s' exists\n", - ATTRIBUTE_DELETION_TEST_ATTR_NAME); + printf(" couldn't determine if attribute '%s' exists\n", + ATTRIBUTE_DELETION_TEST_ATTR_NAME); PART_ERROR(H5Adelete_by_idx_crt_order_decreasing); } if (attr_exists) { H5_FAILED(); - HDprintf(" attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME); + printf(" attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME); PART_ERROR(H5Adelete_by_idx_crt_order_decreasing); } if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME2)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if attribute '%s' exists\n", - ATTRIBUTE_DELETION_TEST_ATTR_NAME2); + printf(" couldn't determine if attribute '%s' exists\n", + ATTRIBUTE_DELETION_TEST_ATTR_NAME2); PART_ERROR(H5Adelete_by_idx_crt_order_decreasing); } if (!attr_exists) { H5_FAILED(); - HDprintf(" attribute '%s' doesn't exist after deletion of a different attribute!\n", - ATTRIBUTE_DELETION_TEST_ATTR_NAME2); + printf(" attribute '%s' doesn't exist after deletion of a different attribute!\n", + ATTRIBUTE_DELETION_TEST_ATTR_NAME2); PART_ERROR(H5Adelete_by_idx_crt_order_decreasing); } if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME3)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if attribute '%s' exists\n", - ATTRIBUTE_DELETION_TEST_ATTR_NAME3); + printf(" couldn't determine if attribute '%s' exists\n", + ATTRIBUTE_DELETION_TEST_ATTR_NAME3); PART_ERROR(H5Adelete_by_idx_crt_order_decreasing); } if (!attr_exists) { H5_FAILED(); - HDprintf(" attribute '%s' doesn't exist after deletion of a different attribute!\n", - ATTRIBUTE_DELETION_TEST_ATTR_NAME3); + printf(" attribute '%s' doesn't exist after deletion of a different attribute!\n", + ATTRIBUTE_DELETION_TEST_ATTR_NAME3); PART_ERROR(H5Adelete_by_idx_crt_order_decreasing); } @@ -8948,95 +8935,95 @@ test_delete_attribute(void) if (H5Adelete_by_idx(container_group, ATTRIBUTE_DELETION_TEST_GROUP_NAME, H5_INDEX_CRT_ORDER, H5_ITER_DEC, 1, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to delete attribute using H5Adelete_by_idx by creation order in " - "decreasing order\n"); + printf(" failed to delete attribute using H5Adelete_by_idx by creation order in " + "decreasing order\n"); PART_ERROR(H5Adelete_by_idx_crt_order_decreasing); } if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if attribute '%s' exists\n", - ATTRIBUTE_DELETION_TEST_ATTR_NAME); + printf(" couldn't determine if attribute '%s' exists\n", + ATTRIBUTE_DELETION_TEST_ATTR_NAME); PART_ERROR(H5Adelete_by_idx_crt_order_decreasing); } if (attr_exists) { H5_FAILED(); - HDprintf(" attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME); + printf(" attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME); PART_ERROR(H5Adelete_by_idx_crt_order_decreasing); } if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME2)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if attribute '%s' exists\n", - ATTRIBUTE_DELETION_TEST_ATTR_NAME2); + printf(" couldn't determine if attribute '%s' exists\n", + ATTRIBUTE_DELETION_TEST_ATTR_NAME2); PART_ERROR(H5Adelete_by_idx_crt_order_decreasing); } if (attr_exists) { H5_FAILED(); - HDprintf(" attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME2); + printf(" attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME2); PART_ERROR(H5Adelete_by_idx_crt_order_decreasing); } if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME3)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if attribute '%s' exists\n", - ATTRIBUTE_DELETION_TEST_ATTR_NAME3); + printf(" couldn't determine if attribute '%s' exists\n", + ATTRIBUTE_DELETION_TEST_ATTR_NAME3); PART_ERROR(H5Adelete_by_idx_crt_order_decreasing); } if (!attr_exists) { H5_FAILED(); - HDprintf(" attribute '%s' doesn't exist after deletion of a different attribute!\n", - ATTRIBUTE_DELETION_TEST_ATTR_NAME3); + printf(" attribute '%s' doesn't exist after deletion of a different attribute!\n", + ATTRIBUTE_DELETION_TEST_ATTR_NAME3); PART_ERROR(H5Adelete_by_idx_crt_order_decreasing); } if (H5Adelete_by_idx(container_group, ATTRIBUTE_DELETION_TEST_GROUP_NAME, H5_INDEX_CRT_ORDER, H5_ITER_DEC, 0, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to delete attribute using H5Adelete_by_idx by creation order in " - "decreasing order\n"); + printf(" failed to delete attribute using H5Adelete_by_idx by creation order in " + "decreasing order\n"); PART_ERROR(H5Adelete_by_idx_crt_order_decreasing); } if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if attribute '%s' exists\n", - ATTRIBUTE_DELETION_TEST_ATTR_NAME); + printf(" couldn't determine if attribute '%s' exists\n", + ATTRIBUTE_DELETION_TEST_ATTR_NAME); PART_ERROR(H5Adelete_by_idx_crt_order_decreasing); } if (attr_exists) { H5_FAILED(); - HDprintf(" attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME); + printf(" attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME); PART_ERROR(H5Adelete_by_idx_crt_order_decreasing); } if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME2)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if attribute '%s' exists\n", - ATTRIBUTE_DELETION_TEST_ATTR_NAME2); + printf(" couldn't determine if attribute '%s' exists\n", + ATTRIBUTE_DELETION_TEST_ATTR_NAME2); PART_ERROR(H5Adelete_by_idx_crt_order_decreasing); } if (attr_exists) { H5_FAILED(); - HDprintf(" attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME2); + printf(" attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME2); PART_ERROR(H5Adelete_by_idx_crt_order_decreasing); } if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME3)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if attribute '%s' exists\n", - ATTRIBUTE_DELETION_TEST_ATTR_NAME3); + printf(" couldn't determine if attribute '%s' exists\n", + ATTRIBUTE_DELETION_TEST_ATTR_NAME3); PART_ERROR(H5Adelete_by_idx_crt_order_decreasing); } if (attr_exists) { H5_FAILED(); - HDprintf(" attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME3); + printf(" attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME3); PART_ERROR(H5Adelete_by_idx_crt_order_decreasing); } @@ -9059,82 +9046,82 @@ test_delete_attribute(void) if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME, attr_dtype, space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME); + printf(" couldn't create attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME); PART_ERROR(H5Adelete_by_idx_name_order_increasing); } if (H5Aclose(attr_id) < 0) { H5_FAILED(); - HDprintf(" failed to close attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME); + printf(" failed to close attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME); PART_ERROR(H5Adelete_by_idx_name_order_increasing); } if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME2, attr_dtype, space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME2); + printf(" couldn't create attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME2); PART_ERROR(H5Adelete_by_idx_name_order_increasing); } if (H5Aclose(attr_id) < 0) { H5_FAILED(); - HDprintf(" failed to close attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME2); + printf(" failed to close attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME2); PART_ERROR(H5Adelete_by_idx_name_order_increasing); } if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME3, attr_dtype, space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME3); + printf(" couldn't create attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME3); PART_ERROR(H5Adelete_by_idx_name_order_increasing); } if (H5Aclose(attr_id) < 0) { H5_FAILED(); - HDprintf(" failed to close attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME3); + printf(" failed to close attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME3); PART_ERROR(H5Adelete_by_idx_name_order_increasing); } /* Verify the attributes have been created */ if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if attribute '%s' exists\n", - ATTRIBUTE_DELETION_TEST_ATTR_NAME); + printf(" couldn't determine if attribute '%s' exists\n", + ATTRIBUTE_DELETION_TEST_ATTR_NAME); PART_ERROR(H5Adelete_by_idx_name_order_increasing); } if (!attr_exists) { H5_FAILED(); - HDprintf(" attribute '%s' didn't exist before deletion\n", - ATTRIBUTE_DELETION_TEST_ATTR_NAME); + printf(" attribute '%s' didn't exist before deletion\n", + ATTRIBUTE_DELETION_TEST_ATTR_NAME); PART_ERROR(H5Adelete_by_idx_name_order_increasing); } if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME2)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if attribute '%s' exists\n", - ATTRIBUTE_DELETION_TEST_ATTR_NAME2); + printf(" couldn't determine if attribute '%s' exists\n", + ATTRIBUTE_DELETION_TEST_ATTR_NAME2); PART_ERROR(H5Adelete_by_idx_name_order_increasing); } if (!attr_exists) { H5_FAILED(); - HDprintf(" attribute '%s' didn't exist before deletion\n", - ATTRIBUTE_DELETION_TEST_ATTR_NAME2); + printf(" attribute '%s' didn't exist before deletion\n", + ATTRIBUTE_DELETION_TEST_ATTR_NAME2); PART_ERROR(H5Adelete_by_idx_name_order_increasing); } if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME3)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if attribute '%s' exists\n", - ATTRIBUTE_DELETION_TEST_ATTR_NAME3); + printf(" couldn't determine if attribute '%s' exists\n", + ATTRIBUTE_DELETION_TEST_ATTR_NAME3); PART_ERROR(H5Adelete_by_idx_name_order_increasing); } if (!attr_exists) { H5_FAILED(); - HDprintf(" attribute '%s' didn't exist before deletion\n", - ATTRIBUTE_DELETION_TEST_ATTR_NAME3); + printf(" attribute '%s' didn't exist before deletion\n", + ATTRIBUTE_DELETION_TEST_ATTR_NAME3); PART_ERROR(H5Adelete_by_idx_name_order_increasing); } @@ -9142,50 +9129,50 @@ test_delete_attribute(void) if (H5Adelete_by_idx(container_group, ATTRIBUTE_DELETION_TEST_GROUP_NAME, H5_INDEX_NAME, H5_ITER_INC, 0, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to delete attribute using H5Adelete_by_idx by alphabetical order in " - "increasing order\n"); + printf(" failed to delete attribute using H5Adelete_by_idx by alphabetical order in " + "increasing order\n"); PART_ERROR(H5Adelete_by_idx_name_order_increasing); } /* Ensure that the attribute is gone and others remain */ if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if attribute '%s' exists\n", - ATTRIBUTE_DELETION_TEST_ATTR_NAME); + printf(" couldn't determine if attribute '%s' exists\n", + ATTRIBUTE_DELETION_TEST_ATTR_NAME); PART_ERROR(H5Adelete_by_idx_name_order_increasing); } if (attr_exists) { H5_FAILED(); - HDprintf(" attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME); + printf(" attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME); PART_ERROR(H5Adelete_by_idx_name_order_increasing); } if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME2)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if attribute '%s' exists\n", - ATTRIBUTE_DELETION_TEST_ATTR_NAME2); + printf(" couldn't determine if attribute '%s' exists\n", + ATTRIBUTE_DELETION_TEST_ATTR_NAME2); PART_ERROR(H5Adelete_by_idx_name_order_increasing); } if (!attr_exists) { H5_FAILED(); - HDprintf(" attribute '%s' doesn't exist after deletion of a different attribute!\n", - ATTRIBUTE_DELETION_TEST_ATTR_NAME2); + printf(" attribute '%s' doesn't exist after deletion of a different attribute!\n", + ATTRIBUTE_DELETION_TEST_ATTR_NAME2); PART_ERROR(H5Adelete_by_idx_name_order_increasing); } if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME3)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if attribute '%s' exists\n", - ATTRIBUTE_DELETION_TEST_ATTR_NAME3); + printf(" couldn't determine if attribute '%s' exists\n", + ATTRIBUTE_DELETION_TEST_ATTR_NAME3); PART_ERROR(H5Adelete_by_idx_name_order_increasing); } if (!attr_exists) { H5_FAILED(); - HDprintf(" attribute '%s' doesn't exist after deletion of a different attribute!\n", - ATTRIBUTE_DELETION_TEST_ATTR_NAME3); + printf(" attribute '%s' doesn't exist after deletion of a different attribute!\n", + ATTRIBUTE_DELETION_TEST_ATTR_NAME3); PART_ERROR(H5Adelete_by_idx_name_order_increasing); } @@ -9193,95 +9180,95 @@ test_delete_attribute(void) if (H5Adelete_by_idx(container_group, ATTRIBUTE_DELETION_TEST_GROUP_NAME, H5_INDEX_NAME, H5_ITER_INC, 0, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to delete attribute using H5Adelete_by_idx by alphabetical order in " - "increasing order\n"); + printf(" failed to delete attribute using H5Adelete_by_idx by alphabetical order in " + "increasing order\n"); PART_ERROR(H5Adelete_by_idx_name_order_increasing); } if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if attribute '%s' exists\n", - ATTRIBUTE_DELETION_TEST_ATTR_NAME); + printf(" couldn't determine if attribute '%s' exists\n", + ATTRIBUTE_DELETION_TEST_ATTR_NAME); PART_ERROR(H5Adelete_by_idx_name_order_increasing); } if (attr_exists) { H5_FAILED(); - HDprintf(" attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME); + printf(" attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME); PART_ERROR(H5Adelete_by_idx_name_order_increasing); } if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME2)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if attribute '%s' exists\n", - ATTRIBUTE_DELETION_TEST_ATTR_NAME2); + printf(" couldn't determine if attribute '%s' exists\n", + ATTRIBUTE_DELETION_TEST_ATTR_NAME2); PART_ERROR(H5Adelete_by_idx_name_order_increasing); } if (attr_exists) { H5_FAILED(); - HDprintf(" attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME2); + printf(" attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME2); PART_ERROR(H5Adelete_by_idx_name_order_increasing); } if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME3)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if attribute '%s' exists\n", - ATTRIBUTE_DELETION_TEST_ATTR_NAME3); + printf(" couldn't determine if attribute '%s' exists\n", + ATTRIBUTE_DELETION_TEST_ATTR_NAME3); PART_ERROR(H5Adelete_by_idx_name_order_increasing); } if (!attr_exists) { H5_FAILED(); - HDprintf(" attribute '%s' doesn't exist after deletion of a different attribute!\n", - ATTRIBUTE_DELETION_TEST_ATTR_NAME3); + printf(" attribute '%s' doesn't exist after deletion of a different attribute!\n", + ATTRIBUTE_DELETION_TEST_ATTR_NAME3); PART_ERROR(H5Adelete_by_idx_name_order_increasing); } if (H5Adelete_by_idx(container_group, ATTRIBUTE_DELETION_TEST_GROUP_NAME, H5_INDEX_NAME, H5_ITER_INC, 0, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to delete attribute using H5Adelete_by_idx by alphabetical order in " - "increasing order\n"); + printf(" failed to delete attribute using H5Adelete_by_idx by alphabetical order in " + "increasing order\n"); PART_ERROR(H5Adelete_by_idx_name_order_increasing); } if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if attribute '%s' exists\n", - ATTRIBUTE_DELETION_TEST_ATTR_NAME); + printf(" couldn't determine if attribute '%s' exists\n", + ATTRIBUTE_DELETION_TEST_ATTR_NAME); PART_ERROR(H5Adelete_by_idx_name_order_increasing); } if (attr_exists) { H5_FAILED(); - HDprintf(" attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME); + printf(" attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME); PART_ERROR(H5Adelete_by_idx_name_order_increasing); } if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME2)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if attribute '%s' exists\n", - ATTRIBUTE_DELETION_TEST_ATTR_NAME2); + printf(" couldn't determine if attribute '%s' exists\n", + ATTRIBUTE_DELETION_TEST_ATTR_NAME2); PART_ERROR(H5Adelete_by_idx_name_order_increasing); } if (attr_exists) { H5_FAILED(); - HDprintf(" attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME2); + printf(" attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME2); PART_ERROR(H5Adelete_by_idx_name_order_increasing); } if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME3)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if attribute '%s' exists\n", - ATTRIBUTE_DELETION_TEST_ATTR_NAME3); + printf(" couldn't determine if attribute '%s' exists\n", + ATTRIBUTE_DELETION_TEST_ATTR_NAME3); PART_ERROR(H5Adelete_by_idx_name_order_increasing); } if (attr_exists) { H5_FAILED(); - HDprintf(" attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME3); + printf(" attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME3); PART_ERROR(H5Adelete_by_idx_name_order_increasing); } @@ -9304,82 +9291,82 @@ test_delete_attribute(void) if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME, attr_dtype, space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME); + printf(" couldn't create attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME); PART_ERROR(H5Adelete_by_idx_name_order_decreasing); } if (H5Aclose(attr_id) < 0) { H5_FAILED(); - HDprintf(" failed to close attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME); + printf(" failed to close attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME); PART_ERROR(H5Adelete_by_idx_name_order_decreasing); } if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME2, attr_dtype, space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME2); + printf(" couldn't create attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME2); PART_ERROR(H5Adelete_by_idx_name_order_decreasing); } if (H5Aclose(attr_id) < 0) { H5_FAILED(); - HDprintf(" failed to close attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME2); + printf(" failed to close attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME2); PART_ERROR(H5Adelete_by_idx_name_order_decreasing); } if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME3, attr_dtype, space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME3); + printf(" couldn't create attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME3); PART_ERROR(H5Adelete_by_idx_name_order_decreasing); } if (H5Aclose(attr_id) < 0) { H5_FAILED(); - HDprintf(" failed to close attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME3); + printf(" failed to close attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME3); PART_ERROR(H5Adelete_by_idx_name_order_decreasing); } /* Verify the attributes have been created */ if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if attribute '%s' exists\n", - ATTRIBUTE_DELETION_TEST_ATTR_NAME); + printf(" couldn't determine if attribute '%s' exists\n", + ATTRIBUTE_DELETION_TEST_ATTR_NAME); PART_ERROR(H5Adelete_by_idx_name_order_decreasing); } if (!attr_exists) { H5_FAILED(); - HDprintf(" attribute '%s' didn't exist before deletion\n", - ATTRIBUTE_DELETION_TEST_ATTR_NAME); + printf(" attribute '%s' didn't exist before deletion\n", + ATTRIBUTE_DELETION_TEST_ATTR_NAME); PART_ERROR(H5Adelete_by_idx_name_order_decreasing); } if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME2)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if attribute '%s' exists\n", - ATTRIBUTE_DELETION_TEST_ATTR_NAME2); + printf(" couldn't determine if attribute '%s' exists\n", + ATTRIBUTE_DELETION_TEST_ATTR_NAME2); PART_ERROR(H5Adelete_by_idx_name_order_decreasing); } if (!attr_exists) { H5_FAILED(); - HDprintf(" attribute '%s' didn't exist before deletion\n", - ATTRIBUTE_DELETION_TEST_ATTR_NAME2); + printf(" attribute '%s' didn't exist before deletion\n", + ATTRIBUTE_DELETION_TEST_ATTR_NAME2); PART_ERROR(H5Adelete_by_idx_name_order_decreasing); } if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME3)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if attribute '%s' exists\n", - ATTRIBUTE_DELETION_TEST_ATTR_NAME3); + printf(" couldn't determine if attribute '%s' exists\n", + ATTRIBUTE_DELETION_TEST_ATTR_NAME3); PART_ERROR(H5Adelete_by_idx_name_order_decreasing); } if (!attr_exists) { H5_FAILED(); - HDprintf(" attribute '%s' didn't exist before deletion\n", - ATTRIBUTE_DELETION_TEST_ATTR_NAME3); + printf(" attribute '%s' didn't exist before deletion\n", + ATTRIBUTE_DELETION_TEST_ATTR_NAME3); PART_ERROR(H5Adelete_by_idx_name_order_decreasing); } @@ -9387,50 +9374,50 @@ test_delete_attribute(void) if (H5Adelete_by_idx(container_group, ATTRIBUTE_DELETION_TEST_GROUP_NAME, H5_INDEX_NAME, H5_ITER_DEC, 2, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to delete attribute using H5Adelete_by_idx by alphabetical order in " - "decreasing order\n"); + printf(" failed to delete attribute using H5Adelete_by_idx by alphabetical order in " + "decreasing order\n"); PART_ERROR(H5Adelete_by_idx_name_order_decreasing); } /* Ensure that the attribute is gone and others remain */ if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if attribute '%s' exists\n", - ATTRIBUTE_DELETION_TEST_ATTR_NAME); + printf(" couldn't determine if attribute '%s' exists\n", + ATTRIBUTE_DELETION_TEST_ATTR_NAME); PART_ERROR(H5Adelete_by_idx_name_order_decreasing); } if (attr_exists) { H5_FAILED(); - HDprintf(" attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME); + printf(" attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME); PART_ERROR(H5Adelete_by_idx_name_order_decreasing); } if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME2)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if attribute '%s' exists\n", - ATTRIBUTE_DELETION_TEST_ATTR_NAME2); + printf(" couldn't determine if attribute '%s' exists\n", + ATTRIBUTE_DELETION_TEST_ATTR_NAME2); PART_ERROR(H5Adelete_by_idx_name_order_decreasing); } if (!attr_exists) { H5_FAILED(); - HDprintf(" attribute '%s' doesn't exist after deletion of a different attribute!\n", - ATTRIBUTE_DELETION_TEST_ATTR_NAME2); + printf(" attribute '%s' doesn't exist after deletion of a different attribute!\n", + ATTRIBUTE_DELETION_TEST_ATTR_NAME2); PART_ERROR(H5Adelete_by_idx_name_order_decreasing); } if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME3)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if attribute '%s' exists\n", - ATTRIBUTE_DELETION_TEST_ATTR_NAME3); + printf(" couldn't determine if attribute '%s' exists\n", + ATTRIBUTE_DELETION_TEST_ATTR_NAME3); PART_ERROR(H5Adelete_by_idx_name_order_decreasing); } if (!attr_exists) { H5_FAILED(); - HDprintf(" attribute '%s' doesn't exist after deletion of a different attribute!\n", - ATTRIBUTE_DELETION_TEST_ATTR_NAME3); + printf(" attribute '%s' doesn't exist after deletion of a different attribute!\n", + ATTRIBUTE_DELETION_TEST_ATTR_NAME3); PART_ERROR(H5Adelete_by_idx_name_order_decreasing); } @@ -9438,95 +9425,95 @@ test_delete_attribute(void) if (H5Adelete_by_idx(container_group, ATTRIBUTE_DELETION_TEST_GROUP_NAME, H5_INDEX_NAME, H5_ITER_DEC, 1, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to delete attribute using H5Adelete_by_idx by alphabetical order in " - "decreasing order\n"); + printf(" failed to delete attribute using H5Adelete_by_idx by alphabetical order in " + "decreasing order\n"); PART_ERROR(H5Adelete_by_idx_name_order_decreasing); } if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if attribute '%s' exists\n", - ATTRIBUTE_DELETION_TEST_ATTR_NAME); + printf(" couldn't determine if attribute '%s' exists\n", + ATTRIBUTE_DELETION_TEST_ATTR_NAME); PART_ERROR(H5Adelete_by_idx_name_order_decreasing); } if (attr_exists) { H5_FAILED(); - HDprintf(" attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME); + printf(" attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME); PART_ERROR(H5Adelete_by_idx_name_order_decreasing); } if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME2)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if attribute '%s' exists\n", - ATTRIBUTE_DELETION_TEST_ATTR_NAME2); + printf(" couldn't determine if attribute '%s' exists\n", + ATTRIBUTE_DELETION_TEST_ATTR_NAME2); PART_ERROR(H5Adelete_by_idx_name_order_decreasing); } if (attr_exists) { H5_FAILED(); - HDprintf(" attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME2); + printf(" attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME2); PART_ERROR(H5Adelete_by_idx_name_order_decreasing); } if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME3)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if attribute '%s' exists\n", - ATTRIBUTE_DELETION_TEST_ATTR_NAME3); + printf(" couldn't determine if attribute '%s' exists\n", + ATTRIBUTE_DELETION_TEST_ATTR_NAME3); PART_ERROR(H5Adelete_by_idx_name_order_decreasing); } if (!attr_exists) { H5_FAILED(); - HDprintf(" attribute '%s' doesn't exist after deletion of a different attribute!\n", - ATTRIBUTE_DELETION_TEST_ATTR_NAME3); + printf(" attribute '%s' doesn't exist after deletion of a different attribute!\n", + ATTRIBUTE_DELETION_TEST_ATTR_NAME3); PART_ERROR(H5Adelete_by_idx_name_order_decreasing); } if (H5Adelete_by_idx(container_group, ATTRIBUTE_DELETION_TEST_GROUP_NAME, H5_INDEX_NAME, H5_ITER_DEC, 0, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to delete attribute using H5Adelete_by_idx by alphabetical order in " - "decreasing order\n"); + printf(" failed to delete attribute using H5Adelete_by_idx by alphabetical order in " + "decreasing order\n"); PART_ERROR(H5Adelete_by_idx_name_order_decreasing); } if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if attribute '%s' exists\n", - ATTRIBUTE_DELETION_TEST_ATTR_NAME); + printf(" couldn't determine if attribute '%s' exists\n", + ATTRIBUTE_DELETION_TEST_ATTR_NAME); PART_ERROR(H5Adelete_by_idx_name_order_decreasing); } if (attr_exists) { H5_FAILED(); - HDprintf(" attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME); + printf(" attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME); PART_ERROR(H5Adelete_by_idx_name_order_decreasing); } if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME2)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if attribute '%s' exists\n", - ATTRIBUTE_DELETION_TEST_ATTR_NAME2); + printf(" couldn't determine if attribute '%s' exists\n", + ATTRIBUTE_DELETION_TEST_ATTR_NAME2); PART_ERROR(H5Adelete_by_idx_name_order_decreasing); } if (attr_exists) { H5_FAILED(); - HDprintf(" attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME2); + printf(" attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME2); PART_ERROR(H5Adelete_by_idx_name_order_decreasing); } if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME3)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if attribute '%s' exists\n", - ATTRIBUTE_DELETION_TEST_ATTR_NAME3); + printf(" couldn't determine if attribute '%s' exists\n", + ATTRIBUTE_DELETION_TEST_ATTR_NAME3); PART_ERROR(H5Adelete_by_idx_name_order_decreasing); } if (attr_exists) { H5_FAILED(); - HDprintf(" attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME3); + printf(" attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME3); PART_ERROR(H5Adelete_by_idx_name_order_decreasing); } @@ -9601,7 +9588,7 @@ test_delete_attribute_invalid_params(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC)) { SKIPPED(); - HDprintf( + printf( " API functions for basic file, group, or attribute aren't supported with this connector\n"); return 0; } @@ -9610,21 +9597,21 @@ test_delete_attribute_invalid_params(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, ATTRIBUTE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", ATTRIBUTE_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", ATTRIBUTE_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, ATTRIBUTE_DELETION_INVALID_PARAMS_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container group '%s'\n", - ATTRIBUTE_DELETION_INVALID_PARAMS_TEST_GROUP_NAME); + printf(" couldn't create container group '%s'\n", + ATTRIBUTE_DELETION_INVALID_PARAMS_TEST_GROUP_NAME); goto error; } @@ -9638,20 +9625,20 @@ test_delete_attribute_invalid_params(void) if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_DELETION_INVALID_PARAMS_TEST_ATTR_NAME, attr_dtype, space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create attribute\n"); + printf(" couldn't create attribute\n"); goto error; } /* Verify the attribute has been created */ if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_INVALID_PARAMS_TEST_ATTR_NAME)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if attribute exists\n"); + printf(" couldn't determine if attribute exists\n"); goto error; } if (!attr_exists) { H5_FAILED(); - HDprintf(" attribute didn't exists\n"); + printf(" attribute didn't exists\n"); goto error; } @@ -9671,7 +9658,7 @@ test_delete_attribute_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" deleted an attribute using H5Adelete with an invalid loc_id!\n"); + printf(" deleted an attribute using H5Adelete with an invalid loc_id!\n"); PART_ERROR(H5Adelete_invalid_loc_id); } @@ -9691,7 +9678,7 @@ test_delete_attribute_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" deleted an attribute using H5Adelete with a NULL attribute name!\n"); + printf(" deleted an attribute using H5Adelete with a NULL attribute name!\n"); PART_ERROR(H5Adelete_invalid_attr_name); } @@ -9703,7 +9690,7 @@ test_delete_attribute_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" deleted an attribute using H5Adelete with an invalid attribute name of ''!\n"); + printf(" deleted an attribute using H5Adelete with an invalid attribute name of ''!\n"); PART_ERROR(H5Adelete_invalid_attr_name); } @@ -9724,7 +9711,7 @@ test_delete_attribute_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" deleted an attribute using H5Adelete_by_name with an invalid loc_id!\n"); + printf(" deleted an attribute using H5Adelete_by_name with an invalid loc_id!\n"); PART_ERROR(H5Adelete_by_name_invalid_loc_id); } @@ -9745,7 +9732,7 @@ test_delete_attribute_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" deleted an attribute using H5Adelete_by_name with a NULL object name!\n"); + printf(" deleted an attribute using H5Adelete_by_name with a NULL object name!\n"); PART_ERROR(H5Adelete_by_name_invalid_obj_name); } @@ -9758,7 +9745,7 @@ test_delete_attribute_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf( + printf( " deleted an attribute using H5Adelete_by_name with an invalid object name of ''!\n"); PART_ERROR(H5Adelete_by_name_invalid_obj_name); } @@ -9779,7 +9766,7 @@ test_delete_attribute_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" deleted an attribute using H5Adelete_by_name with a NULL attribute name!\n"); + printf(" deleted an attribute using H5Adelete_by_name with a NULL attribute name!\n"); PART_ERROR(H5Adelete_by_name_invalid_attr_name); } @@ -9791,8 +9778,8 @@ test_delete_attribute_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" deleted an attribute using H5Adelete_by_name with an invalid attribute name of " - "''!\n"); + printf(" deleted an attribute using H5Adelete_by_name with an invalid attribute name of " + "''!\n"); PART_ERROR(H5Adelete_by_name_invalid_attr_name); } @@ -9813,7 +9800,7 @@ test_delete_attribute_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" deleted an attribute using H5Adelete_by_name with an invalid LAPL!\n"); + printf(" deleted an attribute using H5Adelete_by_name with an invalid LAPL!\n"); PART_ERROR(H5Adelete_by_name_invalid_lapl); } @@ -9833,7 +9820,7 @@ test_delete_attribute_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" deleted an attribute using H5Adelete_by_idx with an invalid loc_id!\n"); + printf(" deleted an attribute using H5Adelete_by_idx with an invalid loc_id!\n"); PART_ERROR(H5Adelete_by_idx_invalid_loc_id); } @@ -9853,7 +9840,7 @@ test_delete_attribute_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" deleted an attribute using H5Adelete_by_idx with a NULL object name!\n"); + printf(" deleted an attribute using H5Adelete_by_idx with a NULL object name!\n"); PART_ERROR(H5Adelete_by_idx_invalid_obj_name); } @@ -9865,7 +9852,7 @@ test_delete_attribute_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf( + printf( " deleted an attribute using H5Adelete_by_idx with an invalid object name of ''!\n"); PART_ERROR(H5Adelete_by_idx_invalid_obj_name); } @@ -9886,8 +9873,8 @@ test_delete_attribute_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" deleted an attribute using H5Adelete_by_idx with invalid index type " - "H5_INDEX_UNKNOWN!\n"); + printf(" deleted an attribute using H5Adelete_by_idx with invalid index type " + "H5_INDEX_UNKNOWN!\n"); PART_ERROR(H5Adelete_by_idx_invalid_index_type); } @@ -9899,7 +9886,7 @@ test_delete_attribute_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf( + printf( " deleted an attribute using H5Adelete_by_idx with invalid index type H5_INDEX_N!\n"); PART_ERROR(H5Adelete_by_idx_invalid_index_type); } @@ -9920,8 +9907,8 @@ test_delete_attribute_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" deleted an attribute using H5Adelete_by_idx with invalid index ordering " - "H5_ITER_UNKNOWN!\n"); + printf(" deleted an attribute using H5Adelete_by_idx with invalid index ordering " + "H5_ITER_UNKNOWN!\n"); PART_ERROR(H5Adelete_by_idx_invalid_index_order); } @@ -9933,8 +9920,8 @@ test_delete_attribute_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" deleted an attribute using H5Adelete_by_idx with invalid index ordering " - "H5_ITER_N!\n"); + printf(" deleted an attribute using H5Adelete_by_idx with invalid index ordering " + "H5_ITER_N!\n"); PART_ERROR(H5Adelete_by_idx_invalid_index_order); } @@ -9954,7 +9941,7 @@ test_delete_attribute_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" deleted an attribute using H5Adelete_by_idx with an invalid LAPL!\n"); + printf(" deleted an attribute using H5Adelete_by_idx with an invalid LAPL!\n"); PART_ERROR(H5Adelete_by_idx_invalid_lapl); } @@ -10018,7 +10005,7 @@ test_attribute_exists(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC)) { SKIPPED(); - HDprintf( + printf( " API functions for basic file, group, or attribute aren't supported with this connector\n"); return 0; } @@ -10027,20 +10014,20 @@ test_attribute_exists(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, ATTRIBUTE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group\n"); + printf(" couldn't open container group\n"); goto error; } if ((group_id = H5Gcreate2(container_group, ATTRIBUTE_EXISTS_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container group '%s'\n", ATTRIBUTE_EXISTS_TEST_GROUP_NAME); + printf(" couldn't create container group '%s'\n", ATTRIBUTE_EXISTS_TEST_GROUP_NAME); goto error; } @@ -10053,7 +10040,7 @@ test_attribute_exists(void) if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_EXISTS_TEST_ATTR_NAME, attr_dtype, space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create attribute\n"); + printf(" couldn't create attribute\n"); goto error; } @@ -10067,13 +10054,13 @@ test_attribute_exists(void) if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_EXISTS_TEST_ATTR_NAME)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if attribute exists\n"); + printf(" couldn't determine if attribute exists\n"); PART_ERROR(H5Aexists); } if (!attr_exists) { H5_FAILED(); - HDprintf(" attribute '%s' did not exist\n", ATTRIBUTE_EXISTS_TEST_ATTR_NAME); + printf(" attribute '%s' did not exist\n", ATTRIBUTE_EXISTS_TEST_ATTR_NAME); PART_ERROR(H5Aexists); } @@ -10088,13 +10075,13 @@ test_attribute_exists(void) if ((attr_exists = H5Aexists_by_name(container_group, ATTRIBUTE_EXISTS_TEST_GROUP_NAME, ATTRIBUTE_EXISTS_TEST_ATTR_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if attribute exists by name\n"); + printf(" couldn't determine if attribute exists by name\n"); PART_ERROR(H5Aexists_by_name); } if (!attr_exists) { H5_FAILED(); - HDprintf(" attribute '%s' did not exist by name\n", ATTRIBUTE_EXISTS_TEST_ATTR_NAME); + printf(" attribute '%s' did not exist by name\n", ATTRIBUTE_EXISTS_TEST_ATTR_NAME); PART_ERROR(H5Aexists_by_name); } @@ -10160,7 +10147,7 @@ test_attribute_exists_invalid_params(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC)) { SKIPPED(); - HDprintf( + printf( " API functions for basic file, group, or attribute aren't supported with this connector\n"); return 0; } @@ -10169,21 +10156,20 @@ test_attribute_exists_invalid_params(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, ATTRIBUTE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", ATTRIBUTE_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", ATTRIBUTE_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, ATTRIBUTE_EXISTS_INVALID_PARAMS_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container group '%s'\n", - ATTRIBUTE_EXISTS_INVALID_PARAMS_TEST_GROUP_NAME); + printf(" couldn't create container group '%s'\n", ATTRIBUTE_EXISTS_INVALID_PARAMS_TEST_GROUP_NAME); goto error; } @@ -10197,20 +10183,20 @@ test_attribute_exists_invalid_params(void) if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_EXISTS_INVALID_PARAMS_TEST_ATTR_NAME, attr_dtype, space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create attribute\n"); + printf(" couldn't create attribute\n"); goto error; } /* Verify the attribute has been created */ if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_EXISTS_INVALID_PARAMS_TEST_ATTR_NAME)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if attribute exists\n"); + printf(" couldn't determine if attribute exists\n"); goto error; } if (!attr_exists) { H5_FAILED(); - HDprintf(" attribute didn't exists\n"); + printf(" attribute didn't exists\n"); goto error; } @@ -10230,7 +10216,7 @@ test_attribute_exists_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Aexists with an invalid loc_id succeeded!\n"); + printf(" H5Aexists with an invalid loc_id succeeded!\n"); PART_ERROR(H5Aexists_invalid_loc_id); } @@ -10250,7 +10236,7 @@ test_attribute_exists_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Aexists with a NULL attribute name succeeded!\n"); + printf(" H5Aexists with a NULL attribute name succeeded!\n"); PART_ERROR(H5Aexists_invalid_attr_name); } @@ -10262,7 +10248,7 @@ test_attribute_exists_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Aexists with an invalid attribute name of '' succeeded!\n"); + printf(" H5Aexists with an invalid attribute name of '' succeeded!\n"); PART_ERROR(H5Aexists_invalid_attr_name); } @@ -10283,7 +10269,7 @@ test_attribute_exists_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Aexists_by_name with an invalid loc_id succeeded!\n"); + printf(" H5Aexists_by_name with an invalid loc_id succeeded!\n"); PART_ERROR(H5Aexists_by_name_invalid_loc_id); } @@ -10304,7 +10290,7 @@ test_attribute_exists_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Aexists_by_name with a NULL object name succeeded!\n"); + printf(" H5Aexists_by_name with a NULL object name succeeded!\n"); PART_ERROR(H5Aexists_by_name_invalid_obj_name); } @@ -10317,7 +10303,7 @@ test_attribute_exists_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Aexists_by_name with an invalid object name of '' succeeded!\n"); + printf(" H5Aexists_by_name with an invalid object name of '' succeeded!\n"); PART_ERROR(H5Aexists_by_name_invalid_obj_name); } @@ -10338,7 +10324,7 @@ test_attribute_exists_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Aexists_by_name with a NULL attribute name succeeded!\n"); + printf(" H5Aexists_by_name with a NULL attribute name succeeded!\n"); PART_ERROR(H5Aexists_by_name_invalid_attr_name); } @@ -10351,7 +10337,7 @@ test_attribute_exists_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Aexists_by_name with an invalid attribute name of '' succeeded!\n"); + printf(" H5Aexists_by_name with an invalid attribute name of '' succeeded!\n"); PART_ERROR(H5Aexists_by_name_invalid_attr_name); } @@ -10372,7 +10358,7 @@ test_attribute_exists_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Aexists_by_name with an invalid link access property list succeeded!\n"); + printf(" H5Aexists_by_name with an invalid link access property list succeeded!\n"); PART_ERROR(H5Aexists_by_name_invalid_lapl); } @@ -10439,27 +10425,27 @@ test_attribute_many(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC)) { SKIPPED(); - HDprintf( + printf( " API functions for basic file, group, or attribute aren't supported with this connector\n"); return 0; } if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file\n"); + printf(" couldn't open file\n"); goto error; } if ((container_group = H5Gopen2(file_id, ATTRIBUTE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group\n"); + printf(" couldn't open container group\n"); goto error; } if ((group_id = H5Gcreate2(container_group, ATTRIBUTE_MANY_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create the group '%s'\n", ATTRIBUTE_MANY_GROUP_NAME); + printf(" couldn't create the group '%s'\n", ATTRIBUTE_MANY_GROUP_NAME); goto error; } @@ -10475,20 +10461,20 @@ test_attribute_many(void) if ((attr_id = H5Acreate2(group_id, attrname, attr_dtype, space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create attribute\n"); + printf(" couldn't create attribute\n"); goto error; } /* Verify the attribute has been created */ if ((attr_exists = H5Aexists(group_id, attrname)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if attribute exists\n"); + printf(" couldn't determine if attribute exists\n"); goto error; } if (!attr_exists) { H5_FAILED(); - HDprintf(" attribute did not exist\n"); + printf(" attribute did not exist\n"); goto error; } @@ -10547,27 +10533,27 @@ test_attribute_duplicate_id(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC)) { SKIPPED(); - HDprintf( + printf( " API functions for basic file, group, or attribute aren't supported with this connector\n"); return 0; } if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file\n"); + printf(" couldn't open file\n"); goto error; } if ((container_group = H5Gopen2(file_id, ATTRIBUTE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group\n"); + printf(" couldn't open container group\n"); goto error; } if ((group_id = H5Gcreate2(container_group, ATTRIBUTE_DUPLICATE_ID_GRP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create the group '%s'\n", ATTRIBUTE_DUPLICATE_ID_GRP_NAME); + printf(" couldn't create the group '%s'\n", ATTRIBUTE_DUPLICATE_ID_GRP_NAME); goto error; } @@ -10580,27 +10566,27 @@ test_attribute_duplicate_id(void) if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_DUPLICATE_ID_ATTR_NAME, attr_dtype, space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create attribute\n"); + printf(" couldn't create attribute\n"); goto error; } /* Verify the attribute has been created */ if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DUPLICATE_ID_ATTR_NAME)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if attribute exists\n"); + printf(" couldn't determine if attribute exists\n"); goto error; } if (!attr_exists) { H5_FAILED(); - HDprintf(" attribute did not exist\n"); + printf(" attribute did not exist\n"); goto error; } /* Open the attribute just created and get a second ID */ if ((attr_id2 = H5Aopen(group_id, ATTRIBUTE_DUPLICATE_ID_ATTR_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" attribute can't be opened for a second time\n"); + printf(" attribute can't be opened for a second time\n"); goto error; } @@ -10663,8 +10649,8 @@ test_get_number_attributes(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_OBJECT_MORE)) { SKIPPED(); - HDprintf(" API functions for basic file, group, attribute, or object aren't supported with this " - "connector\n"); + printf(" API functions for basic file, group, attribute, or object aren't supported with this " + "connector\n"); return 0; } @@ -10672,20 +10658,20 @@ test_get_number_attributes(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file\n"); + printf(" couldn't open file\n"); goto error; } if ((container_group = H5Gopen2(file_id, ATTRIBUTE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group\n"); + printf(" couldn't open container group\n"); goto error; } if ((group_id = H5Gcreate2(container_group, ATTRIBUTE_GET_NUM_ATTRS_TEST_GRP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create the group '%s'\n", ATTRIBUTE_GET_NUM_ATTRS_TEST_GRP_NAME); + printf(" couldn't create the group '%s'\n", ATTRIBUTE_GET_NUM_ATTRS_TEST_GRP_NAME); goto error; } @@ -10698,20 +10684,20 @@ test_get_number_attributes(void) if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_GET_NUM_ATTRS_TEST_ATTR_NAME, attr_dtype, space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create attribute\n"); + printf(" couldn't create attribute\n"); goto error; } /* Verify the attribute has been created */ if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_GET_NUM_ATTRS_TEST_ATTR_NAME)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if attribute exists\n"); + printf(" couldn't determine if attribute exists\n"); goto error; } if (!attr_exists) { H5_FAILED(); - HDprintf(" attribute did not exist\n"); + printf(" attribute did not exist\n"); goto error; } @@ -10726,13 +10712,13 @@ test_get_number_attributes(void) /* Now get the number of attributes from the group */ if (H5Oget_info3(group_id, &obj_info, H5O_INFO_ALL) < 0) { H5_FAILED(); - HDprintf(" couldn't retrieve group info using H5Oget_info3\n"); + printf(" couldn't retrieve group info using H5Oget_info3\n"); PART_ERROR(H5Oget_info); } if (obj_info.num_attrs != 1) { H5_FAILED(); - HDprintf(" invalid number of attributes received\n"); + printf(" invalid number of attributes received\n"); PART_ERROR(H5Oget_info); } @@ -10747,13 +10733,13 @@ test_get_number_attributes(void) if (H5Oget_info_by_name3(container_group, ATTRIBUTE_GET_NUM_ATTRS_TEST_GRP_NAME, &obj_info, H5O_INFO_ALL, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't retrieve group info using H5Oget_info_by_name3\n"); + printf(" couldn't retrieve group info using H5Oget_info_by_name3\n"); PART_ERROR(H5Oget_info_by_name); } if (obj_info.num_attrs != 1) { H5_FAILED(); - HDprintf(" invalid number of attributes received\n"); + printf(" invalid number of attributes received\n"); PART_ERROR(H5Oget_info_by_name); } @@ -10768,13 +10754,13 @@ test_get_number_attributes(void) if (H5Oget_info_by_idx3(container_group, ".", H5_INDEX_NAME, H5_ITER_INC, 0, &obj_info, H5O_INFO_ALL, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't retrieve group info using H5Oget_info_by_idx3\n"); + printf(" couldn't retrieve group info using H5Oget_info_by_idx3\n"); PART_ERROR(H5Oget_info_by_idx); } if (obj_info.num_attrs != 1) { H5_FAILED(); - HDprintf(" invalid number of attributes received\n"); + printf(" invalid number of attributes received\n"); PART_ERROR(H5Oget_info_by_idx); } @@ -10845,27 +10831,27 @@ test_attr_shared_dtype(void) !(vol_cap_flags_g & H5VL_CAP_FLAG_STORED_DATATYPES) || !(vol_cap_flags_g & H5VL_CAP_FLAG_OBJECT_MORE)) { SKIPPED(); - HDprintf(" API functions for basic file, group, attribute, stored datatype, or object aren't " - "supported with this connector\n"); + printf(" API functions for basic file, group, attribute, stored datatype, or object aren't " + "supported with this connector\n"); return 0; } if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file\n"); + printf(" couldn't open file\n"); goto error; } if ((container_group = H5Gopen2(file_id, ATTRIBUTE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group\n"); + printf(" couldn't open container group\n"); goto error; } if ((group_id = H5Gcreate2(container_group, ATTRIBUTE_SHARED_DTYPE_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create the group '%s'\n", ATTRIBUTE_SHARED_DTYPE_GROUP_NAME); + printf(" couldn't create the group '%s'\n", ATTRIBUTE_SHARED_DTYPE_GROUP_NAME); goto error; } @@ -10879,73 +10865,73 @@ test_attr_shared_dtype(void) if (H5Tcommit2(group_id, ATTRIBUTE_SHARED_DTYPE_NAME, attr_dtype, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't commit datatype\n"); + printf(" couldn't commit datatype\n"); goto error; } if (H5Oget_info_by_name3(group_id, ATTRIBUTE_SHARED_DTYPE_NAME, &obj_info, H5O_INFO_ALL, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't retrieve root group info using H5Oget_info_by_name3\n"); + printf(" couldn't retrieve root group info using H5Oget_info_by_name3\n"); goto error; } if (obj_info.rc != 1) { H5_FAILED(); - HDprintf(" reference count of the named datatype is wrong: %u\n", obj_info.rc); + printf(" reference count of the named datatype is wrong: %u\n", obj_info.rc); goto error; } if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_SHARED_DTYPE_ATTR_NAME, attr_dtype, space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create attribute\n"); + printf(" couldn't create attribute\n"); goto error; } /* Verify the attribute has been created */ if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_SHARED_DTYPE_ATTR_NAME)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if attribute exists\n"); + printf(" couldn't determine if attribute exists\n"); goto error; } if (!attr_exists) { H5_FAILED(); - HDprintf(" attribute did not exist\n"); + printf(" attribute did not exist\n"); goto error; } if (H5Oget_info_by_name3(group_id, ATTRIBUTE_SHARED_DTYPE_NAME, &obj_info, H5O_INFO_ALL, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't retrieve root group info using H5Oget_info_by_name3\n"); + printf(" couldn't retrieve root group info using H5Oget_info_by_name3\n"); goto error; } if (obj_info.rc != 2) { H5_FAILED(); - HDprintf(" reference count of the named datatype is wrong: %u\n", obj_info.rc); + printf(" reference count of the named datatype is wrong: %u\n", obj_info.rc); goto error; } if ((dset_id = H5Dcreate2(group_id, ATTRIBUTE_SHARED_DTYPE_DSET_NAME, attr_dtype, space_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create dataset\n"); + printf(" couldn't create dataset\n"); goto error; } if (H5Oget_info_by_name3(group_id, ATTRIBUTE_SHARED_DTYPE_NAME, &obj_info, H5O_INFO_ALL, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't retrieve root group info using H5Oget_info_by_name3\n"); + printf(" couldn't retrieve root group info using H5Oget_info_by_name3\n"); goto error; } if (obj_info.rc != 3) { H5_FAILED(); - HDprintf(" reference count of the named datatype is wrong: %u\n", obj_info.rc); + printf(" reference count of the named datatype is wrong: %u\n", obj_info.rc); goto error; } @@ -11016,7 +11002,7 @@ attr_iter_callback1(hid_t location_id, const char *attr_name, const H5A_info_t * } if (HDstrncmp(attr_name, expected_attr_name, ATTRIBUTE_ITERATE_TEST_ATTR_NAME_BUF_SIZE)) { - HDprintf(" attribute name '%s' didn't match expected name '%s'\n", attr_name, expected_attr_name); + printf(" attribute name '%s' didn't match expected name '%s'\n", attr_name, expected_attr_name); ret_val = H5_ITER_ERROR; goto done; } @@ -11043,8 +11029,8 @@ attr_iter_callback1(hid_t location_id, const char *attr_name, const H5A_info_t * if (ainfo->corder != expected_crt_order) { H5_FAILED(); - HDprintf(" attribute's creation order value of %lld didn't match expected value of %lld\n", - (long long)ainfo->corder, (long long)expected_crt_order); + printf(" attribute's creation order value of %lld didn't match expected value of %lld\n", + (long long)ainfo->corder, (long long)expected_crt_order); ret_val = H5_ITER_ERROR; goto done; } @@ -11073,17 +11059,17 @@ H5_api_attribute_test(void) size_t i; int nerrors; - HDprintf("**********************************************\n"); - HDprintf("* *\n"); - HDprintf("* API Attribute Tests *\n"); - HDprintf("* *\n"); - HDprintf("**********************************************\n\n"); + printf("**********************************************\n"); + printf("* *\n"); + printf("* API Attribute Tests *\n"); + printf("* *\n"); + printf("**********************************************\n\n"); for (i = 0, nerrors = 0; i < ARRAY_LENGTH(attribute_tests); i++) { nerrors += (*attribute_tests[i])() ? 1 : 0; } - HDprintf("\n"); + printf("\n"); return nerrors; } diff --git a/test/API/H5_api_dataset_test.c b/test/API/H5_api_dataset_test.c index e31ed43..d99516f 100644 --- a/test/API/H5_api_dataset_test.c +++ b/test/API/H5_api_dataset_test.c @@ -169,13 +169,13 @@ test_create_dataset_under_root(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC)) { SKIPPED(); - HDprintf(" API functions for basic file or dataset aren't supported with this connector\n"); + printf(" API functions for basic file or dataset aren't supported with this connector\n"); return 0; } if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } @@ -189,7 +189,7 @@ test_create_dataset_under_root(void) if ((dset_id = H5Dcreate2(file_id, DATASET_CREATE_UNDER_ROOT_DSET_NAME, dset_dtype, fspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create dataset '%s'\n", DATASET_CREATE_UNDER_ROOT_DSET_NAME); + printf(" couldn't create dataset '%s'\n", DATASET_CREATE_UNDER_ROOT_DSET_NAME); goto error; } @@ -238,27 +238,26 @@ test_create_dataset_under_existing_group(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC)) { SKIPPED(); - HDprintf( - " API functions for basic file, group, or dataset aren't supported with this connector\n"); + printf(" API functions for basic file, group, or dataset aren't supported with this connector\n"); return 0; } if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open group '%s'\n", DATASET_TEST_GROUP_NAME); + printf(" couldn't open group '%s'\n", DATASET_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, DATASET_CREATE_UNDER_EXISTING_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container group '%s'\n", DATASET_CREATE_UNDER_EXISTING_GROUP_NAME); + printf(" couldn't create container group '%s'\n", DATASET_CREATE_UNDER_EXISTING_GROUP_NAME); goto error; } @@ -272,7 +271,7 @@ test_create_dataset_under_existing_group(void) if ((dset_id = H5Dcreate2(group_id, DATASET_CREATE_UNDER_EXISTING_DSET_NAME, dset_dtype, fspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create dataset '%s'\n", DATASET_CREATE_UNDER_EXISTING_DSET_NAME); + printf(" couldn't create dataset '%s'\n", DATASET_CREATE_UNDER_EXISTING_DSET_NAME); goto error; } @@ -327,8 +326,7 @@ test_create_dataset_invalid_params(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC)) { SKIPPED(); - HDprintf( - " API functions for basic file, group, or dataset aren't supported with this connector\n"); + printf(" API functions for basic file, group, or dataset aren't supported with this connector\n"); return 0; } @@ -336,20 +334,20 @@ test_create_dataset_invalid_params(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open group '%s'\n", DATASET_TEST_GROUP_NAME); + printf(" couldn't open group '%s'\n", DATASET_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, DATASET_CREATE_INVALID_PARAMS_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container group '%s'\n", DATASET_CREATE_INVALID_PARAMS_GROUP_NAME); + printf(" couldn't create container group '%s'\n", DATASET_CREATE_INVALID_PARAMS_GROUP_NAME); goto error; } @@ -377,7 +375,7 @@ test_create_dataset_invalid_params(void) if (dset_id >= 0) { H5_FAILED(); - HDprintf(" created dataset using H5Dcreate with an invalid loc_id!\n"); + printf(" created dataset using H5Dcreate with an invalid loc_id!\n"); H5Dclose(dset_id); PART_ERROR(H5Dcreate_invalid_loc_id); } @@ -399,7 +397,7 @@ test_create_dataset_invalid_params(void) if (dset_id >= 0) { H5_FAILED(); - HDprintf(" created dataset using H5Dcreate with a NULL dataset name!\n"); + printf(" created dataset using H5Dcreate with a NULL dataset name!\n"); H5Dclose(dset_id); PART_ERROR(H5Dcreate_invalid_dataset_name); } @@ -413,7 +411,7 @@ test_create_dataset_invalid_params(void) if (dset_id >= 0) { H5_FAILED(); - HDprintf(" created dataset using H5Dcreate with an invalid dataset name of ''!\n"); + printf(" created dataset using H5Dcreate with an invalid dataset name of ''!\n"); H5Dclose(dset_id); PART_ERROR(H5Dcreate_invalid_dataset_name); } @@ -435,7 +433,7 @@ test_create_dataset_invalid_params(void) if (dset_id >= 0) { H5_FAILED(); - HDprintf(" created dataset using H5Dcreate with an invalid datatype!\n"); + printf(" created dataset using H5Dcreate with an invalid datatype!\n"); H5Dclose(dset_id); PART_ERROR(H5Dcreate_invalid_datatype); } @@ -457,7 +455,7 @@ test_create_dataset_invalid_params(void) if (dset_id >= 0) { H5_FAILED(); - HDprintf(" created dataset using H5Dcreate with an invalid dataspace!\n"); + printf(" created dataset using H5Dcreate with an invalid dataspace!\n"); H5Dclose(dset_id); PART_ERROR(H5Dcreate_invalid_dataspace); } @@ -479,7 +477,7 @@ test_create_dataset_invalid_params(void) if (dset_id >= 0) { H5_FAILED(); - HDprintf(" created dataset using H5Dcreate with an invalid LCPL!\n"); + printf(" created dataset using H5Dcreate with an invalid LCPL!\n"); H5Dclose(dset_id); PART_ERROR(H5Dcreate_invalid_lcpl); } @@ -501,7 +499,7 @@ test_create_dataset_invalid_params(void) if (dset_id >= 0) { H5_FAILED(); - HDprintf(" created dataset using H5Dcreate with an invalid DCPL!\n"); + printf(" created dataset using H5Dcreate with an invalid DCPL!\n"); H5Dclose(dset_id); PART_ERROR(H5Dcreate_invalid_dcpl); } @@ -523,7 +521,7 @@ test_create_dataset_invalid_params(void) if (dset_id >= 0) { H5_FAILED(); - HDprintf(" created dataset using H5Dcreate with an invalid DAPL!\n"); + printf(" created dataset using H5Dcreate with an invalid DAPL!\n"); H5Dclose(dset_id); PART_ERROR(H5Dcreate_invalid_dapl); } @@ -584,27 +582,26 @@ test_create_anonymous_dataset(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC)) { SKIPPED(); - HDprintf( - " API functions for basic file, group, or dataset aren't supported with this connector\n"); + printf(" API functions for basic file, group, or dataset aren't supported with this connector\n"); return 0; } if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, DATASET_CREATE_ANONYMOUS_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container group '%s'\n", DATASET_CREATE_ANONYMOUS_GROUP_NAME); + printf(" couldn't create container group '%s'\n", DATASET_CREATE_ANONYMOUS_GROUP_NAME); goto error; } @@ -616,7 +613,7 @@ test_create_anonymous_dataset(void) if ((dset_id = H5Dcreate_anon(group_id, dset_dtype, fspace_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create anonymous dataset\n"); + printf(" couldn't create anonymous dataset\n"); goto error; } @@ -672,8 +669,7 @@ test_create_anonymous_dataset_invalid_params(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC)) { SKIPPED(); - HDprintf( - " API functions for basic file, group, or dataset aren't supported with this connector\n"); + printf(" API functions for basic file, group, or dataset aren't supported with this connector\n"); return 0; } @@ -681,21 +677,21 @@ test_create_anonymous_dataset_invalid_params(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, DATASET_CREATE_ANONYMOUS_INVALID_PARAMS_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container group '%s'\n", - DATASET_CREATE_ANONYMOUS_INVALID_PARAMS_GROUP_NAME); + printf(" couldn't create container group '%s'\n", + DATASET_CREATE_ANONYMOUS_INVALID_PARAMS_GROUP_NAME); goto error; } @@ -722,7 +718,7 @@ test_create_anonymous_dataset_invalid_params(void) if (dset_id >= 0) { H5_FAILED(); - HDprintf(" created anonymous dataset using an invalid loc_id!\n"); + printf(" created anonymous dataset using an invalid loc_id!\n"); H5Dclose(dset_id); PART_ERROR(H5Dcreate_anon_invalid_loc_id); } @@ -743,7 +739,7 @@ test_create_anonymous_dataset_invalid_params(void) if (dset_id >= 0) { H5_FAILED(); - HDprintf(" created anonymous dataset using an invalid dataset datatype!\n"); + printf(" created anonymous dataset using an invalid dataset datatype!\n"); H5Dclose(dset_id); PART_ERROR(H5Dcreate_anon_invalid_datatype); } @@ -764,7 +760,7 @@ test_create_anonymous_dataset_invalid_params(void) if (dset_id >= 0) { H5_FAILED(); - HDprintf(" created anonymous dataset using an invalid dataset dataspace!\n"); + printf(" created anonymous dataset using an invalid dataset dataspace!\n"); H5Dclose(dset_id); PART_ERROR(H5Dcreate_anon_invalid_dataspace); } @@ -785,7 +781,7 @@ test_create_anonymous_dataset_invalid_params(void) if (dset_id >= 0) { H5_FAILED(); - HDprintf(" created anonymous dataset using an invalid DCPL!\n"); + printf(" created anonymous dataset using an invalid DCPL!\n"); H5Dclose(dset_id); PART_ERROR(H5Dcreate_anon_invalid_dcpl); } @@ -806,7 +802,7 @@ test_create_anonymous_dataset_invalid_params(void) if (dset_id >= 0) { H5_FAILED(); - HDprintf(" created anonymous dataset using an invalid DAPL!\n"); + printf(" created anonymous dataset using an invalid DAPL!\n"); H5Dclose(dset_id); PART_ERROR(H5Dcreate_anon_invalid_dapl); } @@ -868,28 +864,27 @@ test_create_dataset_null_space(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC)) { SKIPPED(); - HDprintf( - " API functions for basic file, group, or dataset aren't supported with this connector\n"); + printf(" API functions for basic file, group, or dataset aren't supported with this connector\n"); return 0; } if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, DATASET_CREATE_NULL_DATASPACE_TEST_SUBGROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container subgroup '%s'\n", - DATASET_CREATE_NULL_DATASPACE_TEST_SUBGROUP_NAME); + printf(" couldn't create container subgroup '%s'\n", + DATASET_CREATE_NULL_DATASPACE_TEST_SUBGROUP_NAME); goto error; } @@ -902,7 +897,7 @@ test_create_dataset_null_space(void) if ((dset_id = H5Dcreate2(group_id, DATASET_CREATE_NULL_DATASPACE_TEST_DSET_NAME, dset_dtype, fspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create dataset '%s'\n", DATASET_CREATE_NULL_DATASPACE_TEST_DSET_NAME); + printf(" couldn't create dataset '%s'\n", DATASET_CREATE_NULL_DATASPACE_TEST_DSET_NAME); goto error; } @@ -911,7 +906,7 @@ test_create_dataset_null_space(void) if ((dset_id = H5Dopen2(group_id, DATASET_CREATE_NULL_DATASPACE_TEST_DSET_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open dataset '%s'\n", DATASET_CREATE_NULL_DATASPACE_TEST_DSET_NAME); + printf(" couldn't open dataset '%s'\n", DATASET_CREATE_NULL_DATASPACE_TEST_DSET_NAME); goto error; } @@ -966,28 +961,27 @@ test_create_dataset_scalar_space(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC)) { SKIPPED(); - HDprintf( - " API functions for basic file, group, or dataset aren't supported with this connector\n"); + printf(" API functions for basic file, group, or dataset aren't supported with this connector\n"); return 0; } if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, DATASET_CREATE_SCALAR_DATASPACE_TEST_SUBGROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container subgroup '%s'\n", - DATASET_CREATE_SCALAR_DATASPACE_TEST_SUBGROUP_NAME); + printf(" couldn't create container subgroup '%s'\n", + DATASET_CREATE_SCALAR_DATASPACE_TEST_SUBGROUP_NAME); goto error; } @@ -1000,7 +994,7 @@ test_create_dataset_scalar_space(void) if ((dset_id = H5Dcreate2(group_id, DATASET_CREATE_SCALAR_DATASPACE_TEST_DSET_NAME, dset_dtype, fspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create dataset '%s'\n", DATASET_CREATE_SCALAR_DATASPACE_TEST_DSET_NAME); + printf(" couldn't create dataset '%s'\n", DATASET_CREATE_SCALAR_DATASPACE_TEST_DSET_NAME); goto error; } @@ -1009,7 +1003,7 @@ test_create_dataset_scalar_space(void) if ((dset_id = H5Dopen2(group_id, DATASET_CREATE_SCALAR_DATASPACE_TEST_DSET_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open dataset '%s'\n", DATASET_CREATE_SCALAR_DATASPACE_TEST_DSET_NAME); + printf(" couldn't open dataset '%s'\n", DATASET_CREATE_SCALAR_DATASPACE_TEST_DSET_NAME); goto error; } @@ -1066,27 +1060,26 @@ test_create_zero_dim_dset(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC)) { SKIPPED(); - HDprintf( - " API functions for basic file, group, or dataset aren't supported with this connector\n"); + printf(" API functions for basic file, group, or dataset aren't supported with this connector\n"); return 0; } if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, DATATYPE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", DATATYPE_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", DATATYPE_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, ZERO_DIM_DSET_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container sub-group '%s'\n", ZERO_DIM_DSET_TEST_GROUP_NAME); + printf(" couldn't create container sub-group '%s'\n", ZERO_DIM_DSET_TEST_GROUP_NAME); goto error; } @@ -1096,27 +1089,27 @@ test_create_zero_dim_dset(void) if ((dset_id = H5Dcreate2(group_id, ZERO_DIM_DSET_TEST_DSET_NAME, H5T_NATIVE_INT, fspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" failed to create 0-sized dataset\n"); + printf(" failed to create 0-sized dataset\n"); goto error; } if (H5Sselect_none(fspace_id) < 0) { H5_FAILED(); - HDprintf(" failed to set none selection in dataset's file dataspace\n"); + printf(" failed to set none selection in dataset's file dataspace\n"); goto error; } /* Attempt to write 0 elements to dataset */ if (H5Dwrite(dset_id, H5T_NATIVE_INT, fspace_id, fspace_id, H5P_DEFAULT, data) < 0) { H5_FAILED(); - HDprintf(" failed to write 0 elements to 0-sized dataset\n"); + printf(" failed to write 0 elements to 0-sized dataset\n"); goto error; } /* Attempt to read 0 elements from dataset */ if (H5Dread(dset_id, H5T_NATIVE_INT, fspace_id, fspace_id, H5P_DEFAULT, data) < 0) { H5_FAILED(); - HDprintf(" failed to read 0 elements from 0-sized dataset\n"); + printf(" failed to read 0 elements from 0-sized dataset\n"); goto error; } @@ -1168,27 +1161,26 @@ test_create_dataset_random_shapes(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC)) { SKIPPED(); - HDprintf( - " API functions for basic file, group, or dataset aren't supported with this connector\n"); + printf(" API functions for basic file, group, or dataset aren't supported with this connector\n"); return 0; } if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group\n"); + printf(" couldn't open container group\n"); goto error; } if ((group_id = H5Gcreate2(container_group, DATASET_SHAPE_TEST_SUBGROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container sub-group\n"); + printf(" couldn't create container sub-group\n"); goto error; } @@ -1201,7 +1193,7 @@ test_create_dataset_random_shapes(void) if ((space_id = generate_random_dataspace(ndims, NULL, NULL, FALSE)) < 0) { H5_FAILED(); - HDprintf(" couldn't create dataspace\n"); + printf(" couldn't create dataspace\n"); goto error; } @@ -1210,7 +1202,7 @@ test_create_dataset_random_shapes(void) if ((dset_id = H5Dcreate2(group_id, name, dset_dtype, space_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create dataset\n"); + printf(" couldn't create dataset\n"); goto error; } @@ -1273,28 +1265,26 @@ test_create_dataset_predefined_types(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC)) { SKIPPED(); - HDprintf( - " API functions for basic file, group, or dataset aren't supported with this connector\n"); + printf(" API functions for basic file, group, or dataset aren't supported with this connector\n"); return 0; } if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, DATASET_PREDEFINED_TYPE_TEST_SUBGROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create sub-container group '%s'\n", - DATASET_PREDEFINED_TYPE_TEST_SUBGROUP_NAME); + printf(" couldn't create sub-container group '%s'\n", DATASET_PREDEFINED_TYPE_TEST_SUBGROUP_NAME); goto error; } @@ -1310,7 +1300,7 @@ test_create_dataset_predefined_types(void) if ((dset_id = H5Dcreate2(group_id, name, predefined_type_test_table[i], fspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create dataset '%s'\n", name); + printf(" couldn't create dataset '%s'\n", name); goto error; } @@ -1321,7 +1311,7 @@ test_create_dataset_predefined_types(void) if ((dset_id = H5Dopen2(group_id, name, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" failed to open dataset '%s'\n", name); + printf(" failed to open dataset '%s'\n", name); goto error; } @@ -1373,8 +1363,7 @@ test_create_dataset_string_types(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC)) { SKIPPED(); - HDprintf( - " API functions for basic file, group, or dataset aren't supported with this connector\n"); + printf(" API functions for basic file, group, or dataset aren't supported with this connector\n"); return 0; } @@ -1382,32 +1371,32 @@ test_create_dataset_string_types(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, DATASET_STRING_TYPE_TEST_SUBGROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container sub-group '%s'\n", DATASET_STRING_TYPE_TEST_SUBGROUP_NAME); + printf(" couldn't create container sub-group '%s'\n", DATASET_STRING_TYPE_TEST_SUBGROUP_NAME); goto error; } if ((type_id_fixed = H5Tcreate(H5T_STRING, DATASET_STRING_TYPE_TEST_STRING_LENGTH)) < 0) { H5_FAILED(); - HDprintf(" couldn't create fixed-length string type\n"); + printf(" couldn't create fixed-length string type\n"); goto error; } if ((type_id_variable = H5Tcreate(H5T_STRING, H5T_VARIABLE)) < 0) { H5_FAILED(); - HDprintf(" couldn't create variable-length string type\n"); + printf(" couldn't create variable-length string type\n"); goto error; } @@ -1425,8 +1414,8 @@ test_create_dataset_string_types(void) if ((dset_id_fixed = H5Dcreate2(group_id, DATASET_STRING_TYPE_TEST_DSET_NAME1, type_id_fixed, fspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create fixed-length string dataset '%s'\n", - DATASET_STRING_TYPE_TEST_DSET_NAME1); + printf(" couldn't create fixed-length string dataset '%s'\n", + DATASET_STRING_TYPE_TEST_DSET_NAME1); PART_ERROR(H5Dcreate_fixed_string_type); } @@ -1441,7 +1430,7 @@ test_create_dataset_string_types(void) if ((dset_id_fixed = H5Dopen2(group_id, DATASET_STRING_TYPE_TEST_DSET_NAME1, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" failed to open dataset '%s'\n", DATASET_STRING_TYPE_TEST_DSET_NAME1); + printf(" failed to open dataset '%s'\n", DATASET_STRING_TYPE_TEST_DSET_NAME1); PART_ERROR(H5Dcreate_fixed_string_type); } @@ -1457,8 +1446,8 @@ test_create_dataset_string_types(void) H5Dcreate2(group_id, DATASET_STRING_TYPE_TEST_DSET_NAME2, type_id_variable, fspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create variable-length string dataset '%s'\n", - DATASET_STRING_TYPE_TEST_DSET_NAME2); + printf(" couldn't create variable-length string dataset '%s'\n", + DATASET_STRING_TYPE_TEST_DSET_NAME2); PART_ERROR(H5Dcreate_variable_string_type); } @@ -1474,7 +1463,7 @@ test_create_dataset_string_types(void) if ((dset_id_variable = H5Dopen2(group_id, DATASET_STRING_TYPE_TEST_DSET_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" failed to open dataset '%s'\n", DATASET_STRING_TYPE_TEST_DSET_NAME2); + printf(" failed to open dataset '%s'\n", DATASET_STRING_TYPE_TEST_DSET_NAME2); PART_ERROR(H5Dcreate_variable_string_type); } @@ -1546,8 +1535,7 @@ test_create_dataset_compound_types(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC)) { SKIPPED(); - HDprintf( - " API functions for basic file, group, or dataset aren't supported with this connector\n"); + printf(" API functions for basic file, group, or dataset aren't supported with this connector\n"); return 0; } @@ -1561,20 +1549,20 @@ test_create_dataset_compound_types(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, DATASET_COMPOUND_TYPE_TEST_SUBGROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container sub-group '%s'\n", DATASET_COMPOUND_TYPE_TEST_SUBGROUP_NAME); + printf(" couldn't create container sub-group '%s'\n", DATASET_COMPOUND_TYPE_TEST_SUBGROUP_NAME); goto error; } @@ -1601,7 +1589,7 @@ test_create_dataset_compound_types(void) if ((compound_type = H5Tcreate(H5T_COMPOUND, 1)) < 0) { H5_FAILED(); - HDprintf(" couldn't create compound datatype\n"); + printf(" couldn't create compound datatype\n"); goto error; } @@ -1614,13 +1602,13 @@ test_create_dataset_compound_types(void) if ((type_pool[j] = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) { H5_FAILED(); - HDprintf(" couldn't create compound datatype member %zu\n", j); + printf(" couldn't create compound datatype member %zu\n", j); goto error; } if (!(member_size = H5Tget_size(type_pool[j]))) { H5_FAILED(); - HDprintf(" couldn't get compound member %zu size\n", j); + printf(" couldn't get compound member %zu size\n", j); goto error; } @@ -1643,7 +1631,7 @@ test_create_dataset_compound_types(void) if ((dset_id = H5Dcreate2(group_id, dset_name, compound_type, fspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create dataset '%s'\n", dset_name); + printf(" couldn't create dataset '%s'\n", dset_name); goto error; } @@ -1652,7 +1640,7 @@ test_create_dataset_compound_types(void) if ((dset_id = H5Dopen2(group_id, dset_name, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" failed to open dataset '%s'\n", dset_name); + printf(" failed to open dataset '%s'\n", dset_name); goto error; } @@ -1717,33 +1705,32 @@ test_create_dataset_enum_types(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC)) { SKIPPED(); - HDprintf( - " API functions for basic file, group, or dataset aren't supported with this connector\n"); + printf(" API functions for basic file, group, or dataset aren't supported with this connector\n"); return 0; } if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, DATASET_ENUM_TYPE_TEST_SUBGROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container sub-group '%s'\n", DATASET_ENUM_TYPE_TEST_SUBGROUP_NAME); + printf(" couldn't create container sub-group '%s'\n", DATASET_ENUM_TYPE_TEST_SUBGROUP_NAME); goto error; } if ((enum_native = H5Tcreate(H5T_ENUM, sizeof(int))) < 0) { H5_FAILED(); - HDprintf(" couldn't create native enum type\n"); + printf(" couldn't create native enum type\n"); goto error; } @@ -1753,7 +1740,7 @@ test_create_dataset_enum_types(void) if ((enum_non_native = H5Tenum_create(H5T_STD_U32LE)) < 0) { H5_FAILED(); - HDprintf(" couldn't create non-native enum type\n"); + printf(" couldn't create non-native enum type\n"); goto error; } @@ -1772,14 +1759,14 @@ test_create_dataset_enum_types(void) if ((dset_id_native = H5Dcreate2(group_id, DATASET_ENUM_TYPE_TEST_DSET_NAME1, enum_native, fspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create native enum dataset '%s'\n", DATASET_ENUM_TYPE_TEST_DSET_NAME1); + printf(" couldn't create native enum dataset '%s'\n", DATASET_ENUM_TYPE_TEST_DSET_NAME1); goto error; } if ((dset_id_non_native = H5Dcreate2(group_id, DATASET_ENUM_TYPE_TEST_DSET_NAME2, enum_non_native, fspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create non-native enum dataset '%s'\n", DATASET_ENUM_TYPE_TEST_DSET_NAME2); + printf(" couldn't create non-native enum dataset '%s'\n", DATASET_ENUM_TYPE_TEST_DSET_NAME2); goto error; } @@ -1790,13 +1777,13 @@ test_create_dataset_enum_types(void) if ((dset_id_native = H5Dopen2(group_id, DATASET_ENUM_TYPE_TEST_DSET_NAME1, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" failed to open dataset '%s'\n", DATASET_ENUM_TYPE_TEST_DSET_NAME1); + printf(" failed to open dataset '%s'\n", DATASET_ENUM_TYPE_TEST_DSET_NAME1); goto error; } if ((dset_id_non_native = H5Dopen2(group_id, DATASET_ENUM_TYPE_TEST_DSET_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" failed to open dataset '%s'\n", DATASET_ENUM_TYPE_TEST_DSET_NAME2); + printf(" failed to open dataset '%s'\n", DATASET_ENUM_TYPE_TEST_DSET_NAME2); goto error; } @@ -1865,27 +1852,26 @@ test_create_dataset_array_types(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC)) { SKIPPED(); - HDprintf( - " API functions for basic file, group, or dataset aren't supported with this connector\n"); + printf(" API functions for basic file, group, or dataset aren't supported with this connector\n"); return 0; } if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, DATASET_ARRAY_TYPE_TEST_SUBGROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container sub-group '%s'\n", DATASET_ARRAY_TYPE_TEST_SUBGROUP_NAME); + printf(" couldn't create container sub-group '%s'\n", DATASET_ARRAY_TYPE_TEST_SUBGROUP_NAME); goto error; } @@ -1899,7 +1885,7 @@ test_create_dataset_array_types(void) if ((array_type_id1 = H5Tarray_create2(array_base_type_id1, DATASET_ARRAY_TYPE_TEST_RANK1, array_dims1)) < 0) { H5_FAILED(); - HDprintf(" couldn't create first array type\n"); + printf(" couldn't create first array type\n"); goto error; } @@ -1912,7 +1898,7 @@ test_create_dataset_array_types(void) if ((array_type_id2 = H5Tarray_create2(array_base_type_id2, DATASET_ARRAY_TYPE_TEST_RANK2, array_dims2)) < 0) { H5_FAILED(); - HDprintf(" couldn't create second array type\n"); + printf(" couldn't create second array type\n"); goto error; } @@ -1926,13 +1912,13 @@ test_create_dataset_array_types(void) if ((nested_type_id = H5Tarray_create2(array_base_type_id3, DATASET_ARRAY_TYPE_TEST_RANK3, array_dims3)) < 0) { H5_FAILED(); - HDprintf(" couldn't create nested array base type\n"); + printf(" couldn't create nested array base type\n"); goto error; } if ((array_type_id3 = H5Tarray_create2(nested_type_id, DATASET_ARRAY_TYPE_TEST_RANK3, array_dims3)) < 0) { H5_FAILED(); - HDprintf(" couldn't create nested array type\n"); + printf(" couldn't create nested array type\n"); goto error; } @@ -1942,21 +1928,21 @@ test_create_dataset_array_types(void) if ((dset_id1 = H5Dcreate2(group_id, DATASET_ARRAY_TYPE_TEST_DSET_NAME1, array_type_id1, fspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create array type dataset '%s'\n", DATASET_ARRAY_TYPE_TEST_DSET_NAME1); + printf(" couldn't create array type dataset '%s'\n", DATASET_ARRAY_TYPE_TEST_DSET_NAME1); goto error; } if ((dset_id2 = H5Dcreate2(group_id, DATASET_ARRAY_TYPE_TEST_DSET_NAME2, array_type_id2, fspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create array type dataset '%s'\n", DATASET_ARRAY_TYPE_TEST_DSET_NAME2); + printf(" couldn't create array type dataset '%s'\n", DATASET_ARRAY_TYPE_TEST_DSET_NAME2); goto error; } if ((dset_id3 = H5Dcreate2(group_id, DATASET_ARRAY_TYPE_TEST_DSET_NAME3, array_type_id3, fspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create nested array type dataset '%s'\n", DATASET_ARRAY_TYPE_TEST_DSET_NAME3); + printf(" couldn't create nested array type dataset '%s'\n", DATASET_ARRAY_TYPE_TEST_DSET_NAME3); goto error; } @@ -1969,19 +1955,19 @@ test_create_dataset_array_types(void) if ((dset_id1 = H5Dopen2(group_id, DATASET_ARRAY_TYPE_TEST_DSET_NAME1, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" failed to open dataset '%s'\n", DATASET_ARRAY_TYPE_TEST_DSET_NAME1); + printf(" failed to open dataset '%s'\n", DATASET_ARRAY_TYPE_TEST_DSET_NAME1); goto error; } if ((dset_id2 = H5Dopen2(group_id, DATASET_ARRAY_TYPE_TEST_DSET_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" failed to open dataset '%s'\n", DATASET_ARRAY_TYPE_TEST_DSET_NAME2); + printf(" failed to open dataset '%s'\n", DATASET_ARRAY_TYPE_TEST_DSET_NAME2); goto error; } if ((dset_id3 = H5Dopen2(group_id, DATASET_ARRAY_TYPE_TEST_DSET_NAME3, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" failed to open dataset '%s'\n", DATASET_ARRAY_TYPE_TEST_DSET_NAME3); + printf(" failed to open dataset '%s'\n", DATASET_ARRAY_TYPE_TEST_DSET_NAME3); goto error; } @@ -2063,8 +2049,8 @@ test_create_dataset_creation_properties(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC)) { SKIPPED(); - HDprintf(" API functions for basic file, group, or dataset " - "aren't supported with this connector\n"); + printf(" API functions for basic file, group, or dataset " + "aren't supported with this connector\n"); return 0; } @@ -2072,20 +2058,20 @@ test_create_dataset_creation_properties(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, DATASET_CREATION_PROPERTIES_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create group '%s'\n", DATASET_CREATION_PROPERTIES_TEST_GROUP_NAME); + printf(" couldn't create group '%s'\n", DATASET_CREATION_PROPERTIES_TEST_GROUP_NAME); goto error; } @@ -2119,7 +2105,7 @@ test_create_dataset_creation_properties(void) if ((dcpl_id = H5Pcreate(H5P_DATASET_CREATE)) < 0) { H5_FAILED(); - HDprintf(" couldn't create DCPL\n"); + printf(" couldn't create DCPL\n"); PART_ERROR(DCPL_alloc_time_test); } @@ -2128,7 +2114,7 @@ test_create_dataset_creation_properties(void) if (H5Pset_alloc_time(dcpl_id, alloc_times[i]) < 0) { H5_FAILED(); - HDprintf(" couldn't set alloc time property value\n"); + printf(" couldn't set alloc time property value\n"); PART_ERROR(DCPL_alloc_time_test); } @@ -2137,7 +2123,7 @@ test_create_dataset_creation_properties(void) if ((dset_id = H5Dcreate2(group_id, name, dset_dtype, fspace_id, H5P_DEFAULT, dcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create dataset '%s'\n", name); + printf(" couldn't create dataset '%s'\n", name); PART_ERROR(DCPL_alloc_time_test); } @@ -2152,7 +2138,7 @@ test_create_dataset_creation_properties(void) if ((dset_id = H5Dopen2(group_id, name, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open dataset '%s'\n", name); + printf(" couldn't open dataset '%s'\n", name); PART_ERROR(DCPL_alloc_time_test); } @@ -2189,13 +2175,13 @@ test_create_dataset_creation_properties(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" creation order tracking is not supported by this VOL connector\n"); + printf(" creation order tracking is not supported by this VOL connector\n"); PART_EMPTY(DCPL_attr_crt_order_test); } if ((dcpl_id = H5Pcreate(H5P_DATASET_CREATE)) < 0) { H5_FAILED(); - HDprintf(" couldn't create DCPL\n"); + printf(" couldn't create DCPL\n"); PART_ERROR(DCPL_attr_crt_order_test); } @@ -2204,7 +2190,7 @@ test_create_dataset_creation_properties(void) if (H5Pset_attr_creation_order(dcpl_id, creation_orders[i]) < 0) { H5_FAILED(); - HDprintf(" couldn't set attribute creation order property\n"); + printf(" couldn't set attribute creation order property\n"); PART_ERROR(DCPL_attr_crt_order_test); } @@ -2213,7 +2199,7 @@ test_create_dataset_creation_properties(void) if ((dset_id = H5Dcreate2(group_id, name, dset_dtype, fspace_id, H5P_DEFAULT, dcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create dataset '%s'\n", name); + printf(" couldn't create dataset '%s'\n", name); PART_ERROR(DCPL_attr_crt_order_test); } @@ -2228,7 +2214,7 @@ test_create_dataset_creation_properties(void) if ((dset_id = H5Dopen2(group_id, name, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open dataset '%s'\n", name); + printf(" couldn't open dataset '%s'\n", name); PART_ERROR(DCPL_attr_crt_order_test); } @@ -2262,22 +2248,22 @@ test_create_dataset_creation_properties(void) if ((dcpl_id = H5Pcreate(H5P_DATASET_CREATE)) < 0) { H5_FAILED(); - HDprintf(" couldn't create DCPL\n"); + printf(" couldn't create DCPL\n"); PART_ERROR(DCPL_attr_phase_change_test); } if (H5Pset_attr_phase_change(dcpl_id, DATASET_CREATION_PROPERTIES_TEST_MAX_COMPACT, DATASET_CREATION_PROPERTIES_TEST_MIN_DENSE) < 0) { H5_FAILED(); - HDprintf(" couldn't set attribute phase change property\n"); + printf(" couldn't set attribute phase change property\n"); PART_ERROR(DCPL_attr_phase_change_test); } if ((dset_id = H5Dcreate2(group_id, DATASET_CREATION_PROPERTIES_TEST_PHASE_CHANGE_DSET_NAME, dset_dtype, fspace_id, H5P_DEFAULT, dcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create dataset '%s'\n", - DATASET_CREATION_PROPERTIES_TEST_PHASE_CHANGE_DSET_NAME); + printf(" couldn't create dataset '%s'\n", + DATASET_CREATION_PROPERTIES_TEST_PHASE_CHANGE_DSET_NAME); PART_ERROR(DCPL_attr_phase_change_test); } @@ -2293,8 +2279,8 @@ test_create_dataset_creation_properties(void) if ((dset_id = H5Dopen2(group_id, DATASET_CREATION_PROPERTIES_TEST_PHASE_CHANGE_DSET_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open dataset '%s'\n", - DATASET_CREATION_PROPERTIES_TEST_PHASE_CHANGE_DSET_NAME); + printf(" couldn't open dataset '%s'\n", + DATASET_CREATION_PROPERTIES_TEST_PHASE_CHANGE_DSET_NAME); PART_ERROR(DCPL_attr_phase_change_test); } @@ -2328,7 +2314,7 @@ test_create_dataset_creation_properties(void) if ((dcpl_id = H5Pcreate(H5P_DATASET_CREATE)) < 0) { H5_FAILED(); - HDprintf(" couldn't create DCPL\n"); + printf(" couldn't create DCPL\n"); PART_ERROR(DCPL_fill_time_property_test); } @@ -2337,7 +2323,7 @@ test_create_dataset_creation_properties(void) if (H5Pset_fill_time(dcpl_id, fill_times[i]) < 0) { H5_FAILED(); - HDprintf(" couldn't set dataset fill time property\n"); + printf(" couldn't set dataset fill time property\n"); PART_ERROR(DCPL_fill_time_property_test); } @@ -2346,7 +2332,7 @@ test_create_dataset_creation_properties(void) if ((dset_id = H5Dcreate2(group_id, name, dset_dtype, fspace_id, H5P_DEFAULT, dcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create dataset '%s'\n", name); + printf(" couldn't create dataset '%s'\n", name); PART_ERROR(DCPL_fill_time_property_test); } @@ -2361,7 +2347,7 @@ test_create_dataset_creation_properties(void) if ((dset_id = H5Dopen2(group_id, name, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open dataset '%s'\n", name); + printf(" couldn't open dataset '%s'\n", name); PART_ERROR(DCPL_fill_time_property_test); } @@ -2397,46 +2383,46 @@ test_create_dataset_creation_properties(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILTERS)) { SKIPPED(); - HDprintf(" dataset filters are not supported by this VOL connector\n"); + printf(" dataset filters are not supported by this VOL connector\n"); PART_EMPTY(DCPL_filters_test); } if ((dcpl_id = H5Pcreate(H5P_DATASET_CREATE)) < 0) { H5_FAILED(); - HDprintf(" couldn't create DCPL\n"); + printf(" couldn't create DCPL\n"); PART_ERROR(DCPL_filters_test); } if (H5Pset_chunk(dcpl_id, DATASET_CREATION_PROPERTIES_TEST_SHAPE_RANK, chunk_dims) < 0) { H5_FAILED(); - HDprintf(" couldn't set chunking on DCPL\n"); + printf(" couldn't set chunking on DCPL\n"); PART_ERROR(DCPL_filters_test); } /* Set all of the available filters on the DCPL */ if (H5Pset_deflate(dcpl_id, 7) < 0) { H5_FAILED(); - HDprintf(" couldn't set deflate filter on DCPL\n"); + printf(" couldn't set deflate filter on DCPL\n"); PART_ERROR(DCPL_filters_test); } if (H5Pset_shuffle(dcpl_id) < 0) { H5_FAILED(); - HDprintf(" couldn't set shuffle filter on DCPL\n"); + printf(" couldn't set shuffle filter on DCPL\n"); PART_ERROR(DCPL_filters_test); } if (H5Pset_fletcher32(dcpl_id) < 0) { H5_FAILED(); - HDprintf(" couldn't set fletcher32 filter on DCPL\n"); + printf(" couldn't set fletcher32 filter on DCPL\n"); PART_ERROR(DCPL_filters_test); } if (H5Pset_nbit(dcpl_id) < 0) { H5_FAILED(); - HDprintf(" couldn't set nbit filter on DCPL\n"); + printf(" couldn't set nbit filter on DCPL\n"); PART_ERROR(DCPL_filters_test); } if (H5Pset_scaleoffset(dcpl_id, H5Z_SO_FLOAT_ESCALE, 2) < 0) { H5_FAILED(); - HDprintf(" couldn't set scaleoffset filter on DCPL\n"); + printf(" couldn't set scaleoffset filter on DCPL\n"); PART_ERROR(DCPL_filters_test); } @@ -2446,8 +2432,8 @@ test_create_dataset_creation_properties(void) if ((dset_id = H5Dcreate2(group_id, DATASET_CREATION_PROPERTIES_TEST_FILTERS_DSET_NAME, H5T_NATIVE_INT, fspace_id, H5P_DEFAULT, dcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create dataset '%s'\n", - DATASET_CREATION_PROPERTIES_TEST_FILTERS_DSET_NAME); + printf(" couldn't create dataset '%s'\n", + DATASET_CREATION_PROPERTIES_TEST_FILTERS_DSET_NAME); PART_ERROR(DCPL_filters_test); } @@ -2463,8 +2449,8 @@ test_create_dataset_creation_properties(void) if ((dset_id = H5Dopen2(group_id, DATASET_CREATION_PROPERTIES_TEST_FILTERS_DSET_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open dataset '%s'\n", - DATASET_CREATION_PROPERTIES_TEST_FILTERS_DSET_NAME); + printf(" couldn't open dataset '%s'\n", + DATASET_CREATION_PROPERTIES_TEST_FILTERS_DSET_NAME); PART_ERROR(DCPL_filters_test); } @@ -2499,7 +2485,7 @@ test_create_dataset_creation_properties(void) if ((dcpl_id = H5Pcreate(H5P_DATASET_CREATE)) < 0) { H5_FAILED(); - HDprintf(" couldn't create DCPL\n"); + printf(" couldn't create DCPL\n"); PART_ERROR(DCPL_storage_layout_test); } @@ -2508,7 +2494,7 @@ test_create_dataset_creation_properties(void) if (H5Pset_layout(dcpl_id, layouts[i]) < 0) { H5_FAILED(); - HDprintf(" couldn't set storage layout property\n"); + printf(" couldn't set storage layout property\n"); PART_ERROR(DCPL_storage_layout_test); } @@ -2522,7 +2508,7 @@ test_create_dataset_creation_properties(void) if (H5Pset_chunk(dcpl_id, DATASET_CREATION_PROPERTIES_TEST_CHUNK_DIM_RANK, local_chunk_dims) < 0) { H5_FAILED(); - HDprintf(" couldn't set chunk dimensionality\n"); + printf(" couldn't set chunk dimensionality\n"); PART_ERROR(DCPL_storage_layout_test); } } @@ -2534,7 +2520,7 @@ test_create_dataset_creation_properties(void) (H5D_COMPACT == layouts[i]) ? compact_fspace_id : fspace_id, H5P_DEFAULT, dcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create dataset '%s'\n", name); + printf(" couldn't create dataset '%s'\n", name); PART_ERROR(DCPL_storage_layout_test); } @@ -2549,7 +2535,7 @@ test_create_dataset_creation_properties(void) if ((dset_id = H5Dopen2(group_id, name, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open dataset '%s'\n", name); + printf(" couldn't open dataset '%s'\n", name); PART_ERROR(DCPL_storage_layout_test); } @@ -2583,27 +2569,27 @@ test_create_dataset_creation_properties(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_TRACK_TIMES)) { SKIPPED(); - HDprintf(" object time tracking is not supported by this VOL connector\n"); + printf(" object time tracking is not supported by this VOL connector\n"); PART_EMPTY(DCPL_track_obj_times_test); } if ((dcpl_id = H5Pcreate(H5P_DATASET_CREATE)) < 0) { H5_FAILED(); - HDprintf(" couldn't create DCPL\n"); + printf(" couldn't create DCPL\n"); PART_ERROR(DCPL_track_obj_times_test); } if (H5Pset_obj_track_times(dcpl_id, true) < 0) { H5_FAILED(); - HDprintf(" couldn't set object time tracking property\n"); + printf(" couldn't set object time tracking property\n"); PART_ERROR(DCPL_track_obj_times_test); } if ((dset_id = H5Dcreate2(group_id, DATASET_CREATION_PROPERTIES_TEST_TRACK_TIMES_YES_DSET_NAME, dset_dtype, fspace_id, H5P_DEFAULT, dcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create dataset '%s'\n", - DATASET_CREATION_PROPERTIES_TEST_TRACK_TIMES_YES_DSET_NAME); + printf(" couldn't create dataset '%s'\n", + DATASET_CREATION_PROPERTIES_TEST_TRACK_TIMES_YES_DSET_NAME); PART_ERROR(DCPL_track_obj_times_test); } @@ -2619,8 +2605,8 @@ test_create_dataset_creation_properties(void) if ((dset_id = H5Dopen2(group_id, DATASET_CREATION_PROPERTIES_TEST_TRACK_TIMES_YES_DSET_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open dataset '%s'\n", - DATASET_CREATION_PROPERTIES_TEST_TRACK_TIMES_YES_DSET_NAME); + printf(" couldn't open dataset '%s'\n", + DATASET_CREATION_PROPERTIES_TEST_TRACK_TIMES_YES_DSET_NAME); PART_ERROR(DCPL_track_obj_times_test); } @@ -2635,15 +2621,15 @@ test_create_dataset_creation_properties(void) if (H5Pset_obj_track_times(dcpl_id, false) < 0) { H5_FAILED(); - HDprintf(" couldn't set object time tracking property\n"); + printf(" couldn't set object time tracking property\n"); PART_ERROR(DCPL_track_obj_times_test); } if ((dset_id = H5Dcreate2(group_id, DATASET_CREATION_PROPERTIES_TEST_TRACK_TIMES_NO_DSET_NAME, dset_dtype, fspace_id, H5P_DEFAULT, dcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create dataset '%s'\n", - DATASET_CREATION_PROPERTIES_TEST_TRACK_TIMES_NO_DSET_NAME); + printf(" couldn't create dataset '%s'\n", + DATASET_CREATION_PROPERTIES_TEST_TRACK_TIMES_NO_DSET_NAME); PART_ERROR(DCPL_track_obj_times_test); } @@ -2659,8 +2645,8 @@ test_create_dataset_creation_properties(void) if ((dset_id = H5Dopen2(group_id, DATASET_CREATION_PROPERTIES_TEST_TRACK_TIMES_NO_DSET_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open dataset '%s'\n", - DATASET_CREATION_PROPERTIES_TEST_TRACK_TIMES_NO_DSET_NAME); + printf(" couldn't open dataset '%s'\n", + DATASET_CREATION_PROPERTIES_TEST_TRACK_TIMES_NO_DSET_NAME); PART_ERROR(DCPL_track_obj_times_test); } @@ -2746,58 +2732,57 @@ test_create_many_dataset(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC)) { SKIPPED(); - HDprintf( - " API functions for basic file, group, or dataset aren't supported with this connector\n"); + printf(" API functions for basic file, group, or dataset aren't supported with this connector\n"); return 0; } if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open group '%s'\n", DATASET_TEST_GROUP_NAME); + printf(" couldn't open group '%s'\n", DATASET_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, DATASET_MANY_CREATE_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container group '%s'\n", DATASET_MANY_CREATE_GROUP_NAME); + printf(" couldn't create container group '%s'\n", DATASET_MANY_CREATE_GROUP_NAME); goto error; } if ((dataspace_id = H5Screate(H5S_SCALAR)) < 0) { H5_FAILED(); - HDprintf(" couldn't create scalar data space\n"); + printf(" couldn't create scalar data space\n"); goto error; } - HDprintf("\n"); + printf("\n"); for (i = 0; i < DATASET_NUMB; i++) { - HDprintf("\r %u/%u", i + 1, DATASET_NUMB); + printf("\r %u/%u", i + 1, DATASET_NUMB); sprintf(dset_name, "dset_%02u", i); data = i % 256; if ((dset_id = H5Dcreate2(group_id, dset_name, H5T_NATIVE_UCHAR, dataspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create dataset '%s'\n", dset_name); + printf(" couldn't create dataset '%s'\n", dset_name); goto error; } if (H5Dwrite(dset_id, H5T_NATIVE_UCHAR, H5S_ALL, H5S_ALL, H5P_DEFAULT, &data) < 0) { H5_FAILED(); - HDprintf(" couldn't write to dataset '%s'\n", dset_name); + printf(" couldn't write to dataset '%s'\n", dset_name); goto error; } if (H5Dclose(dset_id) < 0) { H5_FAILED(); - HDprintf(" couldn't close dataset '%s'\n", dset_name); + printf(" couldn't close dataset '%s'\n", dset_name); goto error; } } @@ -2862,8 +2847,7 @@ test_open_dataset_invalid_params(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC)) { SKIPPED(); - HDprintf( - " API functions for basic file, group, or dataset aren't supported with this connector\n"); + printf(" API functions for basic file, group, or dataset aren't supported with this connector\n"); return 0; } @@ -2871,20 +2855,20 @@ test_open_dataset_invalid_params(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open group '%s'\n", DATASET_TEST_GROUP_NAME); + printf(" couldn't open group '%s'\n", DATASET_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, DATASET_OPEN_INVALID_PARAMS_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container group '%s'\n", DATASET_OPEN_INVALID_PARAMS_GROUP_NAME); + printf(" couldn't create container group '%s'\n", DATASET_OPEN_INVALID_PARAMS_GROUP_NAME); goto error; } @@ -2898,7 +2882,7 @@ test_open_dataset_invalid_params(void) if ((dset_id = H5Dcreate2(group_id, DATASET_OPEN_INVALID_PARAMS_DSET_NAME, dset_dtype, fspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create dataset '%s'\n", DATASET_OPEN_INVALID_PARAMS_DSET_NAME); + printf(" couldn't create dataset '%s'\n", DATASET_OPEN_INVALID_PARAMS_DSET_NAME); goto error; } @@ -2921,7 +2905,7 @@ test_open_dataset_invalid_params(void) if (dset_id >= 0) { H5_FAILED(); - HDprintf(" opened dataset using H5Dopen2 with an invalid loc_id!\n"); + printf(" opened dataset using H5Dopen2 with an invalid loc_id!\n"); H5Dclose(dset_id); PART_ERROR(H5Dopen_invalid_loc_id); } @@ -2942,7 +2926,7 @@ test_open_dataset_invalid_params(void) if (dset_id >= 0) { H5_FAILED(); - HDprintf(" opened dataset using H5Dopen2 with a NULL dataset name!\n"); + printf(" opened dataset using H5Dopen2 with a NULL dataset name!\n"); H5Dclose(dset_id); PART_ERROR(H5Dopen_invalid_dataset_name); } @@ -2955,7 +2939,7 @@ test_open_dataset_invalid_params(void) if (dset_id >= 0) { H5_FAILED(); - HDprintf(" opened dataset using H5Dopen2 with an invalid dataset name of ''!\n"); + printf(" opened dataset using H5Dopen2 with an invalid dataset name of ''!\n"); H5Dclose(dset_id); PART_ERROR(H5Dopen_invalid_dataset_name); } @@ -2976,7 +2960,7 @@ test_open_dataset_invalid_params(void) if (dset_id >= 0) { H5_FAILED(); - HDprintf(" opened dataset using H5Dopen2 with an invalid DAPL!\n"); + printf(" opened dataset using H5Dopen2 with an invalid DAPL!\n"); H5Dclose(dset_id); PART_ERROR(H5Dopen_invalid_dapl); } @@ -3034,13 +3018,13 @@ test_close_dataset_invalid_params(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC)) { SKIPPED(); - HDprintf(" API functions for basic file or dataset aren't supported with this connector\n"); + printf(" API functions for basic file or dataset aren't supported with this connector\n"); return 0; } if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } @@ -3052,7 +3036,7 @@ test_close_dataset_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Dclose succeeded with an invalid dataset ID!\n"); + printf(" H5Dclose succeeded with an invalid dataset ID!\n"); goto error; } @@ -3098,8 +3082,7 @@ test_get_dataset_space_and_type(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_MORE)) { SKIPPED(); - HDprintf( - " API functions for basic file, group, or dataset aren't supported with this connector\n"); + printf(" API functions for basic file, group, or dataset aren't supported with this connector\n"); return 0; } @@ -3107,20 +3090,20 @@ test_get_dataset_space_and_type(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, DATASET_GET_SPACE_TYPE_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container group '%s'\n", DATASET_GET_SPACE_TYPE_TEST_GROUP_NAME); + printf(" couldn't create container group '%s'\n", DATASET_GET_SPACE_TYPE_TEST_GROUP_NAME); goto error; } @@ -3134,7 +3117,7 @@ test_get_dataset_space_and_type(void) if ((dset_id = H5Dcreate2(group_id, DATASET_GET_SPACE_TYPE_TEST_DSET_NAME, dset_dtype, dset_space_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create dataset '%s'\n", DATASET_GET_SPACE_TYPE_TEST_DSET_NAME); + printf(" couldn't create dataset '%s'\n", DATASET_GET_SPACE_TYPE_TEST_DSET_NAME); goto error; } @@ -3149,7 +3132,7 @@ test_get_dataset_space_and_type(void) if ((tmp_type_id = H5Dget_type(dset_id)) < 0) { H5_FAILED(); - HDprintf(" couldn't retrieve dataset's datatype\n"); + printf(" couldn't retrieve dataset's datatype\n"); PART_ERROR(H5Dget_type); } @@ -3158,13 +3141,13 @@ test_get_dataset_space_and_type(void) if (types_equal < 0) { H5_FAILED(); - HDprintf(" datatype was invalid\n"); + printf(" datatype was invalid\n"); PART_ERROR(H5Dget_type); } if (!types_equal) { H5_FAILED(); - HDprintf(" dataset's datatype did not match\n"); + printf(" dataset's datatype did not match\n"); PART_ERROR(H5Dget_type); } } @@ -3179,7 +3162,7 @@ test_get_dataset_space_and_type(void) if ((tmp_space_id = H5Dget_space(dset_id)) < 0) { H5_FAILED(); - HDprintf(" couldn't retrieve dataset's dataspace\n"); + printf(" couldn't retrieve dataset's dataspace\n"); PART_ERROR(H5Dget_space); } @@ -3188,14 +3171,14 @@ test_get_dataset_space_and_type(void) if (H5Sget_simple_extent_dims(tmp_space_id, space_dims, NULL) < 0) { H5_FAILED(); - HDprintf(" couldn't retrieve dataspace dimensions\n"); + printf(" couldn't retrieve dataspace dimensions\n"); PART_ERROR(H5Dget_space); } for (i = 0; i < DATASET_GET_SPACE_TYPE_TEST_SPACE_RANK; i++) if (space_dims[i] != dset_dims[i]) { H5_FAILED(); - HDprintf(" dataset's dataspace dims didn't match\n"); + printf(" dataset's dataspace dims didn't match\n"); PART_ERROR(H5Dget_space); } } @@ -3238,13 +3221,13 @@ test_get_dataset_space_and_type(void) if ((dset_id = H5Dopen2(group_id, DATASET_GET_SPACE_TYPE_TEST_DSET_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open dataset '%s'\n", DATASET_GET_SPACE_TYPE_TEST_DSET_NAME); + printf(" couldn't open dataset '%s'\n", DATASET_GET_SPACE_TYPE_TEST_DSET_NAME); PART_ERROR(H5Dget_type_reopened); } if ((tmp_type_id = H5Dget_type(dset_id)) < 0) { H5_FAILED(); - HDprintf(" couldn't retrieve dataset's datatype\n"); + printf(" couldn't retrieve dataset's datatype\n"); PART_ERROR(H5Dget_type_reopened); } @@ -3253,13 +3236,13 @@ test_get_dataset_space_and_type(void) if (types_equal < 0) { H5_FAILED(); - HDprintf(" datatype was invalid\n"); + printf(" datatype was invalid\n"); PART_ERROR(H5Dget_type_reopened); } if (!types_equal) { H5_FAILED(); - HDprintf(" dataset's datatype did not match\n"); + printf(" dataset's datatype did not match\n"); PART_ERROR(H5Dget_type_reopened); } } @@ -3283,13 +3266,13 @@ test_get_dataset_space_and_type(void) if ((dset_id = H5Dopen2(group_id, DATASET_GET_SPACE_TYPE_TEST_DSET_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open dataset '%s'\n", DATASET_GET_SPACE_TYPE_TEST_DSET_NAME); + printf(" couldn't open dataset '%s'\n", DATASET_GET_SPACE_TYPE_TEST_DSET_NAME); PART_ERROR(H5Dget_space_reopened); } if ((tmp_space_id = H5Dget_space(dset_id)) < 0) { H5_FAILED(); - HDprintf(" couldn't retrieve dataset's dataspace\n"); + printf(" couldn't retrieve dataset's dataspace\n"); PART_ERROR(H5Dget_space_reopened); } @@ -3298,14 +3281,14 @@ test_get_dataset_space_and_type(void) if (H5Sget_simple_extent_dims(tmp_space_id, space_dims, NULL) < 0) { H5_FAILED(); - HDprintf(" couldn't retrieve dataspace dimensions\n"); + printf(" couldn't retrieve dataspace dimensions\n"); PART_ERROR(H5Dget_space_reopened); } for (i = 0; i < DATASET_GET_SPACE_TYPE_TEST_SPACE_RANK; i++) { if (space_dims[i] != dset_dims[i]) { H5_FAILED(); - HDprintf(" dataset's dataspace dims didn't match!\n"); + printf(" dataset's dataspace dims didn't match!\n"); PART_ERROR(H5Dget_space_reopened); } } @@ -3387,8 +3370,7 @@ test_get_dataset_space_and_type_invalid_params(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_MORE)) { SKIPPED(); - HDprintf( - " API functions for basic file, group, or dataset aren't supported with this connector\n"); + printf(" API functions for basic file, group, or dataset aren't supported with this connector\n"); return 0; } @@ -3396,21 +3378,21 @@ test_get_dataset_space_and_type_invalid_params(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, ATTRIBUTE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", ATTRIBUTE_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", ATTRIBUTE_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, DATASET_GET_SPACE_TYPE_INVALID_PARAMS_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container group '%s'\n", - DATASET_GET_SPACE_TYPE_INVALID_PARAMS_TEST_GROUP_NAME); + printf(" couldn't create container group '%s'\n", + DATASET_GET_SPACE_TYPE_INVALID_PARAMS_TEST_GROUP_NAME); goto error; } @@ -3424,7 +3406,7 @@ test_get_dataset_space_and_type_invalid_params(void) if ((dset_id = H5Dcreate2(group_id, DATASET_GET_SPACE_TYPE_INVALID_PARAMS_TEST_DSET_NAME, dset_dtype, dset_space_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create dataset '%s'\n", DATASET_GET_SPACE_TYPE_INVALID_PARAMS_TEST_DSET_NAME); + printf(" couldn't create dataset '%s'\n", DATASET_GET_SPACE_TYPE_INVALID_PARAMS_TEST_DSET_NAME); goto error; } @@ -3444,7 +3426,7 @@ test_get_dataset_space_and_type_invalid_params(void) if (tmp_type_id >= 0) { H5_FAILED(); - HDprintf(" retrieved copy of dataset's datatype using an invalid dataset ID!\n"); + printf(" retrieved copy of dataset's datatype using an invalid dataset ID!\n"); PART_ERROR(H5Dget_type_invalid_dset_id); } @@ -3464,7 +3446,7 @@ test_get_dataset_space_and_type_invalid_params(void) if (tmp_space_id >= 0) { H5_FAILED(); - HDprintf(" retrieved copy of dataset's dataspace using an invalid dataset ID!\n"); + printf(" retrieved copy of dataset's dataspace using an invalid dataset ID!\n"); PART_ERROR(H5Dget_space_invalid_dset_id); } @@ -3571,8 +3553,8 @@ test_dataset_property_lists(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GET_PLIST)) { SKIPPED(); - HDprintf(" API functions for basic file, group, dataset, or get property list aren't supported " - "with this connector\n"); + printf(" API functions for basic file, group, dataset, or get property list aren't supported " + "with this connector\n"); return 0; } @@ -3580,27 +3562,27 @@ test_dataset_property_lists(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } /** for DAOS VOL, this test is problematic since auto chunking can be selected, so skip for now */ if (H5VLget_connector_name(file_id, vol_name, 5) < 0) { H5_FAILED(); - HDprintf(" couldn't get VOL connector name\n"); + printf(" couldn't get VOL connector name\n"); goto error; } if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, DATASET_PROPERTY_LIST_TEST_SUBGROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container sub-group '%s'\n", DATASET_PROPERTY_LIST_TEST_SUBGROUP_NAME); + printf(" couldn't create container sub-group '%s'\n", DATASET_PROPERTY_LIST_TEST_SUBGROUP_NAME); goto error; } @@ -3621,27 +3603,27 @@ test_dataset_property_lists(void) if ((dcpl_id1 = H5Pcreate(H5P_DATASET_CREATE)) < 0) { H5_FAILED(); - HDprintf(" couldn't create DCPL\n"); + printf(" couldn't create DCPL\n"); goto error; } if (H5Pset_chunk(dcpl_id1, DATASET_PROPERTY_LIST_TEST_SPACE_RANK, chunk_dims) < 0) { H5_FAILED(); - HDprintf(" couldn't set DCPL property\n"); + printf(" couldn't set DCPL property\n"); goto error; } if ((dset_id1 = H5Dcreate2(group_id, DATASET_PROPERTY_LIST_TEST_DSET_NAME1, dset_dtype1, space_id, H5P_DEFAULT, dcpl_id1, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create dataset '%s'\n", DATASET_PROPERTY_LIST_TEST_DSET_NAME1); + printf(" couldn't create dataset '%s'\n", DATASET_PROPERTY_LIST_TEST_DSET_NAME1); goto error; } if ((dset_id2 = H5Dcreate2(group_id, DATASET_PROPERTY_LIST_TEST_DSET_NAME2, dset_dtype2, space_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create dataset '%s'\n", DATASET_PROPERTY_LIST_TEST_DSET_NAME2); + printf(" couldn't create dataset '%s'\n", DATASET_PROPERTY_LIST_TEST_DSET_NAME2); goto error; } @@ -3660,13 +3642,13 @@ test_dataset_property_lists(void) * does not */ if ((dcpl_id1 = H5Dget_create_plist(dset_id1)) < 0) { H5_FAILED(); - HDprintf(" couldn't get property list\n"); + printf(" couldn't get property list\n"); PART_ERROR(H5Dget_create_plist); } if ((dcpl_id2 = H5Dget_create_plist(dset_id2)) < 0) { H5_FAILED(); - HDprintf(" couldn't get property list\n"); + printf(" couldn't get property list\n"); PART_ERROR(H5Dget_create_plist); } @@ -3674,18 +3656,18 @@ test_dataset_property_lists(void) { hsize_t tmp_chunk_dims[DATASET_PROPERTY_LIST_TEST_SPACE_RANK]; - HDmemset(tmp_chunk_dims, 0, sizeof(tmp_chunk_dims)); + memset(tmp_chunk_dims, 0, sizeof(tmp_chunk_dims)); if (H5Pget_chunk(dcpl_id1, DATASET_PROPERTY_LIST_TEST_SPACE_RANK, tmp_chunk_dims) < 0) { H5_FAILED(); - HDprintf(" couldn't get DCPL property value\n"); + printf(" couldn't get DCPL property value\n"); PART_ERROR(H5Dget_create_plist); } for (i = 0; i < DATASET_PROPERTY_LIST_TEST_SPACE_RANK; i++) if (tmp_chunk_dims[i] != chunk_dims[i]) { H5_FAILED(); - HDprintf(" DCPL property values were incorrect\n"); + printf(" DCPL property values were incorrect\n"); PART_ERROR(H5Dget_create_plist); } @@ -3698,8 +3680,8 @@ test_dataset_property_lists(void) /* DAOS VOL can auto chunk, so don't fail */ if (err_ret >= 0 && strcmp(vol_name, "daos") != 0) { H5_FAILED(); - HDprintf(" property list 2 shouldn't have had chunk dimensionality set (not a chunked " - "layout)\n"); + printf(" property list 2 shouldn't have had chunk dimensionality set (not a chunked " + "layout)\n"); PART_ERROR(H5Dget_create_plist); } } @@ -3714,27 +3696,27 @@ test_dataset_property_lists(void) if ((dapl_id1 = H5Pcreate(H5P_DATASET_ACCESS)) < 0) { H5_FAILED(); - HDprintf(" couldn't create DAPL\n"); + printf(" couldn't create DAPL\n"); PART_ERROR(H5Dget_access_plist); } if (H5Pset_efile_prefix(dapl_id1, path_prefix) < 0) { H5_FAILED(); - HDprintf(" couldn't set DAPL property\n"); + printf(" couldn't set DAPL property\n"); PART_ERROR(H5Dget_access_plist); } if ((dset_id3 = H5Dcreate2(group_id, DATASET_PROPERTY_LIST_TEST_DSET_NAME3, dset_dtype3, space_id, H5P_DEFAULT, H5P_DEFAULT, dapl_id1)) < 0) { H5_FAILED(); - HDprintf(" couldn't create dataset\n"); + printf(" couldn't create dataset\n"); PART_ERROR(H5Dget_access_plist); } if ((dset_id4 = H5Dcreate2(group_id, DATASET_PROPERTY_LIST_TEST_DSET_NAME4, dset_dtype4, space_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create dataset\n"); + printf(" couldn't create dataset\n"); PART_ERROR(H5Dget_access_plist); } @@ -3751,13 +3733,13 @@ test_dataset_property_lists(void) * does not */ if ((dapl_id1 = H5Dget_access_plist(dset_id3)) < 0) { H5_FAILED(); - HDprintf(" couldn't get property list\n"); + printf(" couldn't get property list\n"); PART_ERROR(H5Dget_access_plist); } if ((dapl_id2 = H5Dget_access_plist(dset_id4)) < 0) { H5_FAILED(); - HDprintf(" couldn't get property list\n"); + printf(" couldn't get property list\n"); PART_ERROR(H5Dget_access_plist); } @@ -3767,39 +3749,39 @@ test_dataset_property_lists(void) if ((buf_size = H5Pget_efile_prefix(dapl_id1, NULL, 0)) < 0) { H5_FAILED(); - HDprintf(" couldn't retrieve size for property value buffer\n"); + printf(" couldn't retrieve size for property value buffer\n"); PART_ERROR(H5Dget_access_plist); } - if (NULL == (tmp_prefix = (char *)HDcalloc(1, (size_t)buf_size + 1))) { + if (NULL == (tmp_prefix = (char *)calloc(1, (size_t)buf_size + 1))) { H5_FAILED(); - HDprintf(" couldn't allocate buffer for property value\n"); + printf(" couldn't allocate buffer for property value\n"); PART_ERROR(H5Dget_access_plist); } if (H5Pget_efile_prefix(dapl_id1, tmp_prefix, (size_t)buf_size + 1) < 0) { H5_FAILED(); - HDprintf(" couldn't retrieve property list value\n"); + printf(" couldn't retrieve property list value\n"); PART_ERROR(H5Dget_access_plist); } if (HDstrncmp(tmp_prefix, path_prefix, (size_t)buf_size + 1)) { H5_FAILED(); - HDprintf(" DAPL values were incorrect!\n"); + printf(" DAPL values were incorrect!\n"); PART_ERROR(H5Dget_access_plist); } - HDmemset(tmp_prefix, 0, (size_t)buf_size + 1); + memset(tmp_prefix, 0, (size_t)buf_size + 1); if (H5Pget_efile_prefix(dapl_id2, tmp_prefix, (size_t)buf_size) < 0) { H5_FAILED(); - HDprintf(" couldn't retrieve property list value\n"); + printf(" couldn't retrieve property list value\n"); PART_ERROR(H5Dget_access_plist); } if (!HDstrncmp(tmp_prefix, path_prefix, (size_t)buf_size + 1)) { H5_FAILED(); - HDprintf(" DAPL property value was set!\n"); + printf(" DAPL property value was set!\n"); PART_ERROR(H5Dget_access_plist); } } @@ -3850,25 +3832,25 @@ test_dataset_property_lists(void) if ((dset_id1 = H5Dopen2(group_id, DATASET_PROPERTY_LIST_TEST_DSET_NAME1, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open dataset '%s'\n", DATASET_PROPERTY_LIST_TEST_DSET_NAME1); + printf(" couldn't open dataset '%s'\n", DATASET_PROPERTY_LIST_TEST_DSET_NAME1); PART_ERROR(H5Dget_create_plist_reopened); } if ((dset_id2 = H5Dopen2(group_id, DATASET_PROPERTY_LIST_TEST_DSET_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open dataset '%s'\n", DATASET_PROPERTY_LIST_TEST_DSET_NAME2); + printf(" couldn't open dataset '%s'\n", DATASET_PROPERTY_LIST_TEST_DSET_NAME2); PART_ERROR(H5Dget_create_plist_reopened); } if ((dcpl_id1 = H5Dget_create_plist(dset_id1)) < 0) { H5_FAILED(); - HDprintf(" couldn't get property list\n"); + printf(" couldn't get property list\n"); PART_ERROR(H5Dget_create_plist_reopened); } if ((dcpl_id2 = H5Dget_create_plist(dset_id2)) < 0) { H5_FAILED(); - HDprintf(" couldn't get property list\n"); + printf(" couldn't get property list\n"); PART_ERROR(H5Dget_create_plist_reopened); } @@ -3876,18 +3858,18 @@ test_dataset_property_lists(void) { hsize_t tmp_chunk_dims[DATASET_PROPERTY_LIST_TEST_SPACE_RANK]; - HDmemset(tmp_chunk_dims, 0, sizeof(tmp_chunk_dims)); + memset(tmp_chunk_dims, 0, sizeof(tmp_chunk_dims)); if (H5Pget_chunk(dcpl_id1, DATASET_PROPERTY_LIST_TEST_SPACE_RANK, tmp_chunk_dims) < 0) { H5_FAILED(); - HDprintf(" couldn't get DCPL property value\n"); + printf(" couldn't get DCPL property value\n"); PART_ERROR(H5Dget_create_plist_reopened); } for (i = 0; i < DATASET_PROPERTY_LIST_TEST_SPACE_RANK; i++) if (tmp_chunk_dims[i] != chunk_dims[i]) { H5_FAILED(); - HDprintf(" DCPL property values were incorrect\n"); + printf(" DCPL property values were incorrect\n"); PART_ERROR(H5Dget_create_plist_reopened); } @@ -3900,8 +3882,8 @@ test_dataset_property_lists(void) /* DAOS VOL can auto chunk, so don't fail */ if (err_ret >= 0 && strcmp(vol_name, "daos") != 0) { H5_FAILED(); - HDprintf(" property list 2 shouldn't have had chunk dimensionality set (not a chunked " - "layout)\n"); + printf(" property list 2 shouldn't have had chunk dimensionality set (not a chunked " + "layout)\n"); PART_ERROR(H5Dget_create_plist_reopened); } } @@ -3915,7 +3897,7 @@ test_dataset_property_lists(void) TESTING_2("test cleanup"); if (tmp_prefix) { - HDfree(tmp_prefix); + free(tmp_prefix); tmp_prefix = NULL; } @@ -3960,7 +3942,7 @@ error: H5E_BEGIN_TRY { if (tmp_prefix) - HDfree(tmp_prefix); + free(tmp_prefix); H5Pclose(dcpl_id1); H5Pclose(dcpl_id2); H5Pclose(dapl_id1); @@ -4088,27 +4070,26 @@ test_read_dataset_small_all(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC)) { SKIPPED(); - HDprintf( - " API functions for basic file, group, or dataset aren't supported with this connector\n"); + printf(" API functions for basic file, group, or dataset aren't supported with this connector\n"); return 0; } if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, DATASET_SMALL_READ_TEST_ALL_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container sub-group '%s'\n", DATASET_SMALL_READ_TEST_ALL_GROUP_NAME); + printf(" couldn't create container sub-group '%s'\n", DATASET_SMALL_READ_TEST_ALL_GROUP_NAME); goto error; } @@ -4119,7 +4100,7 @@ test_read_dataset_small_all(void) DATASET_SMALL_READ_TEST_ALL_DSET_DTYPE, fspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create dataset '%s'\n", DATASET_SMALL_READ_TEST_ALL_DSET_NAME); + printf(" couldn't create dataset '%s'\n", DATASET_SMALL_READ_TEST_ALL_DSET_NAME); goto error; } @@ -4127,18 +4108,18 @@ test_read_dataset_small_all(void) data_size *= dims[i]; data_size *= DATASET_SMALL_READ_TEST_ALL_DSET_DTYPESIZE; - if (NULL == (read_buf = HDmalloc(data_size))) + if (NULL == (read_buf = malloc(data_size))) TEST_ERROR; if (H5Dread(dset_id, DATASET_SMALL_READ_TEST_ALL_DSET_DTYPE, H5S_ALL, H5S_ALL, H5P_DEFAULT, read_buf) < 0) { H5_FAILED(); - HDprintf(" couldn't read from dataset '%s'\n", DATASET_SMALL_READ_TEST_ALL_DSET_NAME); + printf(" couldn't read from dataset '%s'\n", DATASET_SMALL_READ_TEST_ALL_DSET_NAME); goto error; } if (read_buf) { - HDfree(read_buf); + free(read_buf); read_buf = NULL; } @@ -4161,7 +4142,7 @@ error: H5E_BEGIN_TRY { if (read_buf) - HDfree(read_buf); + free(read_buf); H5Sclose(fspace_id); H5Dclose(dset_id); H5Gclose(group_id); @@ -4198,28 +4179,27 @@ test_read_dataset_small_hyperslab(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC)) { SKIPPED(); - HDprintf( - " API functions for basic file, group, or dataset aren't supported with this connector\n"); + printf(" API functions for basic file, group, or dataset aren't supported with this connector\n"); return 0; } if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, DATASET_SMALL_READ_TEST_HYPERSLAB_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container sub-group '%s'\n", - DATASET_SMALL_READ_TEST_HYPERSLAB_GROUP_NAME); + printf(" couldn't create container sub-group '%s'\n", + DATASET_SMALL_READ_TEST_HYPERSLAB_GROUP_NAME); goto error; } @@ -4232,7 +4212,7 @@ test_read_dataset_small_hyperslab(void) DATASET_SMALL_READ_TEST_HYPERSLAB_DSET_DTYPE, fspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create dataset '%s'\n", DATASET_SMALL_READ_TEST_HYPERSLAB_DSET_NAME); + printf(" couldn't create dataset '%s'\n", DATASET_SMALL_READ_TEST_HYPERSLAB_DSET_NAME); goto error; } @@ -4252,18 +4232,18 @@ test_read_dataset_small_hyperslab(void) data_size *= dims[i]; data_size *= DATASET_SMALL_READ_TEST_HYPERSLAB_DSET_DTYPESIZE; - if (NULL == (read_buf = HDmalloc(data_size))) + if (NULL == (read_buf = malloc(data_size))) TEST_ERROR; if (H5Dread(dset_id, DATASET_SMALL_READ_TEST_HYPERSLAB_DSET_DTYPE, mspace_id, fspace_id, H5P_DEFAULT, read_buf) < 0) { H5_FAILED(); - HDprintf(" couldn't read from dataset '%s'\n", DATASET_SMALL_READ_TEST_HYPERSLAB_DSET_NAME); + printf(" couldn't read from dataset '%s'\n", DATASET_SMALL_READ_TEST_HYPERSLAB_DSET_NAME); goto error; } if (read_buf) { - HDfree(read_buf); + free(read_buf); read_buf = NULL; } @@ -4288,7 +4268,7 @@ error: H5E_BEGIN_TRY { if (read_buf) - HDfree(read_buf); + free(read_buf); H5Sclose(mspace_id); H5Sclose(fspace_id); H5Dclose(dset_id); @@ -4326,28 +4306,27 @@ test_read_dataset_small_point_selection(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC)) { SKIPPED(); - HDprintf( - " API functions for basic file, group, or dataset aren't supported with this connector\n"); + printf(" API functions for basic file, group, or dataset aren't supported with this connector\n"); return 0; } if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, DATASET_SMALL_READ_TEST_POINT_SELECTION_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container sub-group '%s'\n", - DATASET_SMALL_READ_TEST_POINT_SELECTION_GROUP_NAME); + printf(" couldn't create container sub-group '%s'\n", + DATASET_SMALL_READ_TEST_POINT_SELECTION_GROUP_NAME); goto error; } @@ -4361,14 +4340,14 @@ test_read_dataset_small_point_selection(void) DATASET_SMALL_READ_TEST_POINT_SELECTION_DSET_DTYPE, fspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create dataset '%s'\n", DATASET_SMALL_READ_TEST_POINT_SELECTION_DSET_NAME); + printf(" couldn't create dataset '%s'\n", DATASET_SMALL_READ_TEST_POINT_SELECTION_DSET_NAME); goto error; } data_size = DATASET_SMALL_READ_TEST_POINT_SELECTION_NUM_POINTS * DATASET_SMALL_READ_TEST_POINT_SELECTION_DSET_DTYPESIZE; - if (NULL == (data = HDmalloc(data_size))) + if (NULL == (data = malloc(data_size))) TEST_ERROR; for (i = 0; i < DATASET_SMALL_READ_TEST_POINT_SELECTION_NUM_POINTS; i++) { @@ -4381,19 +4360,19 @@ test_read_dataset_small_point_selection(void) if (H5Sselect_elements(fspace_id, H5S_SELECT_SET, DATASET_SMALL_READ_TEST_POINT_SELECTION_NUM_POINTS, points) < 0) { H5_FAILED(); - HDprintf(" couldn't select points\n"); + printf(" couldn't select points\n"); goto error; } if (H5Dread(dset_id, DATASET_SMALL_READ_TEST_POINT_SELECTION_DSET_DTYPE, mspace_id, fspace_id, H5P_DEFAULT, data) < 0) { H5_FAILED(); - HDprintf(" couldn't read from dataset '%s'\n", DATASET_SMALL_READ_TEST_POINT_SELECTION_DSET_NAME); + printf(" couldn't read from dataset '%s'\n", DATASET_SMALL_READ_TEST_POINT_SELECTION_DSET_NAME); goto error; } if (data) { - HDfree(data); + free(data); data = NULL; } @@ -4418,7 +4397,7 @@ error: H5E_BEGIN_TRY { if (data) - HDfree(data); + free(data); H5Sclose(mspace_id); H5Sclose(fspace_id); H5Dclose(dset_id); @@ -4481,8 +4460,7 @@ test_dataset_io_point_selections(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC)) { SKIPPED(); - HDprintf( - " API functions for basic file, group, or dataset aren't supported with this connector\n"); + printf(" API functions for basic file, group, or dataset aren't supported with this connector\n"); return 0; } @@ -4951,8 +4929,7 @@ test_read_dataset_invalid_params(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC)) { SKIPPED(); - HDprintf( - " API functions for basic file, group, or dataset aren't supported with this connector\n"); + printf(" API functions for basic file, group, or dataset aren't supported with this connector\n"); return 0; } @@ -4960,21 +4937,20 @@ test_read_dataset_invalid_params(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, DATASET_READ_INVALID_PARAMS_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container sub-group '%s'\n", - DATASET_READ_INVALID_PARAMS_TEST_GROUP_NAME); + printf(" couldn't create container sub-group '%s'\n", DATASET_READ_INVALID_PARAMS_TEST_GROUP_NAME); goto error; } @@ -4985,7 +4961,7 @@ test_read_dataset_invalid_params(void) DATASET_READ_INVALID_PARAMS_TEST_DSET_DTYPE, fspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create dataset '%s'\n", DATASET_READ_INVALID_PARAMS_TEST_DSET_NAME); + printf(" couldn't create dataset '%s'\n", DATASET_READ_INVALID_PARAMS_TEST_DSET_NAME); goto error; } @@ -4993,7 +4969,7 @@ test_read_dataset_invalid_params(void) data_size *= dims[i]; data_size *= DATASET_READ_INVALID_PARAMS_TEST_DSET_DTYPESIZE; - if (NULL == (read_buf = HDmalloc(data_size))) + if (NULL == (read_buf = malloc(data_size))) TEST_ERROR; PASSED(); @@ -5013,7 +4989,7 @@ test_read_dataset_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" read from dataset using H5Dread with an invalid dataset ID!\n"); + printf(" read from dataset using H5Dread with an invalid dataset ID!\n"); PART_ERROR(H5Dread_invalid_dset_id); } @@ -5033,7 +5009,7 @@ test_read_dataset_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" read from dataset using H5Dread with an invalid memory datatype!\n"); + printf(" read from dataset using H5Dread with an invalid memory datatype!\n"); PART_ERROR(H5Dread_invalid_datatype); } @@ -5054,7 +5030,7 @@ test_read_dataset_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" read from dataset using H5Dread with an invalid memory dataspace!\n"); + printf(" read from dataset using H5Dread with an invalid memory dataspace!\n"); PART_ERROR(H5Dread_invalid_mem_dataspace); } @@ -5075,7 +5051,7 @@ test_read_dataset_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" read from dataset using H5Dread with an invalid file dataspace!\n"); + printf(" read from dataset using H5Dread with an invalid file dataspace!\n"); PART_ERROR(H5Dread_invalid_file_dataspace); } @@ -5096,7 +5072,7 @@ test_read_dataset_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" read from dataset using H5Dread with an invalid DXPL!\n"); + printf(" read from dataset using H5Dread with an invalid DXPL!\n"); PART_ERROR(H5Dread_invalid_dxpl); } @@ -5117,7 +5093,7 @@ test_read_dataset_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" read from dataset using H5Dread with an invalid data buffer!\n"); + printf(" read from dataset using H5Dread with an invalid data buffer!\n"); PART_ERROR(H5Dread_invalid_data_buf); } @@ -5130,7 +5106,7 @@ test_read_dataset_invalid_params(void) TESTING_2("test cleanup"); if (read_buf) { - HDfree(read_buf); + free(read_buf); read_buf = NULL; } @@ -5153,7 +5129,7 @@ error: H5E_BEGIN_TRY { if (read_buf) - HDfree(read_buf); + free(read_buf); H5Sclose(fspace_id); H5Dclose(dset_id); H5Gclose(group_id); @@ -5187,27 +5163,26 @@ test_write_dataset_small_all(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_MORE)) { SKIPPED(); - HDprintf( - " API functions for basic file, group, or dataset aren't supported with this connector\n"); + printf(" API functions for basic file, group, or dataset aren't supported with this connector\n"); return 0; } if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, DATASET_SMALL_WRITE_TEST_ALL_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container sub-group '%s'\n", DATASET_SMALL_WRITE_TEST_ALL_GROUP_NAME); + printf(" couldn't create container sub-group '%s'\n", DATASET_SMALL_WRITE_TEST_ALL_GROUP_NAME); goto error; } @@ -5218,7 +5193,7 @@ test_write_dataset_small_all(void) DATASET_SMALL_WRITE_TEST_ALL_DSET_DTYPE, fspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create dataset '%s'\n", DATASET_SMALL_WRITE_TEST_ALL_DSET_NAME); + printf(" couldn't create dataset '%s'\n", DATASET_SMALL_WRITE_TEST_ALL_DSET_NAME); goto error; } @@ -5230,23 +5205,23 @@ test_write_dataset_small_all(void) if ((dset_id = H5Dopen2(group_id, DATASET_SMALL_WRITE_TEST_ALL_DSET_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open dataset '%s'\n", DATASET_SMALL_WRITE_TEST_ALL_DSET_NAME); + printf(" couldn't open dataset '%s'\n", DATASET_SMALL_WRITE_TEST_ALL_DSET_NAME); goto error; } if ((fspace_id = H5Dget_space(dset_id)) < 0) { H5_FAILED(); - HDprintf(" couldn't get dataset dataspace\n"); + printf(" couldn't get dataset dataspace\n"); goto error; } if ((space_npoints = H5Sget_simple_extent_npoints(fspace_id)) < 0) { H5_FAILED(); - HDprintf(" couldn't get dataspace num points\n"); + printf(" couldn't get dataspace num points\n"); goto error; } - if (NULL == (data = HDmalloc((hsize_t)space_npoints * DATASET_SMALL_WRITE_TEST_ALL_DSET_DTYPESIZE))) + if (NULL == (data = malloc((hsize_t)space_npoints * DATASET_SMALL_WRITE_TEST_ALL_DSET_DTYPESIZE))) TEST_ERROR; for (i = 0; i < (hsize_t)space_npoints; i++) @@ -5254,12 +5229,12 @@ test_write_dataset_small_all(void) if (H5Dwrite(dset_id, DATASET_SMALL_WRITE_TEST_ALL_DSET_DTYPE, H5S_ALL, H5S_ALL, H5P_DEFAULT, data) < 0) { H5_FAILED(); - HDprintf(" couldn't write to dataset '%s'\n", DATASET_SMALL_WRITE_TEST_ALL_DSET_NAME); + printf(" couldn't write to dataset '%s'\n", DATASET_SMALL_WRITE_TEST_ALL_DSET_NAME); goto error; } if (data) { - HDfree(data); + free(data); data = NULL; } @@ -5282,7 +5257,7 @@ error: H5E_BEGIN_TRY { if (data) - HDfree(data); + free(data); H5Sclose(fspace_id); H5Dclose(dset_id); H5Gclose(group_id); @@ -5319,28 +5294,27 @@ test_write_dataset_small_hyperslab(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC)) { SKIPPED(); - HDprintf( - " API functions for basic file, group, or dataset aren't supported with this connector\n"); + printf(" API functions for basic file, group, or dataset aren't supported with this connector\n"); return 0; } if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, DATASET_SMALL_WRITE_TEST_HYPERSLAB_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container sub-group '%s'\n", - DATASET_SMALL_WRITE_TEST_HYPERSLAB_GROUP_NAME); + printf(" couldn't create container sub-group '%s'\n", + DATASET_SMALL_WRITE_TEST_HYPERSLAB_GROUP_NAME); goto error; } @@ -5354,7 +5328,7 @@ test_write_dataset_small_hyperslab(void) DATASET_SMALL_WRITE_TEST_HYPERSLAB_DSET_DTYPE, fspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create dataset '%s'\n", DATASET_SMALL_WRITE_TEST_HYPERSLAB_DSET_NAME); + printf(" couldn't create dataset '%s'\n", DATASET_SMALL_WRITE_TEST_HYPERSLAB_DSET_NAME); goto error; } @@ -5362,7 +5336,7 @@ test_write_dataset_small_hyperslab(void) data_size *= dims[i]; data_size *= DATASET_SMALL_WRITE_TEST_HYPERSLAB_DSET_DTYPESIZE; - if (NULL == (data = HDmalloc(data_size))) + if (NULL == (data = malloc(data_size))) TEST_ERROR; for (i = 0; i < data_size / DATASET_SMALL_WRITE_TEST_HYPERSLAB_DSET_DTYPESIZE; i++) @@ -5383,12 +5357,12 @@ test_write_dataset_small_hyperslab(void) if (H5Dwrite(dset_id, DATASET_SMALL_WRITE_TEST_HYPERSLAB_DSET_DTYPE, mspace_id, fspace_id, H5P_DEFAULT, data) < 0) { H5_FAILED(); - HDprintf(" couldn't write to dataset '%s'\n", DATASET_SMALL_WRITE_TEST_HYPERSLAB_DSET_NAME); + printf(" couldn't write to dataset '%s'\n", DATASET_SMALL_WRITE_TEST_HYPERSLAB_DSET_NAME); goto error; } if (data) { - HDfree(data); + free(data); data = NULL; } @@ -5413,7 +5387,7 @@ error: H5E_BEGIN_TRY { if (data) - HDfree(data); + free(data); H5Sclose(mspace_id); H5Sclose(fspace_id); H5Dclose(dset_id); @@ -5451,28 +5425,27 @@ test_write_dataset_small_point_selection(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC)) { SKIPPED(); - HDprintf( - " API functions for basic file, group, or dataset aren't supported with this connector\n"); + printf(" API functions for basic file, group, or dataset aren't supported with this connector\n"); return 0; } if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, DATASET_SMALL_WRITE_TEST_POINT_SELECTION_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container sub-group '%s'\n", - DATASET_SMALL_WRITE_TEST_POINT_SELECTION_GROUP_NAME); + printf(" couldn't create container sub-group '%s'\n", + DATASET_SMALL_WRITE_TEST_POINT_SELECTION_GROUP_NAME); goto error; } @@ -5486,14 +5459,14 @@ test_write_dataset_small_point_selection(void) DATASET_SMALL_WRITE_TEST_POINT_SELECTION_DSET_DTYPE, fspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create dataset '%s'\n", DATASET_SMALL_WRITE_TEST_POINT_SELECTION_DSET_NAME); + printf(" couldn't create dataset '%s'\n", DATASET_SMALL_WRITE_TEST_POINT_SELECTION_DSET_NAME); goto error; } data_size = DATASET_SMALL_WRITE_TEST_POINT_SELECTION_NUM_POINTS * DATASET_SMALL_WRITE_TEST_POINT_SELECTION_DSET_DTYPESIZE; - if (NULL == (data = HDmalloc(data_size))) + if (NULL == (data = malloc(data_size))) TEST_ERROR; for (i = 0; i < data_size / DATASET_SMALL_WRITE_TEST_POINT_SELECTION_DSET_DTYPESIZE; i++) @@ -5509,19 +5482,19 @@ test_write_dataset_small_point_selection(void) if (H5Sselect_elements(fspace_id, H5S_SELECT_SET, DATASET_SMALL_WRITE_TEST_POINT_SELECTION_NUM_POINTS, points) < 0) { H5_FAILED(); - HDprintf(" couldn't select points\n"); + printf(" couldn't select points\n"); goto error; } if (H5Dwrite(dset_id, DATASET_SMALL_WRITE_TEST_POINT_SELECTION_DSET_DTYPE, mspace_id, fspace_id, H5P_DEFAULT, data) < 0) { H5_FAILED(); - HDprintf(" couldn't write to dataset '%s'\n", DATASET_SMALL_WRITE_TEST_POINT_SELECTION_DSET_NAME); + printf(" couldn't write to dataset '%s'\n", DATASET_SMALL_WRITE_TEST_POINT_SELECTION_DSET_NAME); goto error; } if (data) { - HDfree(data); + free(data); data = NULL; } @@ -5546,7 +5519,7 @@ error: H5E_BEGIN_TRY { if (data) - HDfree(data); + free(data); H5Sclose(mspace_id); H5Sclose(fspace_id); H5Dclose(dset_id); @@ -5590,8 +5563,8 @@ test_write_dataset_data_verification(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_MORE)) { SKIPPED(); - HDprintf(" API functions for basic file, group, basic or more dataset aren't supported with this " - "connector\n"); + printf(" API functions for basic file, group, basic or more dataset aren't supported with this " + "connector\n"); return 0; } @@ -5599,20 +5572,20 @@ test_write_dataset_data_verification(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, DATASET_DATA_VERIFY_WRITE_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container sub-group '%s'\n", DATASET_DATA_VERIFY_WRITE_TEST_GROUP_NAME); + printf(" couldn't create container sub-group '%s'\n", DATASET_DATA_VERIFY_WRITE_TEST_GROUP_NAME); goto error; } @@ -5623,7 +5596,7 @@ test_write_dataset_data_verification(void) DATASET_DATA_VERIFY_WRITE_TEST_DSET_DTYPE, fspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create dataset '%s'\n", DATASET_DATA_VERIFY_WRITE_TEST_DSET_NAME); + printf(" couldn't create dataset '%s'\n", DATASET_DATA_VERIFY_WRITE_TEST_DSET_NAME); goto error; } @@ -5631,7 +5604,7 @@ test_write_dataset_data_verification(void) data_size *= dims[i]; data_size *= DATASET_DATA_VERIFY_WRITE_TEST_DSET_DTYPESIZE; - if (NULL == (data = HDmalloc(data_size))) + if (NULL == (data = malloc(data_size))) TEST_ERROR; for (i = 0; i < data_size / DATASET_DATA_VERIFY_WRITE_TEST_DSET_DTYPESIZE; i++) @@ -5648,12 +5621,12 @@ test_write_dataset_data_verification(void) if (H5Dwrite(dset_id, DATASET_DATA_VERIFY_WRITE_TEST_DSET_DTYPE, H5S_ALL, H5S_ALL, H5P_DEFAULT, data) < 0) { H5_FAILED(); - HDprintf(" couldn't write to dataset '%s'\n", DATASET_DATA_VERIFY_WRITE_TEST_DSET_NAME); + printf(" couldn't write to dataset '%s'\n", DATASET_DATA_VERIFY_WRITE_TEST_DSET_NAME); PART_ERROR(H5Dwrite_all_read); } if (data) { - HDfree(data); + free(data); data = NULL; } @@ -5676,45 +5649,45 @@ test_write_dataset_data_verification(void) if ((dset_id = H5Dopen2(group_id, DATASET_DATA_VERIFY_WRITE_TEST_DSET_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open dataset '%s'\n", DATASET_DATA_VERIFY_WRITE_TEST_DSET_NAME); + printf(" couldn't open dataset '%s'\n", DATASET_DATA_VERIFY_WRITE_TEST_DSET_NAME); PART_ERROR(H5Dwrite_all_read); } if ((fspace_id = H5Dget_space(dset_id)) < 0) { H5_FAILED(); - HDprintf(" couldn't get dataset dataspace\n"); + printf(" couldn't get dataset dataspace\n"); PART_ERROR(H5Dwrite_all_read); } if ((space_npoints = H5Sget_simple_extent_npoints(fspace_id)) < 0) { H5_FAILED(); - HDprintf(" couldn't get dataspace num points\n"); + printf(" couldn't get dataspace num points\n"); PART_ERROR(H5Dwrite_all_read); } if (NULL == - (data = HDmalloc((hsize_t)space_npoints * DATASET_DATA_VERIFY_WRITE_TEST_DSET_DTYPESIZE))) { + (data = malloc((hsize_t)space_npoints * DATASET_DATA_VERIFY_WRITE_TEST_DSET_DTYPESIZE))) { H5_FAILED(); - HDprintf(" couldn't allocate buffer for dataset read\n"); + printf(" couldn't allocate buffer for dataset read\n"); PART_ERROR(H5Dwrite_all_read); } if (H5Dread(dset_id, DATASET_DATA_VERIFY_WRITE_TEST_DSET_DTYPE, H5S_ALL, H5S_ALL, H5P_DEFAULT, data) < 0) { H5_FAILED(); - HDprintf(" couldn't read from dataset '%s'\n", DATASET_DATA_VERIFY_WRITE_TEST_DSET_NAME); + printf(" couldn't read from dataset '%s'\n", DATASET_DATA_VERIFY_WRITE_TEST_DSET_NAME); PART_ERROR(H5Dwrite_all_read); } for (i = 0; i < (hsize_t)space_npoints; i++) if (((int *)data)[i] != (int)i) { H5_FAILED(); - HDprintf(" H5S_ALL selection data verification failed\n"); + printf(" H5S_ALL selection data verification failed\n"); PART_ERROR(H5Dwrite_all_read); } if (data) { - HDfree(data); + free(data); data = NULL; } @@ -5728,9 +5701,9 @@ test_write_dataset_data_verification(void) data_size = dims[1] * 2 * DATASET_DATA_VERIFY_WRITE_TEST_DSET_DTYPESIZE; - if (NULL == (write_buf = HDmalloc(data_size))) { + if (NULL == (write_buf = malloc(data_size))) { H5_FAILED(); - HDprintf(" couldn't allocate buffer for dataset write\n"); + printf(" couldn't allocate buffer for dataset write\n"); PART_ERROR(H5Dwrite_hyperslab_read); } @@ -5741,16 +5714,16 @@ test_write_dataset_data_verification(void) data_size *= dims[i]; data_size *= DATASET_DATA_VERIFY_WRITE_TEST_DSET_DTYPESIZE; - if (NULL == (data = HDmalloc(data_size))) { + if (NULL == (data = malloc(data_size))) { H5_FAILED(); - HDprintf(" couldn't allocate buffer for dataset data verification\n"); + printf(" couldn't allocate buffer for dataset data verification\n"); PART_ERROR(H5Dwrite_hyperslab_read); } if (H5Dread(dset_id, DATASET_DATA_VERIFY_WRITE_TEST_DSET_DTYPE, H5S_ALL, H5S_ALL, H5P_DEFAULT, data) < 0) { H5_FAILED(); - HDprintf(" couldn't read from dataset '%s'\n", DATASET_DATA_VERIFY_WRITE_TEST_DSET_NAME); + printf(" couldn't read from dataset '%s'\n", DATASET_DATA_VERIFY_WRITE_TEST_DSET_NAME); PART_ERROR(H5Dwrite_hyperslab_read); } @@ -5771,7 +5744,7 @@ test_write_dataset_data_verification(void) if (H5Sselect_hyperslab(fspace_id, H5S_SELECT_SET, start, stride, count, block) < 0) { H5_FAILED(); - HDprintf(" couldn't select hyperslab for dataset write\n"); + printf(" couldn't select hyperslab for dataset write\n"); PART_ERROR(H5Dwrite_hyperslab_read); } @@ -5780,7 +5753,7 @@ test_write_dataset_data_verification(void) if ((mspace_id = H5Screate_simple(1, mdims, NULL)) < 0) { H5_FAILED(); - HDprintf(" couldn't create memory dataspace\n"); + printf(" couldn't create memory dataspace\n"); PART_ERROR(H5Dwrite_hyperslab_read); } } @@ -5788,7 +5761,7 @@ test_write_dataset_data_verification(void) if (H5Dwrite(dset_id, DATASET_DATA_VERIFY_WRITE_TEST_DSET_DTYPE, mspace_id, fspace_id, H5P_DEFAULT, write_buf) < 0) { H5_FAILED(); - HDprintf(" couldn't write to dataset '%s'\n", DATASET_DATA_VERIFY_WRITE_TEST_DSET_NAME); + printf(" couldn't write to dataset '%s'\n", DATASET_DATA_VERIFY_WRITE_TEST_DSET_NAME); PART_ERROR(H5Dwrite_hyperslab_read); } @@ -5819,54 +5792,54 @@ test_write_dataset_data_verification(void) if ((dset_id = H5Dopen2(group_id, DATASET_DATA_VERIFY_WRITE_TEST_DSET_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open dataset '%s'\n", DATASET_DATA_VERIFY_WRITE_TEST_DSET_NAME); + printf(" couldn't open dataset '%s'\n", DATASET_DATA_VERIFY_WRITE_TEST_DSET_NAME); PART_ERROR(H5Dwrite_hyperslab_read); } if ((fspace_id = H5Dget_space(dset_id)) < 0) { H5_FAILED(); - HDprintf(" couldn't get dataset dataspace\n"); + printf(" couldn't get dataset dataspace\n"); PART_ERROR(H5Dwrite_hyperslab_read); } if ((space_npoints = H5Sget_simple_extent_npoints(fspace_id)) < 0) { H5_FAILED(); - HDprintf(" couldn't get dataspace num points\n"); + printf(" couldn't get dataspace num points\n"); PART_ERROR(H5Dwrite_hyperslab_read); } - if (NULL == (read_buf = HDmalloc((hsize_t)space_npoints * - DATASET_DATA_VERIFY_WRITE_TEST_DSET_DTYPESIZE))) { + if (NULL == + (read_buf = malloc((hsize_t)space_npoints * DATASET_DATA_VERIFY_WRITE_TEST_DSET_DTYPESIZE))) { H5_FAILED(); - HDprintf(" couldn't allocate buffer for dataset read\n"); + printf(" couldn't allocate buffer for dataset read\n"); PART_ERROR(H5Dwrite_hyperslab_read); } if (H5Dread(dset_id, DATASET_DATA_VERIFY_WRITE_TEST_DSET_DTYPE, H5S_ALL, H5S_ALL, H5P_DEFAULT, read_buf) < 0) { H5_FAILED(); - HDprintf(" couldn't read from dataset '%s'\n", DATASET_DATA_VERIFY_WRITE_TEST_DSET_NAME); + printf(" couldn't read from dataset '%s'\n", DATASET_DATA_VERIFY_WRITE_TEST_DSET_NAME); PART_ERROR(H5Dwrite_hyperslab_read); } if (memcmp(data, read_buf, data_size)) { H5_FAILED(); - HDprintf(" hyperslab selection data verification failed\n"); + printf(" hyperslab selection data verification failed\n"); PART_ERROR(H5Dwrite_hyperslab_read); } if (data) { - HDfree(data); + free(data); data = NULL; } if (write_buf) { - HDfree(write_buf); + free(write_buf); write_buf = NULL; } if (read_buf) { - HDfree(read_buf); + free(read_buf); read_buf = NULL; } @@ -5881,9 +5854,9 @@ test_write_dataset_data_verification(void) data_size = DATASET_DATA_VERIFY_WRITE_TEST_NUM_POINTS * DATASET_DATA_VERIFY_WRITE_TEST_DSET_DTYPESIZE; - if (NULL == (write_buf = HDmalloc(data_size))) { + if (NULL == (write_buf = malloc(data_size))) { H5_FAILED(); - HDprintf(" couldn't allocate buffer for dataset write\n"); + printf(" couldn't allocate buffer for dataset write\n"); PART_ERROR(H5Dwrite_point_sel_read); } @@ -5894,16 +5867,16 @@ test_write_dataset_data_verification(void) data_size *= dims[i]; data_size *= DATASET_DATA_VERIFY_WRITE_TEST_DSET_DTYPESIZE; - if (NULL == (data = HDmalloc(data_size))) { + if (NULL == (data = malloc(data_size))) { H5_FAILED(); - HDprintf(" couldn't allocate buffer for dataset data verification\n"); + printf(" couldn't allocate buffer for dataset data verification\n"); PART_ERROR(H5Dwrite_point_sel_read); } if (H5Dread(dset_id, DATASET_DATA_VERIFY_WRITE_TEST_DSET_DTYPE, H5S_ALL, H5S_ALL, H5P_DEFAULT, data) < 0) { H5_FAILED(); - HDprintf(" couldn't read from dataset '%s'\n", DATASET_DATA_VERIFY_WRITE_TEST_DSET_NAME); + printf(" couldn't read from dataset '%s'\n", DATASET_DATA_VERIFY_WRITE_TEST_DSET_NAME); PART_ERROR(H5Dwrite_point_sel_read); } @@ -5931,7 +5904,7 @@ test_write_dataset_data_verification(void) if (H5Sselect_elements(fspace_id, H5S_SELECT_SET, DATASET_DATA_VERIFY_WRITE_TEST_NUM_POINTS, points) < 0) { H5_FAILED(); - HDprintf(" couldn't select elements in dataspace\n"); + printf(" couldn't select elements in dataspace\n"); PART_ERROR(H5Dwrite_point_sel_read); } @@ -5940,7 +5913,7 @@ test_write_dataset_data_verification(void) if ((mspace_id = H5Screate_simple(1, mdims, NULL)) < 0) { H5_FAILED(); - HDprintf(" couldn't create memory dataspace\n"); + printf(" couldn't create memory dataspace\n"); PART_ERROR(H5Dwrite_point_sel_read); } } @@ -5948,7 +5921,7 @@ test_write_dataset_data_verification(void) if (H5Dwrite(dset_id, DATASET_DATA_VERIFY_WRITE_TEST_DSET_DTYPE, mspace_id, fspace_id, H5P_DEFAULT, write_buf) < 0) { H5_FAILED(); - HDprintf(" couldn't write to dataset '%s'\n", DATASET_DATA_VERIFY_WRITE_TEST_DSET_NAME); + printf(" couldn't write to dataset '%s'\n", DATASET_DATA_VERIFY_WRITE_TEST_DSET_NAME); PART_ERROR(H5Dwrite_point_sel_read); } @@ -5979,39 +5952,39 @@ test_write_dataset_data_verification(void) if ((dset_id = H5Dopen2(group_id, DATASET_DATA_VERIFY_WRITE_TEST_DSET_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open dataset '%s'\n", DATASET_DATA_VERIFY_WRITE_TEST_DSET_NAME); + printf(" couldn't open dataset '%s'\n", DATASET_DATA_VERIFY_WRITE_TEST_DSET_NAME); PART_ERROR(H5Dwrite_point_sel_read); } if ((fspace_id = H5Dget_space(dset_id)) < 0) { H5_FAILED(); - HDprintf(" couldn't get dataset dataspace\n"); + printf(" couldn't get dataset dataspace\n"); PART_ERROR(H5Dwrite_point_sel_read); } if ((space_npoints = H5Sget_simple_extent_npoints(fspace_id)) < 0) { H5_FAILED(); - HDprintf(" couldn't get dataspace num points\n"); + printf(" couldn't get dataspace num points\n"); PART_ERROR(H5Dwrite_point_sel_read); } - if (NULL == (read_buf = HDmalloc((hsize_t)space_npoints * - DATASET_DATA_VERIFY_WRITE_TEST_DSET_DTYPESIZE))) { + if (NULL == + (read_buf = malloc((hsize_t)space_npoints * DATASET_DATA_VERIFY_WRITE_TEST_DSET_DTYPESIZE))) { H5_FAILED(); - HDprintf(" couldn't allocate buffer for dataset read\n"); + printf(" couldn't allocate buffer for dataset read\n"); PART_ERROR(H5Dwrite_point_sel_read); } if (H5Dread(dset_id, DATASET_DATA_VERIFY_WRITE_TEST_DSET_DTYPE, H5S_ALL, H5S_ALL, H5P_DEFAULT, read_buf) < 0) { H5_FAILED(); - HDprintf(" couldn't read from dataset '%s'\n", DATASET_DATA_VERIFY_WRITE_TEST_DSET_NAME); + printf(" couldn't read from dataset '%s'\n", DATASET_DATA_VERIFY_WRITE_TEST_DSET_NAME); PART_ERROR(H5Dwrite_point_sel_read); } if (memcmp(data, read_buf, data_size)) { H5_FAILED(); - HDprintf(" point selection data verification failed\n"); + printf(" point selection data verification failed\n"); PART_ERROR(H5Dwrite_point_sel_read); } @@ -6024,17 +5997,17 @@ test_write_dataset_data_verification(void) TESTING_2("test cleanup"); if (data) { - HDfree(data); + free(data); data = NULL; } if (write_buf) { - HDfree(write_buf); + free(write_buf); write_buf = NULL; } if (read_buf) { - HDfree(read_buf); + free(read_buf); read_buf = NULL; } @@ -6057,11 +6030,11 @@ error: H5E_BEGIN_TRY { if (data) - HDfree(data); + free(data); if (write_buf) - HDfree(write_buf); + free(write_buf); if (read_buf) - HDfree(read_buf); + free(read_buf); H5Sclose(mspace_id); H5Sclose(fspace_id); H5Dclose(dset_id); @@ -6097,8 +6070,7 @@ test_write_dataset_invalid_params(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC)) { SKIPPED(); - HDprintf( - " API functions for basic file, group, or dataset aren't supported with this connector\n"); + printf(" API functions for basic file, group, or dataset aren't supported with this connector\n"); return 0; } @@ -6106,21 +6078,21 @@ test_write_dataset_invalid_params(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, DATASET_WRITE_INVALID_PARAMS_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container sub-group '%s'\n", - DATASET_WRITE_INVALID_PARAMS_TEST_GROUP_NAME); + printf(" couldn't create container sub-group '%s'\n", + DATASET_WRITE_INVALID_PARAMS_TEST_GROUP_NAME); goto error; } @@ -6131,17 +6103,17 @@ test_write_dataset_invalid_params(void) DATASET_SMALL_WRITE_TEST_ALL_DSET_DTYPE, fspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create dataset '%s'\n", DATASET_WRITE_INVALID_PARAMS_TEST_DSET_NAME); + printf(" couldn't create dataset '%s'\n", DATASET_WRITE_INVALID_PARAMS_TEST_DSET_NAME); goto error; } if ((space_npoints = H5Sget_simple_extent_npoints(fspace_id)) < 0) { H5_FAILED(); - HDprintf(" couldn't get dataspace num points\n"); + printf(" couldn't get dataspace num points\n"); goto error; } - if (NULL == (data = HDmalloc((hsize_t)space_npoints * DATASET_WRITE_INVALID_PARAMS_TEST_DSET_DTYPESIZE))) + if (NULL == (data = malloc((hsize_t)space_npoints * DATASET_WRITE_INVALID_PARAMS_TEST_DSET_DTYPESIZE))) TEST_ERROR; for (i = 0; i < (hsize_t)space_npoints; i++) @@ -6164,7 +6136,7 @@ test_write_dataset_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" wrote to dataset using H5Dwrite with an invalid dataset ID!\n"); + printf(" wrote to dataset using H5Dwrite with an invalid dataset ID!\n"); PART_ERROR(H5Dwrite_invalid_dset_id); } @@ -6184,7 +6156,7 @@ test_write_dataset_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" wrote to dataset using H5Dwrite with an invalid memory datatype!\n"); + printf(" wrote to dataset using H5Dwrite with an invalid memory datatype!\n"); PART_ERROR(H5Dwrite_invalid_datatype); } @@ -6205,7 +6177,7 @@ test_write_dataset_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" wrote to dataset using H5Dwrite with an invalid memory dataspace!\n"); + printf(" wrote to dataset using H5Dwrite with an invalid memory dataspace!\n"); PART_ERROR(H5Dwrite_invalid_mem_dataspace); } @@ -6226,7 +6198,7 @@ test_write_dataset_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" wrote to dataset using H5Dwrite with an invalid file dataspace!\n"); + printf(" wrote to dataset using H5Dwrite with an invalid file dataspace!\n"); PART_ERROR(H5Dwrite_invalid_file_dataspace); } @@ -6247,7 +6219,7 @@ test_write_dataset_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" wrote to dataset using H5Dwrite with an invalid DXPL!\n"); + printf(" wrote to dataset using H5Dwrite with an invalid DXPL!\n"); PART_ERROR(H5Dwrite_invalid_dxpl); } @@ -6268,7 +6240,7 @@ test_write_dataset_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" wrote to dataset using H5Dwrite with an invalid data buffer!\n"); + printf(" wrote to dataset using H5Dwrite with an invalid data buffer!\n"); PART_ERROR(H5Dwrite_invalid_data_buf); } @@ -6281,7 +6253,7 @@ test_write_dataset_invalid_params(void) TESTING_2("test cleanup"); if (data) { - HDfree(data); + free(data); data = NULL; } @@ -6304,7 +6276,7 @@ error: H5E_BEGIN_TRY { if (data) - HDfree(data); + free(data); H5Sclose(fspace_id); H5Dclose(dset_id); H5Gclose(group_id); @@ -6350,8 +6322,8 @@ test_dataset_builtin_type_conversion(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_MORE)) { SKIPPED(); - HDprintf(" API functions for basic file, group, basic or more dataset aren't supported with this " - "connector\n"); + printf(" API functions for basic file, group, basic or more dataset aren't supported with this " + "connector\n"); return 0; } @@ -6359,7 +6331,7 @@ test_dataset_builtin_type_conversion(void) if ((native_order = H5Tget_order(DATASET_DATA_BUILTIN_CONVERSION_TEST_MEM_DTYPE)) < 0) { H5_FAILED(); - HDprintf(" couldn't get native byte order\n"); + printf(" couldn't get native byte order\n"); goto error; } if (native_order == H5T_ORDER_LE) @@ -6369,20 +6341,20 @@ test_dataset_builtin_type_conversion(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, DATASET_DATA_BUILTIN_CONVERSION_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container sub-group '%s'\n", DATASET_DATA_VERIFY_WRITE_TEST_GROUP_NAME); + printf(" couldn't create container sub-group '%s'\n", DATASET_DATA_VERIFY_WRITE_TEST_GROUP_NAME); goto error; } @@ -6392,7 +6364,7 @@ test_dataset_builtin_type_conversion(void) if ((dset_id = H5Dcreate2(group_id, DATASET_DATA_BUILTIN_CONVERSION_TEST_DSET_NAME, file_type_id, fspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create dataset '%s'\n", DATASET_DATA_BUILTIN_CONVERSION_TEST_DSET_NAME); + printf(" couldn't create dataset '%s'\n", DATASET_DATA_BUILTIN_CONVERSION_TEST_DSET_NAME); goto error; } @@ -6400,7 +6372,7 @@ test_dataset_builtin_type_conversion(void) data_size *= dims[i]; data_size *= DATASET_DATA_BUILTIN_CONVERSION_TEST_MEM_DTYPESIZE; - if (NULL == (data = HDmalloc(data_size))) + if (NULL == (data = malloc(data_size))) TEST_ERROR; for (i = 0; i < data_size / DATASET_DATA_BUILTIN_CONVERSION_TEST_MEM_DTYPESIZE; i++) @@ -6417,13 +6389,13 @@ test_dataset_builtin_type_conversion(void) if (H5Dwrite(dset_id, DATASET_DATA_BUILTIN_CONVERSION_TEST_MEM_DTYPE, H5S_ALL, H5S_ALL, H5P_DEFAULT, data) < 0) { H5_FAILED(); - HDprintf(" couldn't write to dataset '%s'\n", - DATASET_DATA_BUILTIN_CONVERSION_TEST_DSET_NAME); + printf(" couldn't write to dataset '%s'\n", + DATASET_DATA_BUILTIN_CONVERSION_TEST_DSET_NAME); PART_ERROR(H5Dwrite_all_read); } if (data) { - HDfree(data); + free(data); data = NULL; } @@ -6447,46 +6419,46 @@ test_dataset_builtin_type_conversion(void) if ((dset_id = H5Dopen2(group_id, DATASET_DATA_BUILTIN_CONVERSION_TEST_DSET_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open dataset '%s'\n", DATASET_DATA_BUILTIN_CONVERSION_TEST_DSET_NAME); + printf(" couldn't open dataset '%s'\n", DATASET_DATA_BUILTIN_CONVERSION_TEST_DSET_NAME); PART_ERROR(H5Dwrite_all_read); } if ((fspace_id = H5Dget_space(dset_id)) < 0) { H5_FAILED(); - HDprintf(" couldn't get dataset dataspace\n"); + printf(" couldn't get dataset dataspace\n"); PART_ERROR(H5Dwrite_all_read); } if ((space_npoints = H5Sget_simple_extent_npoints(fspace_id)) < 0) { H5_FAILED(); - HDprintf(" couldn't get dataspace num points\n"); + printf(" couldn't get dataspace num points\n"); PART_ERROR(H5Dwrite_all_read); } - if (NULL == (data = HDmalloc((hsize_t)space_npoints * - DATASET_DATA_BUILTIN_CONVERSION_TEST_MEM_DTYPESIZE))) { + if (NULL == (data = malloc((hsize_t)space_npoints * + DATASET_DATA_BUILTIN_CONVERSION_TEST_MEM_DTYPESIZE))) { H5_FAILED(); - HDprintf(" couldn't allocate buffer for dataset read\n"); + printf(" couldn't allocate buffer for dataset read\n"); PART_ERROR(H5Dwrite_all_read); } if (H5Dread(dset_id, DATASET_DATA_BUILTIN_CONVERSION_TEST_MEM_DTYPE, H5S_ALL, H5S_ALL, H5P_DEFAULT, data) < 0) { H5_FAILED(); - HDprintf(" couldn't read from dataset '%s'\n", - DATASET_DATA_BUILTIN_CONVERSION_TEST_DSET_NAME); + printf(" couldn't read from dataset '%s'\n", + DATASET_DATA_BUILTIN_CONVERSION_TEST_DSET_NAME); PART_ERROR(H5Dwrite_all_read); } for (i = 0; i < (hsize_t)space_npoints; i++) if (((int *)data)[i] != (int)i) { H5_FAILED(); - HDprintf(" H5S_ALL selection data verification failed\n"); + printf(" H5S_ALL selection data verification failed\n"); PART_ERROR(H5Dwrite_all_read); } if (data) { - HDfree(data); + free(data); data = NULL; } @@ -6500,9 +6472,9 @@ test_dataset_builtin_type_conversion(void) data_size = dims[1] * 2 * DATASET_DATA_BUILTIN_CONVERSION_TEST_MEM_DTYPESIZE; - if (NULL == (write_buf = HDmalloc(data_size))) { + if (NULL == (write_buf = malloc(data_size))) { H5_FAILED(); - HDprintf(" couldn't allocate buffer for dataset write\n"); + printf(" couldn't allocate buffer for dataset write\n"); PART_ERROR(H5Dwrite_hyperslab_read); } @@ -6513,17 +6485,17 @@ test_dataset_builtin_type_conversion(void) data_size *= dims[i]; data_size *= DATASET_DATA_BUILTIN_CONVERSION_TEST_MEM_DTYPESIZE; - if (NULL == (data = HDmalloc(data_size))) { + if (NULL == (data = malloc(data_size))) { H5_FAILED(); - HDprintf(" couldn't allocate buffer for dataset data verification\n"); + printf(" couldn't allocate buffer for dataset data verification\n"); PART_ERROR(H5Dwrite_hyperslab_read); } if (H5Dread(dset_id, DATASET_DATA_BUILTIN_CONVERSION_TEST_MEM_DTYPE, H5S_ALL, H5S_ALL, H5P_DEFAULT, data) < 0) { H5_FAILED(); - HDprintf(" couldn't read from dataset '%s'\n", - DATASET_DATA_BUILTIN_CONVERSION_TEST_DSET_NAME); + printf(" couldn't read from dataset '%s'\n", + DATASET_DATA_BUILTIN_CONVERSION_TEST_DSET_NAME); PART_ERROR(H5Dwrite_hyperslab_read); } @@ -6544,7 +6516,7 @@ test_dataset_builtin_type_conversion(void) if (H5Sselect_hyperslab(fspace_id, H5S_SELECT_SET, start, stride, count, block) < 0) { H5_FAILED(); - HDprintf(" couldn't select hyperslab for dataset write\n"); + printf(" couldn't select hyperslab for dataset write\n"); PART_ERROR(H5Dwrite_hyperslab_read); } @@ -6553,7 +6525,7 @@ test_dataset_builtin_type_conversion(void) if ((mspace_id = H5Screate_simple(1, mdims, NULL)) < 0) { H5_FAILED(); - HDprintf(" couldn't create memory dataspace\n"); + printf(" couldn't create memory dataspace\n"); PART_ERROR(H5Dwrite_hyperslab_read); } } @@ -6561,8 +6533,8 @@ test_dataset_builtin_type_conversion(void) if (H5Dwrite(dset_id, DATASET_DATA_BUILTIN_CONVERSION_TEST_MEM_DTYPE, mspace_id, fspace_id, H5P_DEFAULT, write_buf) < 0) { H5_FAILED(); - HDprintf(" couldn't write to dataset '%s'\n", - DATASET_DATA_BUILTIN_CONVERSION_TEST_DSET_NAME); + printf(" couldn't write to dataset '%s'\n", + DATASET_DATA_BUILTIN_CONVERSION_TEST_DSET_NAME); PART_ERROR(H5Dwrite_hyperslab_read); } @@ -6594,55 +6566,55 @@ test_dataset_builtin_type_conversion(void) if ((dset_id = H5Dopen2(group_id, DATASET_DATA_BUILTIN_CONVERSION_TEST_DSET_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open dataset '%s'\n", DATASET_DATA_BUILTIN_CONVERSION_TEST_DSET_NAME); + printf(" couldn't open dataset '%s'\n", DATASET_DATA_BUILTIN_CONVERSION_TEST_DSET_NAME); PART_ERROR(H5Dwrite_hyperslab_read); } if ((fspace_id = H5Dget_space(dset_id)) < 0) { H5_FAILED(); - HDprintf(" couldn't get dataset dataspace\n"); + printf(" couldn't get dataset dataspace\n"); PART_ERROR(H5Dwrite_hyperslab_read); } if ((space_npoints = H5Sget_simple_extent_npoints(fspace_id)) < 0) { H5_FAILED(); - HDprintf(" couldn't get dataspace num points\n"); + printf(" couldn't get dataspace num points\n"); PART_ERROR(H5Dwrite_hyperslab_read); } - if (NULL == (read_buf = HDmalloc((hsize_t)space_npoints * - DATASET_DATA_BUILTIN_CONVERSION_TEST_MEM_DTYPESIZE))) { + if (NULL == (read_buf = malloc((hsize_t)space_npoints * + DATASET_DATA_BUILTIN_CONVERSION_TEST_MEM_DTYPESIZE))) { H5_FAILED(); - HDprintf(" couldn't allocate buffer for dataset read\n"); + printf(" couldn't allocate buffer for dataset read\n"); PART_ERROR(H5Dwrite_hyperslab_read); } if (H5Dread(dset_id, DATASET_DATA_BUILTIN_CONVERSION_TEST_MEM_DTYPE, H5S_ALL, H5S_ALL, H5P_DEFAULT, read_buf) < 0) { H5_FAILED(); - HDprintf(" couldn't read from dataset '%s'\n", - DATASET_DATA_BUILTIN_CONVERSION_TEST_DSET_NAME); + printf(" couldn't read from dataset '%s'\n", + DATASET_DATA_BUILTIN_CONVERSION_TEST_DSET_NAME); PART_ERROR(H5Dwrite_hyperslab_read); } if (memcmp(data, read_buf, data_size)) { H5_FAILED(); - HDprintf(" hyperslab selection data verification failed\n"); + printf(" hyperslab selection data verification failed\n"); PART_ERROR(H5Dwrite_hyperslab_read); } if (data) { - HDfree(data); + free(data); data = NULL; } if (write_buf) { - HDfree(write_buf); + free(write_buf); write_buf = NULL; } if (read_buf) { - HDfree(read_buf); + free(read_buf); read_buf = NULL; } @@ -6657,9 +6629,9 @@ test_dataset_builtin_type_conversion(void) data_size = DATASET_DATA_BUILTIN_CONVERSION_TEST_NUM_POINTS * DATASET_DATA_BUILTIN_CONVERSION_TEST_MEM_DTYPESIZE; - if (NULL == (write_buf = HDmalloc(data_size))) { + if (NULL == (write_buf = malloc(data_size))) { H5_FAILED(); - HDprintf(" couldn't allocate buffer for dataset write\n"); + printf(" couldn't allocate buffer for dataset write\n"); PART_ERROR(H5Dwrite_point_sel_read); } @@ -6670,17 +6642,17 @@ test_dataset_builtin_type_conversion(void) data_size *= dims[i]; data_size *= DATASET_DATA_BUILTIN_CONVERSION_TEST_MEM_DTYPESIZE; - if (NULL == (data = HDmalloc(data_size))) { + if (NULL == (data = malloc(data_size))) { H5_FAILED(); - HDprintf(" couldn't allocate buffer for dataset data verification\n"); + printf(" couldn't allocate buffer for dataset data verification\n"); PART_ERROR(H5Dwrite_point_sel_read); } if (H5Dread(dset_id, DATASET_DATA_BUILTIN_CONVERSION_TEST_MEM_DTYPE, H5S_ALL, H5S_ALL, H5P_DEFAULT, data) < 0) { H5_FAILED(); - HDprintf(" couldn't read from dataset '%s'\n", - DATASET_DATA_BUILTIN_CONVERSION_TEST_DSET_NAME); + printf(" couldn't read from dataset '%s'\n", + DATASET_DATA_BUILTIN_CONVERSION_TEST_DSET_NAME); PART_ERROR(H5Dwrite_point_sel_read); } @@ -6708,7 +6680,7 @@ test_dataset_builtin_type_conversion(void) if (H5Sselect_elements(fspace_id, H5S_SELECT_SET, DATASET_DATA_BUILTIN_CONVERSION_TEST_NUM_POINTS, points) < 0) { H5_FAILED(); - HDprintf(" couldn't select elements in dataspace\n"); + printf(" couldn't select elements in dataspace\n"); PART_ERROR(H5Dwrite_point_sel_read); } @@ -6717,7 +6689,7 @@ test_dataset_builtin_type_conversion(void) if ((mspace_id = H5Screate_simple(1, mdims, NULL)) < 0) { H5_FAILED(); - HDprintf(" couldn't create memory dataspace\n"); + printf(" couldn't create memory dataspace\n"); PART_ERROR(H5Dwrite_point_sel_read); } } @@ -6725,8 +6697,8 @@ test_dataset_builtin_type_conversion(void) if (H5Dwrite(dset_id, DATASET_DATA_BUILTIN_CONVERSION_TEST_MEM_DTYPE, mspace_id, fspace_id, H5P_DEFAULT, write_buf) < 0) { H5_FAILED(); - HDprintf(" couldn't write to dataset '%s'\n", - DATASET_DATA_BUILTIN_CONVERSION_TEST_DSET_NAME); + printf(" couldn't write to dataset '%s'\n", + DATASET_DATA_BUILTIN_CONVERSION_TEST_DSET_NAME); PART_ERROR(H5Dwrite_point_sel_read); } @@ -6758,40 +6730,40 @@ test_dataset_builtin_type_conversion(void) if ((dset_id = H5Dopen2(group_id, DATASET_DATA_BUILTIN_CONVERSION_TEST_DSET_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open dataset '%s'\n", DATASET_DATA_BUILTIN_CONVERSION_TEST_DSET_NAME); + printf(" couldn't open dataset '%s'\n", DATASET_DATA_BUILTIN_CONVERSION_TEST_DSET_NAME); PART_ERROR(H5Dwrite_point_sel_read); } if ((fspace_id = H5Dget_space(dset_id)) < 0) { H5_FAILED(); - HDprintf(" couldn't get dataset dataspace\n"); + printf(" couldn't get dataset dataspace\n"); PART_ERROR(H5Dwrite_point_sel_read); } if ((space_npoints = H5Sget_simple_extent_npoints(fspace_id)) < 0) { H5_FAILED(); - HDprintf(" couldn't get dataspace num points\n"); + printf(" couldn't get dataspace num points\n"); PART_ERROR(H5Dwrite_point_sel_read); } - if (NULL == (read_buf = HDmalloc((hsize_t)space_npoints * - DATASET_DATA_BUILTIN_CONVERSION_TEST_MEM_DTYPESIZE))) { + if (NULL == (read_buf = malloc((hsize_t)space_npoints * + DATASET_DATA_BUILTIN_CONVERSION_TEST_MEM_DTYPESIZE))) { H5_FAILED(); - HDprintf(" couldn't allocate buffer for dataset read\n"); + printf(" couldn't allocate buffer for dataset read\n"); PART_ERROR(H5Dwrite_point_sel_read); } if (H5Dread(dset_id, DATASET_DATA_BUILTIN_CONVERSION_TEST_MEM_DTYPE, H5S_ALL, H5S_ALL, H5P_DEFAULT, read_buf) < 0) { H5_FAILED(); - HDprintf(" couldn't read from dataset '%s'\n", - DATASET_DATA_BUILTIN_CONVERSION_TEST_DSET_NAME); + printf(" couldn't read from dataset '%s'\n", + DATASET_DATA_BUILTIN_CONVERSION_TEST_DSET_NAME); PART_ERROR(H5Dwrite_point_sel_read); } if (memcmp(data, read_buf, data_size)) { H5_FAILED(); - HDprintf(" point selection data verification failed\n"); + printf(" point selection data verification failed\n"); PART_ERROR(H5Dwrite_point_sel_read); } @@ -6804,17 +6776,17 @@ test_dataset_builtin_type_conversion(void) TESTING_2("test cleanup"); if (data) { - HDfree(data); + free(data); data = NULL; } if (write_buf) { - HDfree(write_buf); + free(write_buf); write_buf = NULL; } if (read_buf) { - HDfree(read_buf); + free(read_buf); read_buf = NULL; } @@ -6837,11 +6809,11 @@ error: H5E_BEGIN_TRY { if (data) - HDfree(data); + free(data); if (write_buf) - HDfree(write_buf); + free(write_buf); if (read_buf) - HDfree(read_buf); + free(read_buf); H5Sclose(mspace_id); H5Sclose(fspace_id); H5Dclose(dset_id); @@ -6887,8 +6859,7 @@ test_dataset_compound_partial_io(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC)) { SKIPPED(); - HDprintf( - " API functions for basic file, group, or dataset aren't supported with this connector\n"); + printf(" API functions for basic file, group, or dataset aren't supported with this connector\n"); return 0; } @@ -6896,21 +6867,21 @@ test_dataset_compound_partial_io(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, DATASET_DATA_COMPOUND_PARTIAL_IO_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container sub-group '%s'\n", - DATASET_DATA_COMPOUND_PARTIAL_IO_TEST_GROUP_NAME); + printf(" couldn't create container sub-group '%s'\n", + DATASET_DATA_COMPOUND_PARTIAL_IO_TEST_GROUP_NAME); goto error; } @@ -6937,7 +6908,7 @@ test_dataset_compound_partial_io(void) if ((dset_id = H5Dcreate2(group_id, DATASET_DATA_COMPOUND_PARTIAL_IO_TEST_DSET_NAME, full_type_id, space_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create dataset '%s'\n", DATASET_DATA_COMPOUND_PARTIAL_IO_TEST_DSET_NAME); + printf(" couldn't create dataset '%s'\n", DATASET_DATA_COMPOUND_PARTIAL_IO_TEST_DSET_NAME); goto error; } @@ -7144,28 +7115,28 @@ test_dataset_set_extent_chunked_unlimited(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_MORE)) { SKIPPED(); - HDprintf(" API functions for basic file, group, basic or more dataset aren't supported with this " - "connector\n"); + printf(" API functions for basic file, group, basic or more dataset aren't supported with this " + "connector\n"); return 0; } if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, DATASET_SET_EXTENT_CHUNKED_UNLIMITED_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container sub-group '%s'\n", - DATASET_SET_EXTENT_CHUNKED_UNLIMITED_TEST_GROUP_NAME); + printf(" couldn't create container sub-group '%s'\n", + DATASET_SET_EXTENT_CHUNKED_UNLIMITED_TEST_GROUP_NAME); goto error; } @@ -7186,14 +7157,14 @@ test_dataset_set_extent_chunked_unlimited(void) if (H5Pset_chunk(dcpl_id, DATASET_SET_EXTENT_CHUNKED_UNLIMITED_TEST_SPACE_RANK, chunk_dims) < 0) { H5_FAILED(); - HDprintf(" unable to set dataset chunk dimensionality\n"); + printf(" unable to set dataset chunk dimensionality\n"); goto error; } if ((dset_id = H5Dcreate2(group_id, DATASET_SET_EXTENT_CHUNKED_UNLIMITED_TEST_DSET_NAME, dset_dtype, fspace_id, H5P_DEFAULT, dcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create dataset '%s'\n", DATASET_SET_EXTENT_CHUNKED_UNLIMITED_TEST_DSET_NAME); + printf(" couldn't create dataset '%s'\n", DATASET_SET_EXTENT_CHUNKED_UNLIMITED_TEST_DSET_NAME); goto error; } @@ -7209,7 +7180,7 @@ test_dataset_set_extent_chunked_unlimited(void) if (H5Dset_extent(dset_id, new_dims) < 0) { H5_FAILED(); - HDprintf(" failed to set dataset extent\n"); + printf(" failed to set dataset extent\n"); goto error; } @@ -7221,13 +7192,13 @@ test_dataset_set_extent_chunked_unlimited(void) if ((fspace_id = H5Dget_space(dset_id)) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve dataset's dataspace\n"); + printf(" failed to retrieve dataset's dataspace\n"); goto error; } if (H5Sget_simple_extent_dims(fspace_id, new_dims, NULL) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve dataset dimensionality\n"); + printf(" failed to retrieve dataset dimensionality\n"); goto error; } @@ -7237,7 +7208,7 @@ test_dataset_set_extent_chunked_unlimited(void) for (j = 0; j < DATASET_SET_EXTENT_CHUNKED_UNLIMITED_TEST_SPACE_RANK; j++) { if (dims[j] == new_dims[j]) { H5_FAILED(); - HDprintf(" dataset dimension %llu wasn't changed!\n", (unsigned long long)j); + printf(" dataset dimension %llu wasn't changed!\n", (unsigned long long)j); goto error; } } @@ -7246,7 +7217,7 @@ test_dataset_set_extent_chunked_unlimited(void) * Remember the current dimensionality of the dataset before * changing them again. */ - HDmemcpy(dims, new_dims, sizeof(new_dims)); + memcpy(dims, new_dims, sizeof(new_dims)); } /* @@ -7265,7 +7236,7 @@ test_dataset_set_extent_chunked_unlimited(void) if (H5Dset_extent(dset_id, new_dims) < 0) { H5_FAILED(); - HDprintf(" failed to set dataset extent\n"); + printf(" failed to set dataset extent\n"); goto error; } @@ -7280,20 +7251,19 @@ test_dataset_set_extent_chunked_unlimited(void) if ((dset_id = H5Dopen2(group_id, DATASET_SET_EXTENT_CHUNKED_UNLIMITED_TEST_DSET_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" failed to open dataset '%s'\n", - DATASET_SET_EXTENT_CHUNKED_UNLIMITED_TEST_DSET_NAME); + printf(" failed to open dataset '%s'\n", DATASET_SET_EXTENT_CHUNKED_UNLIMITED_TEST_DSET_NAME); goto error; } if ((fspace_id = H5Dget_space(dset_id)) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve dataset's dataspace\n"); + printf(" failed to retrieve dataset's dataspace\n"); goto error; } if (H5Sget_simple_extent_dims(fspace_id, new_dims, NULL) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve dataset dimensionality\n"); + printf(" failed to retrieve dataset dimensionality\n"); goto error; } @@ -7303,7 +7273,7 @@ test_dataset_set_extent_chunked_unlimited(void) for (j = 0; j < DATASET_SET_EXTENT_CHUNKED_UNLIMITED_TEST_SPACE_RANK; j++) { if (dims[j] == new_dims[j]) { H5_FAILED(); - HDprintf(" dataset dimension %llu wasn't changed!\n", (unsigned long long)j); + printf(" dataset dimension %llu wasn't changed!\n", (unsigned long long)j); goto error; } } @@ -7312,7 +7282,7 @@ test_dataset_set_extent_chunked_unlimited(void) * Remember the current dimensionality of the dataset before * changing them again. */ - HDmemcpy(dims, new_dims, sizeof(new_dims)); + memcpy(dims, new_dims, sizeof(new_dims)); } if (H5Pclose(dcpl_id) < 0) @@ -7377,28 +7347,28 @@ test_dataset_set_extent_chunked_fixed(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_MORE)) { SKIPPED(); - HDprintf(" API functions for basic file, group, basic or more dataset aren't supported with this " - "connector\n"); + printf(" API functions for basic file, group, basic or more dataset aren't supported with this " + "connector\n"); return 0; } if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, DATASET_SET_EXTENT_CHUNKED_FIXED_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container sub-group '%s'\n", - DATASET_SET_EXTENT_CHUNKED_FIXED_TEST_GROUP_NAME); + printf(" couldn't create container sub-group '%s'\n", + DATASET_SET_EXTENT_CHUNKED_FIXED_TEST_GROUP_NAME); goto error; } @@ -7423,7 +7393,7 @@ test_dataset_set_extent_chunked_fixed(void) if (H5Pset_chunk(dcpl_id, DATASET_SET_EXTENT_CHUNKED_FIXED_TEST_SPACE_RANK, chunk_dims) < 0) { H5_FAILED(); - HDprintf(" unable to set dataset chunk dimensionality\n"); + printf(" unable to set dataset chunk dimensionality\n"); goto error; } @@ -7435,14 +7405,14 @@ test_dataset_set_extent_chunked_fixed(void) if ((dset_id = H5Dcreate2(group_id, DATASET_SET_EXTENT_CHUNKED_FIXED_TEST_DSET_NAME, dset_dtype, fspace_id, H5P_DEFAULT, dcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create dataset '%s'\n", DATASET_SET_EXTENT_CHUNKED_FIXED_TEST_DSET_NAME); + printf(" couldn't create dataset '%s'\n", DATASET_SET_EXTENT_CHUNKED_FIXED_TEST_DSET_NAME); goto error; } if ((dset_id2 = H5Dcreate2(group_id, DATASET_SET_EXTENT_CHUNKED_FIXED_TEST_DSET_NAME2, dset_dtype, fspace_id2, H5P_DEFAULT, dcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create dataset '%s'\n", DATASET_SET_EXTENT_CHUNKED_FIXED_TEST_DSET_NAME2); + printf(" couldn't create dataset '%s'\n", DATASET_SET_EXTENT_CHUNKED_FIXED_TEST_DSET_NAME2); goto error; } @@ -7471,7 +7441,7 @@ test_dataset_set_extent_chunked_fixed(void) if (H5Dset_extent(dset_id, new_dims) < 0) { H5_FAILED(); - HDprintf(" failed to set dataset extent\n"); + printf(" failed to set dataset extent\n"); goto error; } @@ -7483,13 +7453,13 @@ test_dataset_set_extent_chunked_fixed(void) if ((fspace_id = H5Dget_space(dset_id)) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve dataset's dataspace\n"); + printf(" failed to retrieve dataset's dataspace\n"); goto error; } if (H5Sget_simple_extent_dims(fspace_id, new_dims, NULL) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve dataset dimensionality\n"); + printf(" failed to retrieve dataset dimensionality\n"); goto error; } @@ -7499,7 +7469,7 @@ test_dataset_set_extent_chunked_fixed(void) for (j = 0; j < DATASET_SET_EXTENT_CHUNKED_FIXED_TEST_SPACE_RANK; j++) { if (dims[j] == new_dims[j]) { H5_FAILED(); - HDprintf(" dataset dimension %llu wasn't changed!\n", (unsigned long long)j); + printf(" dataset dimension %llu wasn't changed!\n", (unsigned long long)j); goto error; } } @@ -7508,7 +7478,7 @@ test_dataset_set_extent_chunked_fixed(void) * Remember the current dimensionality of the dataset before * changing them again. */ - HDmemcpy(dims, new_dims, sizeof(new_dims)); + memcpy(dims, new_dims, sizeof(new_dims)); } /* @@ -7540,7 +7510,7 @@ test_dataset_set_extent_chunked_fixed(void) if (H5Dset_extent(dset_id2, new_dims) < 0) { H5_FAILED(); - HDprintf(" failed to set dataset extent2\n"); + printf(" failed to set dataset extent2\n"); goto error; } @@ -7555,19 +7525,19 @@ test_dataset_set_extent_chunked_fixed(void) if ((dset_id2 = H5Dopen2(group_id, DATASET_SET_EXTENT_CHUNKED_FIXED_TEST_DSET_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" failed to open dataset '%s'\n", DATASET_SET_EXTENT_CHUNKED_FIXED_TEST_DSET_NAME2); + printf(" failed to open dataset '%s'\n", DATASET_SET_EXTENT_CHUNKED_FIXED_TEST_DSET_NAME2); goto error; } if ((fspace_id2 = H5Dget_space(dset_id2)) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve dataset's dataspace\n"); + printf(" failed to retrieve dataset's dataspace\n"); goto error; } if (H5Sget_simple_extent_dims(fspace_id2, new_dims, NULL) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve dataset dimensionality\n"); + printf(" failed to retrieve dataset dimensionality\n"); goto error; } @@ -7577,7 +7547,7 @@ test_dataset_set_extent_chunked_fixed(void) for (j = 0; j < DATASET_SET_EXTENT_CHUNKED_FIXED_TEST_SPACE_RANK; j++) { if (dims2[j] == new_dims[j]) { H5_FAILED(); - HDprintf(" dataset dimension %llu wasn't changed!\n", (unsigned long long)j); + printf(" dataset dimension %llu wasn't changed!\n", (unsigned long long)j); goto error; } } @@ -7586,7 +7556,7 @@ test_dataset_set_extent_chunked_fixed(void) * Remember the current dimensionality of the dataset before * changing them again. */ - HDmemcpy(dims2, new_dims, sizeof(new_dims)); + memcpy(dims2, new_dims, sizeof(new_dims)); } if (H5Pclose(dcpl_id) < 0) @@ -7666,8 +7636,8 @@ test_dataset_set_extent_data(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_MORE)) { SKIPPED(); - HDprintf(" API functions for basic file, group, basic or more dataset aren't supported with this " - "connector\n"); + printf(" API functions for basic file, group, basic or more dataset aren't supported with this " + "connector\n"); return 0; } @@ -7675,20 +7645,20 @@ test_dataset_set_extent_data(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, DATASET_SET_EXTENT_DATA_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container sub-group '%s'\n", DATASET_SET_EXTENT_DATA_TEST_GROUP_NAME); + printf(" couldn't create container sub-group '%s'\n", DATASET_SET_EXTENT_DATA_TEST_GROUP_NAME); goto error; } @@ -7700,14 +7670,14 @@ test_dataset_set_extent_data(void) if (H5Pset_chunk(dcpl_id, DATASET_SET_EXTENT_DATA_TEST_SPACE_RANK, dims_chunk) < 0) { H5_FAILED(); - HDprintf(" unable to set dataset chunk dimensionality\n"); + printf(" unable to set dataset chunk dimensionality\n"); goto error; } if ((dset_id = H5Dcreate2(group_id, DATASET_SET_EXTENT_DATA_TEST_DSET_NAME, H5T_NATIVE_INT, fspace_id, H5P_DEFAULT, dcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create dataset '%s'\n", DATASET_SET_EXTENT_DATA_TEST_DSET_NAME); + printf(" couldn't create dataset '%s'\n", DATASET_SET_EXTENT_DATA_TEST_DSET_NAME); goto error; } @@ -7766,15 +7736,15 @@ test_dataset_set_extent_data(void) if (i >= (int)dims_origin[0] || j >= (int)dims_origin[1]) { if (buf_expand[i][j] != 0) { H5_FAILED(); - HDprintf(" buf_expand[%d][%d] = %d. It should be 0\n", i, j, buf_expand[i][j]); + printf(" buf_expand[%d][%d] = %d. It should be 0\n", i, j, buf_expand[i][j]); PART_ERROR(H5Dset_extent_data_expand); } } else { if (buf_expand[i][j] != buf_origin[i][j]) { H5_FAILED(); - HDprintf(" buf_expand[%d][%d] = %d. It should be %d\n", i, j, buf_expand[i][j], - buf_origin[i][j]); + printf(" buf_expand[%d][%d] = %d. It should be %d\n", i, j, buf_expand[i][j], + buf_origin[i][j]); PART_ERROR(H5Dset_extent_data_expand); } } @@ -7807,8 +7777,8 @@ test_dataset_set_extent_data(void) for (j = 0; j < (int)dims_shrink[1]; j++) { if (buf_shrink[i][j] != buf_origin[i][j]) { H5_FAILED(); - HDprintf(" buf_shrink[%d][%d] = %d. It should be %d\n", i, j, buf_shrink[i][j], - buf_origin[i][j]); + printf(" buf_shrink[%d][%d] = %d. It should be %d\n", i, j, buf_shrink[i][j], + buf_origin[i][j]); PART_ERROR(H5Dset_extent_data_shrink); } } @@ -7844,16 +7814,15 @@ test_dataset_set_extent_data(void) if (i >= (int)dims_shrink[0] || j >= (int)dims_shrink[1]) { if (buf_expand2[i][j] != 0) { H5_FAILED(); - HDprintf(" buf_expand2[%d][%d] = %d. It should be 0\n", i, j, - buf_expand2[i][j]); + printf(" buf_expand2[%d][%d] = %d. It should be 0\n", i, j, buf_expand2[i][j]); PART_ERROR(H5Dset_extent_data_expand_to_origin); } } else { if (buf_expand2[i][j] != buf_origin[i][j]) { H5_FAILED(); - HDprintf(" buf_expand2[%d][%d] = %d. It should be %d.\n", i, j, - buf_expand2[i][j], buf_origin[i][j]); + printf(" buf_expand2[%d][%d] = %d. It should be %d.\n", i, j, + buf_expand2[i][j], buf_origin[i][j]); PART_ERROR(H5Dset_extent_data_expand_to_origin); } } @@ -7889,8 +7858,8 @@ test_dataset_set_extent_data(void) for (i = 0; i < DATASET_SET_EXTENT_DATA_TEST_SPACE_RANK; i++) if (dims_out[i] != 0) { H5_FAILED(); - HDprintf(" dims_out[%d] = %llu. It should be 0.\n", i, - (long long unsigned int)dims_out[i]); + printf(" dims_out[%d] = %llu. It should be 0.\n", i, + (long long unsigned int)dims_out[i]); PART_ERROR(H5Dset_extent_data_shrink_to_zero); } @@ -7923,7 +7892,7 @@ test_dataset_set_extent_data(void) for (j = 0; j < (int)dims_origin[1]; j++) { if (buf_expand2[i][j] != 0) { H5_FAILED(); - HDprintf(" buf_expand2[%d][%d] = %d. It should be 0.\n", i, j, buf_expand2[i][j]); + printf(" buf_expand2[%d][%d] = %d. It should be 0.\n", i, j, buf_expand2[i][j]); PART_ERROR(H5Dset_extent_data_expand_to_origin_again); } } @@ -8001,27 +7970,27 @@ test_dataset_set_extent_double_handles(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_MORE)) { SKIPPED(); - HDprintf(" API functions for basic file, group, basic or more dataset aren't supported with this " - "connector\n"); + printf(" API functions for basic file, group, basic or more dataset aren't supported with this " + "connector\n"); return 0; } if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, DATASET_SET_EXTENT_DOUBLE_HANDLES_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container sub-group '%s'\n", DATASET_SET_EXTENT_DATA_TEST_GROUP_NAME); + printf(" couldn't create container sub-group '%s'\n", DATASET_SET_EXTENT_DATA_TEST_GROUP_NAME); goto error; } @@ -8034,7 +8003,7 @@ test_dataset_set_extent_double_handles(void) if (H5Pset_chunk(dcpl_id, DATASET_SET_EXTENT_DOUBLE_HANDLES_TEST_SPACE_RANK, dims_chunk) < 0) { H5_FAILED(); - HDprintf(" unable to set dataset chunk dimensionality\n"); + printf(" unable to set dataset chunk dimensionality\n"); goto error; } @@ -8042,14 +8011,14 @@ test_dataset_set_extent_double_handles(void) if ((dset_id = H5Dcreate2(group_id, DATASET_SET_EXTENT_DOUBLE_HANDLES_TEST_DSET_NAME, H5T_NATIVE_INT, fspace_id, H5P_DEFAULT, dcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create dataset '%s'\n", DATASET_SET_EXTENT_DOUBLE_HANDLES_TEST_DSET_NAME); + printf(" couldn't create dataset '%s'\n", DATASET_SET_EXTENT_DOUBLE_HANDLES_TEST_DSET_NAME); goto error; } /* Open the same dataset again */ if ((dset_id2 = H5Dopen2(group_id, DATASET_SET_EXTENT_DOUBLE_HANDLES_TEST_DSET_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open dataset '%s'\n", DATASET_SET_EXTENT_DOUBLE_HANDLES_TEST_DSET_NAME); + printf(" couldn't open dataset '%s'\n", DATASET_SET_EXTENT_DOUBLE_HANDLES_TEST_DSET_NAME); goto error; } @@ -8071,8 +8040,8 @@ test_dataset_set_extent_double_handles(void) for (i = 0; i < DATASET_SET_EXTENT_DOUBLE_HANDLES_TEST_SPACE_RANK; i++) if (dims_out[i] != dims_expand[i]) { H5_FAILED(); - HDprintf(" dims_out[%d] = %" PRIuHSIZE ". It should be %" PRIuHSIZE ".\n", i, dims_out[i], - dims_expand[i]); + printf(" dims_out[%d] = %" PRIuHSIZE ". It should be %" PRIuHSIZE ".\n", i, dims_out[i], + dims_expand[i]); goto error; } @@ -8141,8 +8110,8 @@ test_dataset_set_extent_invalid_params(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_MORE)) { SKIPPED(); - HDprintf(" API functions for basic file, group, basic or more dataset aren't supported with this " - "connector\n"); + printf(" API functions for basic file, group, basic or more dataset aren't supported with this " + "connector\n"); return 0; } @@ -8150,14 +8119,14 @@ test_dataset_set_extent_invalid_params(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } /** for DAOS VOL, this test is problematic since auto chunking can be selected, so skip for now */ if (H5VLget_connector_name(file_id, vol_name, 5) < 0) { H5_FAILED(); - HDprintf(" couldn't get VOL connector name\n"); + printf(" couldn't get VOL connector name\n"); goto error; } if (strcmp(vol_name, "daos") == 0) { @@ -8169,15 +8138,15 @@ test_dataset_set_extent_invalid_params(void) if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, DATASET_SET_EXTENT_INVALID_PARAMS_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container sub-group '%s'\n", - DATASET_SET_EXTENT_INVALID_PARAMS_TEST_GROUP_NAME); + printf(" couldn't create container sub-group '%s'\n", + DATASET_SET_EXTENT_INVALID_PARAMS_TEST_GROUP_NAME); goto error; } @@ -8213,8 +8182,8 @@ test_dataset_set_extent_invalid_params(void) H5Dcreate2(group_id, DATASET_SET_EXTENT_INVALID_LAYOUT_TEST_COMPACT_DSET_NAME, H5T_NATIVE_INT, compact_fspace_id, H5P_DEFAULT, compact_dcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create dataset '%s'\n", - DATASET_SET_EXTENT_INVALID_LAYOUT_TEST_COMPACT_DSET_NAME); + printf(" couldn't create dataset '%s'\n", + DATASET_SET_EXTENT_INVALID_LAYOUT_TEST_COMPACT_DSET_NAME); goto error; } @@ -8229,8 +8198,8 @@ test_dataset_set_extent_invalid_params(void) H5Dcreate2(group_id, DATASET_SET_EXTENT_INVALID_LAYOUT_TEST_CONTIGUOUS_DSET_NAME, dset_dtype, fspace_id, H5P_DEFAULT, contiguous_dcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create dataset '%s'\n", - DATASET_SET_EXTENT_INVALID_LAYOUT_TEST_CONTIGUOUS_DSET_NAME); + printf(" couldn't create dataset '%s'\n", + DATASET_SET_EXTENT_INVALID_LAYOUT_TEST_CONTIGUOUS_DSET_NAME); goto error; } @@ -8240,14 +8209,14 @@ test_dataset_set_extent_invalid_params(void) if (H5Pset_chunk(chunked_dcpl_id, DATASET_SET_EXTENT_INVALID_PARAMS_TEST_SPACE_RANK, chunk_dims) < 0) { H5_FAILED(); - HDprintf(" unable to set dataset chunk dimensionality\n"); + printf(" unable to set dataset chunk dimensionality\n"); goto error; } if ((chunked_dset_id = H5Dcreate2(group_id, DATASET_SET_EXTENT_INVALID_PARAMS_TEST_DSET_NAME, dset_dtype, fspace_id, H5P_DEFAULT, chunked_dcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create dataset '%s'\n", DATASET_SET_EXTENT_INVALID_PARAMS_TEST_DSET_NAME); + printf(" couldn't create dataset '%s'\n", DATASET_SET_EXTENT_INVALID_PARAMS_TEST_DSET_NAME); goto error; } @@ -8267,7 +8236,7 @@ test_dataset_set_extent_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" setting dataset extent succeeded with an invalid layout (compact)\n"); + printf(" setting dataset extent succeeded with an invalid layout (compact)\n"); PART_ERROR(H5Dset_extent_invalid_layout_compact); } @@ -8287,7 +8256,7 @@ test_dataset_set_extent_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" setting dataset extent succeeded with an invalid layout (contiguous)\n"); + printf(" setting dataset extent succeeded with an invalid layout (contiguous)\n"); PART_ERROR(H5Dset_extent_invalid_layout_contiguous); } @@ -8307,7 +8276,7 @@ test_dataset_set_extent_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" setting dataset extent succeeded with an invalid dataset ID\n"); + printf(" setting dataset extent succeeded with an invalid dataset ID\n"); PART_ERROR(H5Dset_extent_invalid_dset_id); } @@ -8327,7 +8296,7 @@ test_dataset_set_extent_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" setting dataset extent succeeded with a NULL dimension pointer\n"); + printf(" setting dataset extent succeeded with a NULL dimension pointer\n"); PART_ERROR(H5Dset_extent_null_dim_pointer); } @@ -8465,27 +8434,27 @@ test_create_single_chunk_dataset(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GET_PLIST)) { SKIPPED(); - HDprintf(" API functions for basic file, group, dataset, or get property list aren't supported " - "with this connector\n"); + printf(" API functions for basic file, group, dataset, or get property list aren't supported " + "with this connector\n"); return 0; } if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, DATASET_SINGLE_CHUNK_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container sub-group '%s'\n", DATASET_SINGLE_CHUNK_TEST_GROUP_NAME); + printf(" couldn't create container sub-group '%s'\n", DATASET_SINGLE_CHUNK_TEST_GROUP_NAME); goto error; } @@ -8499,14 +8468,14 @@ test_create_single_chunk_dataset(void) if (H5Pset_chunk(dcpl_id, DATASET_SINGLE_CHUNK_TEST_SPACE_RANK, dims) < 0) { H5_FAILED(); - HDprintf(" failed to set chunking on DCPL\n"); + printf(" failed to set chunking on DCPL\n"); goto error; } if ((dset_id = H5Dcreate2(group_id, DATASET_SINGLE_CHUNK_TEST_DSET_NAME, dset_dtype, fspace_id, H5P_DEFAULT, dcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create dataset '%s'\n", DATASET_SINGLE_CHUNK_TEST_DSET_NAME); + printf(" couldn't create dataset '%s'\n", DATASET_SINGLE_CHUNK_TEST_DSET_NAME); goto error; } @@ -8515,28 +8484,28 @@ test_create_single_chunk_dataset(void) */ if (H5Pclose(dcpl_id) < 0) { H5_FAILED(); - HDprintf(" failed to close DCPL\n"); + printf(" failed to close DCPL\n"); goto error; } if ((dcpl_id = H5Dget_create_plist(dset_id)) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve copy of DCPL\n"); + printf(" failed to retrieve copy of DCPL\n"); goto error; } memset(retrieved_chunk_dims, 0, sizeof(retrieved_chunk_dims)); if (H5Pget_chunk(dcpl_id, DATASET_SINGLE_CHUNK_TEST_SPACE_RANK, retrieved_chunk_dims) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve chunking info\n"); + printf(" failed to retrieve chunking info\n"); goto error; } for (i = 0; i < DATASET_SINGLE_CHUNK_TEST_SPACE_RANK; i++) { if (dims[i] != retrieved_chunk_dims[i]) { H5_FAILED(); - HDprintf(" chunk dimensionality retrieved from DCPL didn't match originally specified " - "dimensionality\n"); + printf(" chunk dimensionality retrieved from DCPL didn't match originally specified " + "dimensionality\n"); goto error; } } @@ -8547,40 +8516,40 @@ test_create_single_chunk_dataset(void) */ if (H5Pclose(dcpl_id) < 0) { H5_FAILED(); - HDprintf(" failed to close DCPL\n"); + printf(" failed to close DCPL\n"); goto error; } if (H5Dclose(dset_id) < 0) { H5_FAILED(); - HDprintf(" failed to close dataset\n"); + printf(" failed to close dataset\n"); goto error; } if ((dset_id = H5Dopen2(group_id, DATASET_SINGLE_CHUNK_TEST_DSET_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" failed to re-open dataset\n"); + printf(" failed to re-open dataset\n"); goto error; } if ((dcpl_id = H5Dget_create_plist(dset_id)) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve copy of DCPL\n"); + printf(" failed to retrieve copy of DCPL\n"); goto error; } memset(retrieved_chunk_dims, 0, sizeof(retrieved_chunk_dims)); if (H5Pget_chunk(dcpl_id, DATASET_SINGLE_CHUNK_TEST_SPACE_RANK, retrieved_chunk_dims) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve chunking info\n"); + printf(" failed to retrieve chunking info\n"); goto error; } for (i = 0; i < DATASET_SINGLE_CHUNK_TEST_SPACE_RANK; i++) { if (dims[i] != retrieved_chunk_dims[i]) { H5_FAILED(); - HDprintf(" chunk dimensionality retrieved from DCPL didn't match originally specified " - "dimensionality\n"); + printf(" chunk dimensionality retrieved from DCPL didn't match originally specified " + "dimensionality\n"); goto error; } } @@ -8646,28 +8615,27 @@ test_write_single_chunk_dataset(void) !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_MORE) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GET_PLIST)) { SKIPPED(); - HDprintf(" API functions for basic file, group, dataset, or get property list aren't supported " - "with this connector\n"); + printf(" API functions for basic file, group, dataset, or get property list aren't supported " + "with this connector\n"); return 0; } if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, DATASET_SINGLE_CHUNK_WRITE_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container sub-group '%s'\n", - DATASET_SINGLE_CHUNK_WRITE_TEST_GROUP_NAME); + printf(" couldn't create container sub-group '%s'\n", DATASET_SINGLE_CHUNK_WRITE_TEST_GROUP_NAME); goto error; } @@ -8680,7 +8648,7 @@ test_write_single_chunk_dataset(void) if (H5Pset_chunk(dcpl_id, DATASET_SINGLE_CHUNK_WRITE_TEST_DSET_SPACE_RANK, dims) < 0) { H5_FAILED(); - HDprintf(" failed to set chunking on DCPL\n"); + printf(" failed to set chunking on DCPL\n"); goto error; } @@ -8688,7 +8656,7 @@ test_write_single_chunk_dataset(void) DATASET_SINGLE_CHUNK_WRITE_TEST_DSET_DTYPE, fspace_id, H5P_DEFAULT, dcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create dataset '%s'\n", DATASET_SINGLE_CHUNK_WRITE_TEST_DSET_NAME); + printf(" couldn't create dataset '%s'\n", DATASET_SINGLE_CHUNK_WRITE_TEST_DSET_NAME); goto error; } @@ -8697,28 +8665,28 @@ test_write_single_chunk_dataset(void) */ if (H5Pclose(dcpl_id) < 0) { H5_FAILED(); - HDprintf(" failed to close DCPL\n"); + printf(" failed to close DCPL\n"); goto error; } if ((dcpl_id = H5Dget_create_plist(dset_id)) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve copy of DCPL\n"); + printf(" failed to retrieve copy of DCPL\n"); goto error; } memset(retrieved_chunk_dims, 0, sizeof(retrieved_chunk_dims)); if (H5Pget_chunk(dcpl_id, DATASET_SINGLE_CHUNK_WRITE_TEST_DSET_SPACE_RANK, retrieved_chunk_dims) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve chunking info\n"); + printf(" failed to retrieve chunking info\n"); goto error; } for (i = 0; i < DATASET_SINGLE_CHUNK_WRITE_TEST_DSET_SPACE_RANK; i++) { if (dims[i] != retrieved_chunk_dims[i]) { H5_FAILED(); - HDprintf(" chunk dimensionality retrieved from DCPL didn't match originally specified " - "dimensionality\n"); + printf(" chunk dimensionality retrieved from DCPL didn't match originally specified " + "dimensionality\n"); goto error; } } @@ -8727,7 +8695,7 @@ test_write_single_chunk_dataset(void) data_size *= dims[i]; data_size *= DATASET_SINGLE_CHUNK_WRITE_TEST_DSET_DTYPESIZE; - if (NULL == (write_buf = HDmalloc(data_size))) + if (NULL == (write_buf = malloc(data_size))) TEST_ERROR; for (i = 0; i < data_size / DATASET_SINGLE_CHUNK_WRITE_TEST_DSET_DTYPESIZE; i++) @@ -8736,12 +8704,12 @@ test_write_single_chunk_dataset(void) if (H5Dwrite(dset_id, DATASET_SINGLE_CHUNK_WRITE_TEST_DSET_DTYPE, H5S_ALL, H5S_ALL, H5P_DEFAULT, write_buf) < 0) { H5_FAILED(); - HDprintf(" couldn't write to dataset '%s'\n", DATASET_SINGLE_CHUNK_WRITE_TEST_DSET_NAME); + printf(" couldn't write to dataset '%s'\n", DATASET_SINGLE_CHUNK_WRITE_TEST_DSET_NAME); goto error; } if (write_buf) { - HDfree(write_buf); + free(write_buf); write_buf = NULL; } @@ -8764,45 +8732,45 @@ test_write_single_chunk_dataset(void) if ((dset_id = H5Dopen2(group_id, DATASET_SINGLE_CHUNK_WRITE_TEST_DSET_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open dataset '%s'\n", DATASET_SINGLE_CHUNK_WRITE_TEST_DSET_NAME); + printf(" couldn't open dataset '%s'\n", DATASET_SINGLE_CHUNK_WRITE_TEST_DSET_NAME); goto error; } if ((fspace_id = H5Dget_space(dset_id)) < 0) { H5_FAILED(); - HDprintf(" couldn't get dataset dataspace\n"); + printf(" couldn't get dataset dataspace\n"); goto error; } if ((space_npoints = H5Sget_simple_extent_npoints(fspace_id)) < 0) { H5_FAILED(); - HDprintf(" couldn't get dataspace num points\n"); + printf(" couldn't get dataspace num points\n"); goto error; } if (NULL == - (read_buf = HDmalloc((hsize_t)space_npoints * DATASET_SINGLE_CHUNK_WRITE_TEST_DSET_DTYPESIZE))) { + (read_buf = malloc((hsize_t)space_npoints * DATASET_SINGLE_CHUNK_WRITE_TEST_DSET_DTYPESIZE))) { H5_FAILED(); - HDprintf(" couldn't allocate buffer for dataset read\n"); + printf(" couldn't allocate buffer for dataset read\n"); goto error; } if (H5Dread(dset_id, DATASET_SINGLE_CHUNK_WRITE_TEST_DSET_DTYPE, H5S_ALL, H5S_ALL, H5P_DEFAULT, read_buf) < 0) { H5_FAILED(); - HDprintf(" couldn't read from dataset '%s'\n", DATASET_SINGLE_CHUNK_WRITE_TEST_DSET_NAME); + printf(" couldn't read from dataset '%s'\n", DATASET_SINGLE_CHUNK_WRITE_TEST_DSET_NAME); goto error; } for (i = 0; i < (hsize_t)space_npoints; i++) if (((int *)read_buf)[i] != (int)i) { H5_FAILED(); - HDprintf(" data verification failed\n"); + printf(" data verification failed\n"); goto error; } if (read_buf) { - HDfree(read_buf); + free(read_buf); read_buf = NULL; } @@ -8827,9 +8795,9 @@ error: H5E_BEGIN_TRY { if (write_buf) - HDfree(write_buf); + free(write_buf); if (read_buf) - HDfree(read_buf); + free(read_buf); H5Pclose(dcpl_id); H5Sclose(fspace_id); H5Dclose(dset_id); @@ -8865,27 +8833,27 @@ test_create_multi_chunk_dataset(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GET_PLIST)) { SKIPPED(); - HDprintf(" API functions for basic file, group, dataset, or get property list aren't supported " - "with this connector\n"); + printf(" API functions for basic file, group, dataset, or get property list aren't supported " + "with this connector\n"); return 0; } if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, DATASET_MULTI_CHUNK_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container sub-group '%s'\n", DATASET_MULTI_CHUNK_TEST_GROUP_NAME); + printf(" couldn't create container sub-group '%s'\n", DATASET_MULTI_CHUNK_TEST_GROUP_NAME); goto error; } @@ -8899,14 +8867,14 @@ test_create_multi_chunk_dataset(void) if (H5Pset_chunk(dcpl_id, DATASET_MULTI_CHUNK_TEST_SPACE_RANK, chunk_dims) < 0) { H5_FAILED(); - HDprintf(" failed to set chunking on DCPL\n"); + printf(" failed to set chunking on DCPL\n"); goto error; } if ((dset_id = H5Dcreate2(group_id, DATASET_MULTI_CHUNK_TEST_DSET_NAME, dset_dtype, fspace_id, H5P_DEFAULT, dcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create dataset '%s'\n", DATASET_MULTI_CHUNK_TEST_DSET_NAME); + printf(" couldn't create dataset '%s'\n", DATASET_MULTI_CHUNK_TEST_DSET_NAME); goto error; } @@ -8915,28 +8883,28 @@ test_create_multi_chunk_dataset(void) */ if (H5Pclose(dcpl_id) < 0) { H5_FAILED(); - HDprintf(" failed to close DCPL\n"); + printf(" failed to close DCPL\n"); goto error; } if ((dcpl_id = H5Dget_create_plist(dset_id)) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve copy of DCPL\n"); + printf(" failed to retrieve copy of DCPL\n"); goto error; } memset(retrieved_chunk_dims, 0, sizeof(retrieved_chunk_dims)); if (H5Pget_chunk(dcpl_id, DATASET_MULTI_CHUNK_TEST_SPACE_RANK, retrieved_chunk_dims) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve chunking info\n"); + printf(" failed to retrieve chunking info\n"); goto error; } for (i = 0; i < DATASET_MULTI_CHUNK_TEST_SPACE_RANK; i++) { if (chunk_dims[i] != retrieved_chunk_dims[i]) { H5_FAILED(); - HDprintf(" chunk dimensionality retrieved from DCPL didn't match originally specified " - "dimensionality\n"); + printf(" chunk dimensionality retrieved from DCPL didn't match originally specified " + "dimensionality\n"); goto error; } } @@ -8947,40 +8915,40 @@ test_create_multi_chunk_dataset(void) */ if (H5Pclose(dcpl_id) < 0) { H5_FAILED(); - HDprintf(" failed to close DCPL\n"); + printf(" failed to close DCPL\n"); goto error; } if (H5Dclose(dset_id) < 0) { H5_FAILED(); - HDprintf(" failed to close dataset\n"); + printf(" failed to close dataset\n"); goto error; } if ((dset_id = H5Dopen2(group_id, DATASET_MULTI_CHUNK_TEST_DSET_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" failed to re-open dataset\n"); + printf(" failed to re-open dataset\n"); goto error; } if ((dcpl_id = H5Dget_create_plist(dset_id)) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve copy of DCPL\n"); + printf(" failed to retrieve copy of DCPL\n"); goto error; } memset(retrieved_chunk_dims, 0, sizeof(retrieved_chunk_dims)); if (H5Pget_chunk(dcpl_id, DATASET_MULTI_CHUNK_TEST_SPACE_RANK, retrieved_chunk_dims) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve chunking info\n"); + printf(" failed to retrieve chunking info\n"); goto error; } for (i = 0; i < DATASET_MULTI_CHUNK_TEST_SPACE_RANK; i++) { if (chunk_dims[i] != retrieved_chunk_dims[i]) { H5_FAILED(); - HDprintf(" chunk dimensionality retrieved from DCPL didn't match originally specified " - "dimensionality\n"); + printf(" chunk dimensionality retrieved from DCPL didn't match originally specified " + "dimensionality\n"); goto error; } } @@ -9051,28 +9019,28 @@ test_write_multi_chunk_dataset_same_shape_read(void) !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_MORE) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GET_PLIST)) { SKIPPED(); - HDprintf(" API functions for basic file, group, dataset, or get property list aren't supported " - "with this connector\n"); + printf(" API functions for basic file, group, dataset, or get property list aren't supported " + "with this connector\n"); return 0; } if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, DATASET_MULTI_CHUNK_WRITE_SAME_SPACE_READ_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container sub-group '%s'\n", - DATASET_MULTI_CHUNK_WRITE_SAME_SPACE_READ_TEST_GROUP_NAME); + printf(" couldn't create container sub-group '%s'\n", + DATASET_MULTI_CHUNK_WRITE_SAME_SPACE_READ_TEST_GROUP_NAME); goto error; } @@ -9086,7 +9054,7 @@ test_write_multi_chunk_dataset_same_shape_read(void) if (H5Pset_chunk(dcpl_id, DATASET_MULTI_CHUNK_WRITE_SAME_SPACE_READ_TEST_DSET_SPACE_RANK, chunk_dims) < 0) { H5_FAILED(); - HDprintf(" failed to set chunking on DCPL\n"); + printf(" failed to set chunking on DCPL\n"); goto error; } @@ -9094,8 +9062,8 @@ test_write_multi_chunk_dataset_same_shape_read(void) DATASET_MULTI_CHUNK_WRITE_SAME_SPACE_READ_TEST_DSET_DTYPE, fspace_id, H5P_DEFAULT, dcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create dataset '%s'\n", - DATASET_MULTI_CHUNK_WRITE_SAME_SPACE_READ_TEST_DSET_NAME); + printf(" couldn't create dataset '%s'\n", + DATASET_MULTI_CHUNK_WRITE_SAME_SPACE_READ_TEST_DSET_NAME); goto error; } @@ -9104,13 +9072,13 @@ test_write_multi_chunk_dataset_same_shape_read(void) */ if (H5Pclose(dcpl_id) < 0) { H5_FAILED(); - HDprintf(" failed to close DCPL\n"); + printf(" failed to close DCPL\n"); goto error; } if ((dcpl_id = H5Dget_create_plist(dset_id)) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve copy of DCPL\n"); + printf(" failed to retrieve copy of DCPL\n"); goto error; } @@ -9118,15 +9086,15 @@ test_write_multi_chunk_dataset_same_shape_read(void) if (H5Pget_chunk(dcpl_id, DATASET_MULTI_CHUNK_WRITE_SAME_SPACE_READ_TEST_DSET_SPACE_RANK, retrieved_chunk_dims) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve chunking info\n"); + printf(" failed to retrieve chunking info\n"); goto error; } for (i = 0; i < DATASET_MULTI_CHUNK_WRITE_SAME_SPACE_READ_TEST_DSET_SPACE_RANK; i++) { if (chunk_dims[i] != retrieved_chunk_dims[i]) { H5_FAILED(); - HDprintf(" chunk dimensionality retrieved from DCPL didn't match originally specified " - "dimensionality\n"); + printf(" chunk dimensionality retrieved from DCPL didn't match originally specified " + "dimensionality\n"); goto error; } } @@ -9139,7 +9107,7 @@ test_write_multi_chunk_dataset_same_shape_read(void) data_size *= dims[i]; data_size *= DATASET_MULTI_CHUNK_WRITE_SAME_SPACE_READ_TEST_DSET_DTYPESIZE; - if (NULL == (write_buf = HDmalloc(data_size))) + if (NULL == (write_buf = malloc(data_size))) TEST_ERROR; /* @@ -9202,13 +9170,13 @@ test_write_multi_chunk_dataset_same_shape_read(void) if (H5Dwrite(dset_id, DATASET_MULTI_CHUNK_WRITE_SAME_SPACE_READ_TEST_DSET_DTYPE, H5S_ALL, H5S_ALL, H5P_DEFAULT, write_buf) < 0) { H5_FAILED(); - HDprintf(" couldn't write to dataset '%s'\n", - DATASET_MULTI_CHUNK_WRITE_SAME_SPACE_READ_TEST_DSET_NAME); + printf(" couldn't write to dataset '%s'\n", + DATASET_MULTI_CHUNK_WRITE_SAME_SPACE_READ_TEST_DSET_NAME); goto error; } if (write_buf) { - HDfree(write_buf); + free(write_buf); write_buf = NULL; } @@ -9232,14 +9200,13 @@ test_write_multi_chunk_dataset_same_shape_read(void) if ((dset_id = H5Dopen2(group_id, DATASET_MULTI_CHUNK_WRITE_SAME_SPACE_READ_TEST_DSET_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open dataset '%s'\n", - DATASET_MULTI_CHUNK_WRITE_SAME_SPACE_READ_TEST_DSET_NAME); + printf(" couldn't open dataset '%s'\n", DATASET_MULTI_CHUNK_WRITE_SAME_SPACE_READ_TEST_DSET_NAME); goto error; } if ((fspace_id = H5Dget_space(dset_id)) < 0) { H5_FAILED(); - HDprintf(" couldn't get dataset dataspace\n"); + printf(" couldn't get dataset dataspace\n"); goto error; } @@ -9251,7 +9218,7 @@ test_write_multi_chunk_dataset_same_shape_read(void) if ((mspace_id = H5Screate_simple(2, mdims, NULL)) < 0) { H5_FAILED(); - HDprintf(" failed to create memory dataspace\n"); + printf(" failed to create memory dataspace\n"); goto error; } } @@ -9263,11 +9230,11 @@ test_write_multi_chunk_dataset_same_shape_read(void) /* * Read every chunk in the dataset, checking the data for each one. */ - HDprintf("\n"); + printf("\n"); for (i = 0; i < data_size / chunk_size; i++) { size_t j, k; - HDprintf("\r Reading chunk %zu", i); + printf("\r Reading chunk %zu", i); for (j = 0; j < DATASET_MULTI_CHUNK_WRITE_SAME_SPACE_READ_TEST_DSET_SPACE_RANK; j++) { if (dims[j] == chunk_dims[j]) @@ -9284,7 +9251,7 @@ test_write_multi_chunk_dataset_same_shape_read(void) */ if (H5Sselect_hyperslab(fspace_id, H5S_SELECT_SET, start, NULL, count, NULL) < 0) { H5_FAILED(); - HDprintf(" failed to set hyperslab selection\n"); + printf(" failed to set hyperslab selection\n"); goto error; } @@ -9295,8 +9262,8 @@ test_write_multi_chunk_dataset_same_shape_read(void) if (H5Dread(dset_id, DATASET_MULTI_CHUNK_WRITE_SAME_SPACE_READ_TEST_DSET_DTYPE, mspace_id, fspace_id, H5P_DEFAULT, read_buf) < 0) { H5_FAILED(); - HDprintf(" couldn't read from dataset '%s'\n", - DATASET_MULTI_CHUNK_WRITE_SAME_SPACE_READ_TEST_DSET_NAME); + printf(" couldn't read from dataset '%s'\n", + DATASET_MULTI_CHUNK_WRITE_SAME_SPACE_READ_TEST_DSET_NAME); goto error; } @@ -9304,7 +9271,7 @@ test_write_multi_chunk_dataset_same_shape_read(void) for (k = 0; k < chunk_dims[1]; k++) { if (read_buf[j][k] != (int)((j * chunk_dims[0]) + k + i)) { H5_FAILED(); - HDprintf(" data verification failed for chunk %lld\n", (long long)i); + printf(" data verification failed for chunk %lld\n", (long long)i); goto error; } } @@ -9334,7 +9301,7 @@ error: H5E_BEGIN_TRY { if (write_buf) - HDfree(write_buf); + free(write_buf); H5Pclose(dcpl_id); H5Sclose(mspace_id); H5Sclose(fspace_id); @@ -9378,28 +9345,28 @@ test_write_multi_chunk_dataset_diff_shape_read(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GET_PLIST)) { SKIPPED(); - HDprintf(" API functions for basic file, group, dataset, or get property list aren't supported " - "with this connector\n"); + printf(" API functions for basic file, group, dataset, or get property list aren't supported " + "with this connector\n"); return 0; } if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, DATASET_MULTI_CHUNK_WRITE_DIFF_SPACE_READ_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container sub-group '%s'\n", - DATASET_MULTI_CHUNK_WRITE_DIFF_SPACE_READ_TEST_GROUP_NAME); + printf(" couldn't create container sub-group '%s'\n", + DATASET_MULTI_CHUNK_WRITE_DIFF_SPACE_READ_TEST_GROUP_NAME); goto error; } @@ -9413,7 +9380,7 @@ test_write_multi_chunk_dataset_diff_shape_read(void) if (H5Pset_chunk(dcpl_id, DATASET_MULTI_CHUNK_WRITE_DIFF_SPACE_READ_TEST_DSET_SPACE_RANK, chunk_dims) < 0) { H5_FAILED(); - HDprintf(" failed to set chunking on DCPL\n"); + printf(" failed to set chunking on DCPL\n"); goto error; } @@ -9421,8 +9388,8 @@ test_write_multi_chunk_dataset_diff_shape_read(void) DATASET_MULTI_CHUNK_WRITE_DIFF_SPACE_READ_TEST_DSET_DTYPE, fspace_id, H5P_DEFAULT, dcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create dataset '%s'\n", - DATASET_MULTI_CHUNK_WRITE_DIFF_SPACE_READ_TEST_DSET_NAME); + printf(" couldn't create dataset '%s'\n", + DATASET_MULTI_CHUNK_WRITE_DIFF_SPACE_READ_TEST_DSET_NAME); goto error; } @@ -9431,13 +9398,13 @@ test_write_multi_chunk_dataset_diff_shape_read(void) */ if (H5Pclose(dcpl_id) < 0) { H5_FAILED(); - HDprintf(" failed to close DCPL\n"); + printf(" failed to close DCPL\n"); goto error; } if ((dcpl_id = H5Dget_create_plist(dset_id)) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve copy of DCPL\n"); + printf(" failed to retrieve copy of DCPL\n"); goto error; } @@ -9445,15 +9412,15 @@ test_write_multi_chunk_dataset_diff_shape_read(void) if (H5Pget_chunk(dcpl_id, DATASET_MULTI_CHUNK_WRITE_DIFF_SPACE_READ_TEST_DSET_SPACE_RANK, retrieved_chunk_dims) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve chunking info\n"); + printf(" failed to retrieve chunking info\n"); goto error; } for (i = 0; i < DATASET_MULTI_CHUNK_WRITE_DIFF_SPACE_READ_TEST_DSET_SPACE_RANK; i++) { if (chunk_dims[i] != retrieved_chunk_dims[i]) { H5_FAILED(); - HDprintf(" chunk dimensionality retrieved from DCPL didn't match originally specified " - "dimensionality\n"); + printf(" chunk dimensionality retrieved from DCPL didn't match originally specified " + "dimensionality\n"); goto error; } } @@ -9466,7 +9433,7 @@ test_write_multi_chunk_dataset_diff_shape_read(void) data_size *= dims[i]; data_size *= DATASET_MULTI_CHUNK_WRITE_DIFF_SPACE_READ_TEST_DSET_DTYPESIZE; - if (NULL == (write_buf = HDmalloc(data_size))) + if (NULL == (write_buf = malloc(data_size))) TEST_ERROR; /* @@ -9529,13 +9496,13 @@ test_write_multi_chunk_dataset_diff_shape_read(void) if (H5Dwrite(dset_id, DATASET_MULTI_CHUNK_WRITE_DIFF_SPACE_READ_TEST_DSET_DTYPE, H5S_ALL, H5S_ALL, H5P_DEFAULT, write_buf) < 0) { H5_FAILED(); - HDprintf(" couldn't write to dataset '%s'\n", - DATASET_MULTI_CHUNK_WRITE_DIFF_SPACE_READ_TEST_DSET_NAME); + printf(" couldn't write to dataset '%s'\n", + DATASET_MULTI_CHUNK_WRITE_DIFF_SPACE_READ_TEST_DSET_NAME); goto error; } if (write_buf) { - HDfree(write_buf); + free(write_buf); write_buf = NULL; } @@ -9559,23 +9526,22 @@ test_write_multi_chunk_dataset_diff_shape_read(void) if ((dset_id = H5Dopen2(group_id, DATASET_MULTI_CHUNK_WRITE_DIFF_SPACE_READ_TEST_DSET_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open dataset '%s'\n", - DATASET_MULTI_CHUNK_WRITE_DIFF_SPACE_READ_TEST_DSET_NAME); + printf(" couldn't open dataset '%s'\n", DATASET_MULTI_CHUNK_WRITE_DIFF_SPACE_READ_TEST_DSET_NAME); goto error; } if ((fspace_id = H5Dget_space(dset_id)) < 0) { H5_FAILED(); - HDprintf(" couldn't get dataset dataspace\n"); + printf(" couldn't get dataset dataspace\n"); goto error; } /* * Allocate single chunk-sized read buffer. */ - if (NULL == (read_buf = HDmalloc(chunk_size))) { + if (NULL == (read_buf = malloc(chunk_size))) { H5_FAILED(); - HDprintf(" couldn't allocate buffer for dataset read\n"); + printf(" couldn't allocate buffer for dataset read\n"); goto error; } @@ -9587,7 +9553,7 @@ test_write_multi_chunk_dataset_diff_shape_read(void) if ((mspace_id = H5Screate_simple(1, mdims, NULL)) < 0) { H5_FAILED(); - HDprintf(" failed to create memory dataspace\n"); + printf(" failed to create memory dataspace\n"); goto error; } } @@ -9599,11 +9565,11 @@ test_write_multi_chunk_dataset_diff_shape_read(void) /* * Read every chunk in the dataset, checking the data for each one. */ - HDprintf("\n"); + printf("\n"); for (i = 0; i < data_size / chunk_size; i++) { size_t j; - HDprintf("\r Reading chunk %zu", i); + printf("\r Reading chunk %zu", i); for (j = 0; j < DATASET_MULTI_CHUNK_WRITE_DIFF_SPACE_READ_TEST_DSET_SPACE_RANK; j++) { if (dims[j] == chunk_dims[j]) @@ -9620,7 +9586,7 @@ test_write_multi_chunk_dataset_diff_shape_read(void) */ if (H5Sselect_hyperslab(fspace_id, H5S_SELECT_SET, start, NULL, count, NULL) < 0) { H5_FAILED(); - HDprintf(" failed to set hyperslab selection\n"); + printf(" failed to set hyperslab selection\n"); goto error; } @@ -9628,8 +9594,8 @@ test_write_multi_chunk_dataset_diff_shape_read(void) if (H5Dread(dset_id, DATASET_MULTI_CHUNK_WRITE_DIFF_SPACE_READ_TEST_DSET_DTYPE, mspace_id, fspace_id, H5P_DEFAULT, read_buf) < 0) { H5_FAILED(); - HDprintf(" couldn't read from dataset '%s'\n", - DATASET_MULTI_CHUNK_WRITE_DIFF_SPACE_READ_TEST_DSET_NAME); + printf(" couldn't read from dataset '%s'\n", + DATASET_MULTI_CHUNK_WRITE_DIFF_SPACE_READ_TEST_DSET_NAME); goto error; } @@ -9637,13 +9603,13 @@ test_write_multi_chunk_dataset_diff_shape_read(void) j++) if (((int *)read_buf)[j] != (int)(j + i)) { H5_FAILED(); - HDprintf(" data verification failed for chunk %lld\n", (long long)i); + printf(" data verification failed for chunk %lld\n", (long long)i); goto error; } } if (read_buf) { - HDfree(read_buf); + free(read_buf); read_buf = NULL; } @@ -9670,9 +9636,9 @@ error: H5E_BEGIN_TRY { if (write_buf) - HDfree(write_buf); + free(write_buf); if (read_buf) - HDfree(read_buf); + free(read_buf); H5Pclose(dcpl_id); H5Sclose(mspace_id); H5Sclose(fspace_id); @@ -9717,28 +9683,28 @@ test_overwrite_multi_chunk_dataset_same_shape_read(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GET_PLIST)) { SKIPPED(); - HDprintf(" API functions for basic file, group, dataset, or get property list aren't supported " - "with this connector\n"); + printf(" API functions for basic file, group, dataset, or get property list aren't supported " + "with this connector\n"); return 0; } if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, DATASET_MULTI_CHUNK_OVERWRITE_SAME_SPACE_READ_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container sub-group '%s'\n", - DATASET_MULTI_CHUNK_OVERWRITE_SAME_SPACE_READ_TEST_GROUP_NAME); + printf(" couldn't create container sub-group '%s'\n", + DATASET_MULTI_CHUNK_OVERWRITE_SAME_SPACE_READ_TEST_GROUP_NAME); goto error; } @@ -9752,7 +9718,7 @@ test_overwrite_multi_chunk_dataset_same_shape_read(void) if (H5Pset_chunk(dcpl_id, DATASET_MULTI_CHUNK_OVERWRITE_SAME_SPACE_READ_TEST_DSET_SPACE_RANK, chunk_dims) < 0) { H5_FAILED(); - HDprintf(" failed to set chunking on DCPL\n"); + printf(" failed to set chunking on DCPL\n"); goto error; } @@ -9760,8 +9726,8 @@ test_overwrite_multi_chunk_dataset_same_shape_read(void) DATASET_MULTI_CHUNK_OVERWRITE_SAME_SPACE_READ_TEST_DSET_DTYPE, fspace_id, H5P_DEFAULT, dcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create dataset '%s'\n", - DATASET_MULTI_CHUNK_OVERWRITE_SAME_SPACE_READ_TEST_DSET_NAME); + printf(" couldn't create dataset '%s'\n", + DATASET_MULTI_CHUNK_OVERWRITE_SAME_SPACE_READ_TEST_DSET_NAME); goto error; } @@ -9770,13 +9736,13 @@ test_overwrite_multi_chunk_dataset_same_shape_read(void) */ if (H5Pclose(dcpl_id) < 0) { H5_FAILED(); - HDprintf(" failed to close DCPL\n"); + printf(" failed to close DCPL\n"); goto error; } if ((dcpl_id = H5Dget_create_plist(dset_id)) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve copy of DCPL\n"); + printf(" failed to retrieve copy of DCPL\n"); goto error; } @@ -9784,15 +9750,15 @@ test_overwrite_multi_chunk_dataset_same_shape_read(void) if (H5Pget_chunk(dcpl_id, DATASET_MULTI_CHUNK_OVERWRITE_SAME_SPACE_READ_TEST_DSET_SPACE_RANK, retrieved_chunk_dims) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve chunking info\n"); + printf(" failed to retrieve chunking info\n"); goto error; } for (i = 0; i < DATASET_MULTI_CHUNK_OVERWRITE_SAME_SPACE_READ_TEST_DSET_SPACE_RANK; i++) { if (chunk_dims[i] != retrieved_chunk_dims[i]) { H5_FAILED(); - HDprintf(" chunk dimensionality retrieved from DCPL didn't match originally specified " - "dimensionality\n"); + printf(" chunk dimensionality retrieved from DCPL didn't match originally specified " + "dimensionality\n"); goto error; } } @@ -9805,7 +9771,7 @@ test_overwrite_multi_chunk_dataset_same_shape_read(void) data_size *= dims[i]; data_size *= DATASET_MULTI_CHUNK_OVERWRITE_SAME_SPACE_READ_TEST_DSET_DTYPESIZE; - if (NULL == (write_buf = HDmalloc(data_size))) + if (NULL == (write_buf = malloc(data_size))) TEST_ERROR; /* @@ -9816,7 +9782,7 @@ test_overwrite_multi_chunk_dataset_same_shape_read(void) if ((mspace_id = H5Screate_simple(2, mdims, NULL)) < 0) { H5_FAILED(); - HDprintf(" failed to create memory dataspace\n"); + printf(" failed to create memory dataspace\n"); goto error; } } @@ -9825,7 +9791,7 @@ test_overwrite_multi_chunk_dataset_same_shape_read(void) count[i] = chunk_dims[i]; } - HDprintf("\n"); + printf("\n"); for (niter = 0; niter < DATASET_MULTI_CHUNK_OVERWRITE_SAME_SPACE_READ_TEST_NITERS; niter++) { memset(write_buf, 0, data_size); @@ -9892,8 +9858,8 @@ test_overwrite_multi_chunk_dataset_same_shape_read(void) if (H5Dwrite(dset_id, DATASET_MULTI_CHUNK_OVERWRITE_SAME_SPACE_READ_TEST_DSET_DTYPE, H5S_ALL, H5S_ALL, H5P_DEFAULT, write_buf) < 0) { H5_FAILED(); - HDprintf(" couldn't write to dataset '%s'\n", - DATASET_MULTI_CHUNK_OVERWRITE_SAME_SPACE_READ_TEST_DSET_NAME); + printf(" couldn't write to dataset '%s'\n", + DATASET_MULTI_CHUNK_OVERWRITE_SAME_SPACE_READ_TEST_DSET_NAME); goto error; } @@ -9917,14 +9883,14 @@ test_overwrite_multi_chunk_dataset_same_shape_read(void) if ((dset_id = H5Dopen2(group_id, DATASET_MULTI_CHUNK_OVERWRITE_SAME_SPACE_READ_TEST_DSET_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open dataset '%s'\n", - DATASET_MULTI_CHUNK_OVERWRITE_SAME_SPACE_READ_TEST_DSET_NAME); + printf(" couldn't open dataset '%s'\n", + DATASET_MULTI_CHUNK_OVERWRITE_SAME_SPACE_READ_TEST_DSET_NAME); goto error; } if ((fspace_id = H5Dget_space(dset_id)) < 0) { H5_FAILED(); - HDprintf(" couldn't get dataset dataspace\n"); + printf(" couldn't get dataset dataspace\n"); goto error; } @@ -9934,7 +9900,7 @@ test_overwrite_multi_chunk_dataset_same_shape_read(void) for (i = 0; i < data_size / chunk_size; i++) { size_t j, k; - HDprintf("\r Reading chunk %zu", i); + printf("\r Reading chunk %zu", i); for (j = 0; j < DATASET_MULTI_CHUNK_OVERWRITE_SAME_SPACE_READ_TEST_DSET_SPACE_RANK; j++) { if (dims[j] == chunk_dims[j]) @@ -9951,7 +9917,7 @@ test_overwrite_multi_chunk_dataset_same_shape_read(void) */ if (H5Sselect_hyperslab(fspace_id, H5S_SELECT_SET, start, NULL, count, NULL) < 0) { H5_FAILED(); - HDprintf(" failed to set hyperslab selection\n"); + printf(" failed to set hyperslab selection\n"); goto error; } @@ -9962,8 +9928,8 @@ test_overwrite_multi_chunk_dataset_same_shape_read(void) if (H5Dread(dset_id, DATASET_MULTI_CHUNK_OVERWRITE_SAME_SPACE_READ_TEST_DSET_DTYPE, mspace_id, fspace_id, H5P_DEFAULT, read_buf) < 0) { H5_FAILED(); - HDprintf(" couldn't read from dataset '%s'\n", - DATASET_MULTI_CHUNK_OVERWRITE_SAME_SPACE_READ_TEST_DSET_NAME); + printf(" couldn't read from dataset '%s'\n", + DATASET_MULTI_CHUNK_OVERWRITE_SAME_SPACE_READ_TEST_DSET_NAME); goto error; } @@ -9971,7 +9937,7 @@ test_overwrite_multi_chunk_dataset_same_shape_read(void) for (k = 0; k < chunk_dims[1]; k++) { if (read_buf[j][k] != (int)((j * chunk_dims[0]) + k + i + niter)) { H5_FAILED(); - HDprintf(" data verification failed for chunk %lld\n", (long long)i); + printf(" data verification failed for chunk %lld\n", (long long)i); goto error; } } @@ -9980,7 +9946,7 @@ test_overwrite_multi_chunk_dataset_same_shape_read(void) } if (write_buf) { - HDfree(write_buf); + free(write_buf); write_buf = NULL; } @@ -10007,7 +9973,7 @@ error: H5E_BEGIN_TRY { if (write_buf) - HDfree(write_buf); + free(write_buf); H5Pclose(dcpl_id); H5Sclose(mspace_id); H5Sclose(fspace_id); @@ -10052,28 +10018,28 @@ test_overwrite_multi_chunk_dataset_diff_shape_read(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GET_PLIST)) { SKIPPED(); - HDprintf(" API functions for basic file, group, dataset, or get property list aren't supported " - "with this connector\n"); + printf(" API functions for basic file, group, dataset, or get property list aren't supported " + "with this connector\n"); return 0; } if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, DATASET_MULTI_CHUNK_OVERWRITE_DIFF_SPACE_READ_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container sub-group '%s'\n", - DATASET_MULTI_CHUNK_OVERWRITE_DIFF_SPACE_READ_TEST_GROUP_NAME); + printf(" couldn't create container sub-group '%s'\n", + DATASET_MULTI_CHUNK_OVERWRITE_DIFF_SPACE_READ_TEST_GROUP_NAME); goto error; } @@ -10087,7 +10053,7 @@ test_overwrite_multi_chunk_dataset_diff_shape_read(void) if (H5Pset_chunk(dcpl_id, DATASET_MULTI_CHUNK_OVERWRITE_DIFF_SPACE_READ_TEST_DSET_SPACE_RANK, chunk_dims) < 0) { H5_FAILED(); - HDprintf(" failed to set chunking on DCPL\n"); + printf(" failed to set chunking on DCPL\n"); goto error; } @@ -10095,8 +10061,8 @@ test_overwrite_multi_chunk_dataset_diff_shape_read(void) DATASET_MULTI_CHUNK_OVERWRITE_DIFF_SPACE_READ_TEST_DSET_DTYPE, fspace_id, H5P_DEFAULT, dcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create dataset '%s'\n", - DATASET_MULTI_CHUNK_OVERWRITE_DIFF_SPACE_READ_TEST_DSET_NAME); + printf(" couldn't create dataset '%s'\n", + DATASET_MULTI_CHUNK_OVERWRITE_DIFF_SPACE_READ_TEST_DSET_NAME); goto error; } @@ -10105,13 +10071,13 @@ test_overwrite_multi_chunk_dataset_diff_shape_read(void) */ if (H5Pclose(dcpl_id) < 0) { H5_FAILED(); - HDprintf(" failed to close DCPL\n"); + printf(" failed to close DCPL\n"); goto error; } if ((dcpl_id = H5Dget_create_plist(dset_id)) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve copy of DCPL\n"); + printf(" failed to retrieve copy of DCPL\n"); goto error; } @@ -10119,15 +10085,15 @@ test_overwrite_multi_chunk_dataset_diff_shape_read(void) if (H5Pget_chunk(dcpl_id, DATASET_MULTI_CHUNK_OVERWRITE_DIFF_SPACE_READ_TEST_DSET_SPACE_RANK, retrieved_chunk_dims) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve chunking info\n"); + printf(" failed to retrieve chunking info\n"); goto error; } for (i = 0; i < DATASET_MULTI_CHUNK_OVERWRITE_DIFF_SPACE_READ_TEST_DSET_SPACE_RANK; i++) { if (chunk_dims[i] != retrieved_chunk_dims[i]) { H5_FAILED(); - HDprintf(" chunk dimensionality retrieved from DCPL didn't match originally specified " - "dimensionality\n"); + printf(" chunk dimensionality retrieved from DCPL didn't match originally specified " + "dimensionality\n"); goto error; } } @@ -10140,15 +10106,15 @@ test_overwrite_multi_chunk_dataset_diff_shape_read(void) data_size *= dims[i]; data_size *= DATASET_MULTI_CHUNK_OVERWRITE_DIFF_SPACE_READ_TEST_DSET_DTYPESIZE; - if (NULL == (write_buf = HDmalloc(data_size))) + if (NULL == (write_buf = malloc(data_size))) TEST_ERROR; /* * Allocate single chunk-sized read buffer. */ - if (NULL == (read_buf = HDmalloc(chunk_size))) { + if (NULL == (read_buf = malloc(chunk_size))) { H5_FAILED(); - HDprintf(" couldn't allocate buffer for dataset read\n"); + printf(" couldn't allocate buffer for dataset read\n"); goto error; } @@ -10160,7 +10126,7 @@ test_overwrite_multi_chunk_dataset_diff_shape_read(void) if ((mspace_id = H5Screate_simple(1, mdims, NULL)) < 0) { H5_FAILED(); - HDprintf(" failed to create memory dataspace\n"); + printf(" failed to create memory dataspace\n"); goto error; } } @@ -10169,7 +10135,7 @@ test_overwrite_multi_chunk_dataset_diff_shape_read(void) count[i] = chunk_dims[i]; } - HDprintf("\n"); + printf("\n"); for (niter = 0; niter < DATASET_MULTI_CHUNK_OVERWRITE_DIFF_SPACE_READ_TEST_NITERS; niter++) { memset(write_buf, 0, data_size); @@ -10236,8 +10202,8 @@ test_overwrite_multi_chunk_dataset_diff_shape_read(void) if (H5Dwrite(dset_id, DATASET_MULTI_CHUNK_OVERWRITE_DIFF_SPACE_READ_TEST_DSET_DTYPE, H5S_ALL, H5S_ALL, H5P_DEFAULT, write_buf) < 0) { H5_FAILED(); - HDprintf(" couldn't write to dataset '%s'\n", - DATASET_MULTI_CHUNK_OVERWRITE_DIFF_SPACE_READ_TEST_DSET_NAME); + printf(" couldn't write to dataset '%s'\n", + DATASET_MULTI_CHUNK_OVERWRITE_DIFF_SPACE_READ_TEST_DSET_NAME); goto error; } @@ -10261,14 +10227,14 @@ test_overwrite_multi_chunk_dataset_diff_shape_read(void) if ((dset_id = H5Dopen2(group_id, DATASET_MULTI_CHUNK_OVERWRITE_DIFF_SPACE_READ_TEST_DSET_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open dataset '%s'\n", - DATASET_MULTI_CHUNK_OVERWRITE_DIFF_SPACE_READ_TEST_DSET_NAME); + printf(" couldn't open dataset '%s'\n", + DATASET_MULTI_CHUNK_OVERWRITE_DIFF_SPACE_READ_TEST_DSET_NAME); goto error; } if ((fspace_id = H5Dget_space(dset_id)) < 0) { H5_FAILED(); - HDprintf(" couldn't get dataset dataspace\n"); + printf(" couldn't get dataset dataspace\n"); goto error; } @@ -10278,7 +10244,7 @@ test_overwrite_multi_chunk_dataset_diff_shape_read(void) for (i = 0; i < data_size / chunk_size; i++) { size_t j; - HDprintf("\r Reading chunk %zu", i); + printf("\r Reading chunk %zu", i); for (j = 0; j < DATASET_MULTI_CHUNK_OVERWRITE_DIFF_SPACE_READ_TEST_DSET_SPACE_RANK; j++) { if (dims[j] == chunk_dims[j]) @@ -10295,7 +10261,7 @@ test_overwrite_multi_chunk_dataset_diff_shape_read(void) */ if (H5Sselect_hyperslab(fspace_id, H5S_SELECT_SET, start, NULL, count, NULL) < 0) { H5_FAILED(); - HDprintf(" failed to set hyperslab selection\n"); + printf(" failed to set hyperslab selection\n"); goto error; } @@ -10303,8 +10269,8 @@ test_overwrite_multi_chunk_dataset_diff_shape_read(void) if (H5Dread(dset_id, DATASET_MULTI_CHUNK_OVERWRITE_DIFF_SPACE_READ_TEST_DSET_DTYPE, mspace_id, fspace_id, H5P_DEFAULT, read_buf) < 0) { H5_FAILED(); - HDprintf(" couldn't read from dataset '%s'\n", - DATASET_MULTI_CHUNK_OVERWRITE_DIFF_SPACE_READ_TEST_DSET_NAME); + printf(" couldn't read from dataset '%s'\n", + DATASET_MULTI_CHUNK_OVERWRITE_DIFF_SPACE_READ_TEST_DSET_NAME); goto error; } @@ -10313,19 +10279,19 @@ test_overwrite_multi_chunk_dataset_diff_shape_read(void) j++) if (((int *)read_buf)[j] != (int)(j + i + niter)) { H5_FAILED(); - HDprintf(" data verification failed for chunk %lld\n", (long long)i); + printf(" data verification failed for chunk %lld\n", (long long)i); goto error; } } } if (write_buf) { - HDfree(write_buf); + free(write_buf); write_buf = NULL; } if (read_buf) { - HDfree(read_buf); + free(read_buf); read_buf = NULL; } @@ -10352,9 +10318,9 @@ error: H5E_BEGIN_TRY { if (write_buf) - HDfree(write_buf); + free(write_buf); if (read_buf) - HDfree(read_buf); + free(read_buf); H5Pclose(dcpl_id); H5Sclose(mspace_id); H5Sclose(fspace_id); @@ -10397,28 +10363,28 @@ test_read_partial_chunk_all_selection(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GET_PLIST)) { SKIPPED(); - HDprintf(" API functions for basic file, group, dataset, or get property list aren't supported " - "with this connector\n"); + printf(" API functions for basic file, group, dataset, or get property list aren't supported " + "with this connector\n"); return 0; } if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, DATASET_PARTIAL_CHUNK_READ_ALL_SEL_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container sub-group '%s'\n", - DATASET_PARTIAL_CHUNK_READ_ALL_SEL_TEST_GROUP_NAME); + printf(" couldn't create container sub-group '%s'\n", + DATASET_PARTIAL_CHUNK_READ_ALL_SEL_TEST_GROUP_NAME); goto error; } @@ -10431,7 +10397,7 @@ test_read_partial_chunk_all_selection(void) if (H5Pset_chunk(dcpl_id, DATASET_PARTIAL_CHUNK_READ_ALL_SEL_TEST_DSET_SPACE_RANK, chunk_dims) < 0) { H5_FAILED(); - HDprintf(" failed to set chunking on DCPL\n"); + printf(" failed to set chunking on DCPL\n"); goto error; } @@ -10439,7 +10405,7 @@ test_read_partial_chunk_all_selection(void) DATASET_PARTIAL_CHUNK_READ_ALL_SEL_TEST_DSET_DTYPE, fspace_id, H5P_DEFAULT, dcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create dataset '%s'\n", DATASET_PARTIAL_CHUNK_READ_ALL_SEL_TEST_DSET_NAME); + printf(" couldn't create dataset '%s'\n", DATASET_PARTIAL_CHUNK_READ_ALL_SEL_TEST_DSET_NAME); goto error; } @@ -10448,13 +10414,13 @@ test_read_partial_chunk_all_selection(void) */ if (H5Pclose(dcpl_id) < 0) { H5_FAILED(); - HDprintf(" failed to close DCPL\n"); + printf(" failed to close DCPL\n"); goto error; } if ((dcpl_id = H5Dget_create_plist(dset_id)) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve copy of DCPL\n"); + printf(" failed to retrieve copy of DCPL\n"); goto error; } @@ -10462,15 +10428,15 @@ test_read_partial_chunk_all_selection(void) if (H5Pget_chunk(dcpl_id, DATASET_PARTIAL_CHUNK_READ_ALL_SEL_TEST_DSET_SPACE_RANK, retrieved_chunk_dims) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve chunking info\n"); + printf(" failed to retrieve chunking info\n"); goto error; } for (i = 0; i < DATASET_PARTIAL_CHUNK_READ_ALL_SEL_TEST_DSET_SPACE_RANK; i++) { if (chunk_dims[i] != retrieved_chunk_dims[i]) { H5_FAILED(); - HDprintf(" chunk dimensionality retrieved from DCPL didn't match originally specified " - "dimensionality\n"); + printf(" chunk dimensionality retrieved from DCPL didn't match originally specified " + "dimensionality\n"); goto error; } } @@ -10486,7 +10452,7 @@ test_read_partial_chunk_all_selection(void) if (H5Dwrite(dset_id, DATASET_PARTIAL_CHUNK_READ_ALL_SEL_TEST_DSET_DTYPE, H5S_ALL, H5S_ALL, H5P_DEFAULT, write_buf) < 0) { H5_FAILED(); - HDprintf(" failed to write to dataset\n"); + printf(" failed to write to dataset\n"); goto error; } @@ -10497,14 +10463,14 @@ test_read_partial_chunk_all_selection(void) TEST_ERROR; if ((dset_id = H5Dopen2(group_id, DATASET_PARTIAL_CHUNK_READ_ALL_SEL_TEST_DSET_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" failed to re-open dataset\n"); + printf(" failed to re-open dataset\n"); goto error; } if (H5Dread(dset_id, DATASET_PARTIAL_CHUNK_READ_ALL_SEL_TEST_DSET_DTYPE, H5S_ALL, H5S_ALL, H5P_DEFAULT, read_buf) < 0) { H5_FAILED(); - HDprintf(" failed to read from dataset\n"); + printf(" failed to read from dataset\n"); goto error; } @@ -10512,7 +10478,7 @@ test_read_partial_chunk_all_selection(void) for (j = 0; j < FIXED_DIMSIZE; j++) if (read_buf[i][j] != (int)((i * FIXED_DIMSIZE) + j)) { H5_FAILED(); - HDprintf( + printf( " data verification failed for read buffer element %lld: expected %lld but was %lld\n", (long long)((i * FIXED_DIMSIZE) + j), (long long)((i * FIXED_DIMSIZE) + j), (long long)read_buf[i][j]); @@ -10584,28 +10550,28 @@ test_read_partial_chunk_hyperslab_selection(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GET_PLIST)) { SKIPPED(); - HDprintf(" API functions for basic file, group, dataset, or get property list aren't supported " - "with this connector\n"); + printf(" API functions for basic file, group, dataset, or get property list aren't supported " + "with this connector\n"); return 0; } if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, DATASET_PARTIAL_CHUNK_READ_HYPER_SEL_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container sub-group '%s'\n", - DATASET_PARTIAL_CHUNK_READ_HYPER_SEL_TEST_GROUP_NAME); + printf(" couldn't create container sub-group '%s'\n", + DATASET_PARTIAL_CHUNK_READ_HYPER_SEL_TEST_GROUP_NAME); goto error; } @@ -10618,7 +10584,7 @@ test_read_partial_chunk_hyperslab_selection(void) if (H5Pset_chunk(dcpl_id, DATASET_PARTIAL_CHUNK_READ_HYPER_SEL_TEST_DSET_SPACE_RANK, chunk_dims) < 0) { H5_FAILED(); - HDprintf(" failed to set chunking on DCPL\n"); + printf(" failed to set chunking on DCPL\n"); goto error; } @@ -10626,7 +10592,7 @@ test_read_partial_chunk_hyperslab_selection(void) DATASET_PARTIAL_CHUNK_READ_HYPER_SEL_TEST_DSET_DTYPE, fspace_id, H5P_DEFAULT, dcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create dataset '%s'\n", DATASET_PARTIAL_CHUNK_READ_HYPER_SEL_TEST_DSET_NAME); + printf(" couldn't create dataset '%s'\n", DATASET_PARTIAL_CHUNK_READ_HYPER_SEL_TEST_DSET_NAME); goto error; } @@ -10635,13 +10601,13 @@ test_read_partial_chunk_hyperslab_selection(void) */ if (H5Pclose(dcpl_id) < 0) { H5_FAILED(); - HDprintf(" failed to close DCPL\n"); + printf(" failed to close DCPL\n"); goto error; } if ((dcpl_id = H5Dget_create_plist(dset_id)) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve copy of DCPL\n"); + printf(" failed to retrieve copy of DCPL\n"); goto error; } @@ -10649,15 +10615,15 @@ test_read_partial_chunk_hyperslab_selection(void) if (H5Pget_chunk(dcpl_id, DATASET_PARTIAL_CHUNK_READ_HYPER_SEL_TEST_DSET_SPACE_RANK, retrieved_chunk_dims) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve chunking info\n"); + printf(" failed to retrieve chunking info\n"); goto error; } for (i = 0; i < DATASET_PARTIAL_CHUNK_READ_HYPER_SEL_TEST_DSET_SPACE_RANK; i++) { if (chunk_dims[i] != retrieved_chunk_dims[i]) { H5_FAILED(); - HDprintf(" chunk dimensionality retrieved from DCPL didn't match originally specified " - "dimensionality\n"); + printf(" chunk dimensionality retrieved from DCPL didn't match originally specified " + "dimensionality\n"); goto error; } } @@ -10681,7 +10647,7 @@ test_read_partial_chunk_hyperslab_selection(void) if ((mspace_id = H5Screate_simple(DATASET_PARTIAL_CHUNK_READ_HYPER_SEL_TEST_DSET_SPACE_RANK, mdims, NULL)) < 0) { H5_FAILED(); - HDprintf(" failed to create memory dataspace\n"); + printf(" failed to create memory dataspace\n"); goto error; } } @@ -10734,30 +10700,30 @@ test_read_partial_chunk_hyperslab_selection(void) if (H5Sselect_hyperslab(mspace_id, H5S_SELECT_SET, m_start, NULL, count, NULL) < 0) { H5_FAILED(); - HDprintf(" failed to select hyperslab in memory dataspace\n"); + printf(" failed to select hyperslab in memory dataspace\n"); goto error; } } else { if (H5Sselect_all(mspace_id) < 0) { H5_FAILED(); - HDprintf(" failed to select entire memory dataspace\n"); + printf(" failed to select entire memory dataspace\n"); goto error; } } if (H5Sselect_hyperslab(fspace_id, H5S_SELECT_SET, start, NULL, count, NULL) < 0) { H5_FAILED(); - HDprintf(" failed to select hyperslab\n"); + printf(" failed to select hyperslab\n"); goto error; } - HDprintf("\r Writing chunk %zu", i); + printf("\r Writing chunk %zu", i); if (H5Dwrite(dset_id, DATASET_PARTIAL_CHUNK_READ_HYPER_SEL_TEST_DSET_DTYPE, mspace_id, fspace_id, H5P_DEFAULT, write_buf) < 0) { H5_FAILED(); - HDprintf(" failed to write to dataset\n"); + printf(" failed to write to dataset\n"); goto error; } @@ -10771,28 +10737,28 @@ test_read_partial_chunk_hyperslab_selection(void) if ((dset_id = H5Dopen2(group_id, DATASET_PARTIAL_CHUNK_READ_HYPER_SEL_TEST_DSET_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" failed to re-open dataset\n"); + printf(" failed to re-open dataset\n"); goto error; } if ((fspace_id = H5Dget_space(dset_id)) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve dataspace from dataset\n"); + printf(" failed to retrieve dataspace from dataset\n"); goto error; } if (H5Sselect_hyperslab(fspace_id, H5S_SELECT_SET, start, NULL, count, NULL) < 0) { H5_FAILED(); - HDprintf(" failed to select hyperslab\n"); + printf(" failed to select hyperslab\n"); goto error; } - HDprintf("\r Reading chunk %zu", i); + printf("\r Reading chunk %zu", i); if (H5Dread(dset_id, DATASET_PARTIAL_CHUNK_READ_HYPER_SEL_TEST_DSET_DTYPE, mspace_id, fspace_id, H5P_DEFAULT, read_buf) < 0) { H5_FAILED(); - HDprintf(" failed to read from dataset\n"); + printf(" failed to read from dataset\n"); goto error; } @@ -10800,10 +10766,10 @@ test_read_partial_chunk_hyperslab_selection(void) for (k = 0; k < FIXED_CHUNK_DIMSIZE; k++) if (read_buf[j][k] != (int)((j * FIXED_CHUNK_DIMSIZE) + k)) { H5_FAILED(); - HDprintf(" data verification failed for read buffer element %lld: expected %lld but " - "was %lld\n", - (long long)((j * FIXED_CHUNK_DIMSIZE) + k), - (long long)((j * FIXED_CHUNK_DIMSIZE) + k), (long long)read_buf[j][k]); + printf(" data verification failed for read buffer element %lld: expected %lld but " + "was %lld\n", + (long long)((j * FIXED_CHUNK_DIMSIZE) + k), + (long long)((j * FIXED_CHUNK_DIMSIZE) + k), (long long)read_buf[j][k]); goto error; } } @@ -10889,14 +10855,14 @@ test_get_vlen_buf_size(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_MORE)) { SKIPPED(); - HDprintf(" API functions for basic file, group, or dataset aren't supported with this " - "connector\n"); + printf(" API functions for basic file, group, or dataset aren't supported with this " + "connector\n"); return 0; } /* Allocate and initialize VL data to write */ for (i = 0; i < DATASET_GET_VLEN_BUF_SIZE_DSET_SPACE_DIM; i++) { - wdata[i].p = HDmalloc((i + 1) * sizeof(unsigned int)); + wdata[i].p = malloc((i + 1) * sizeof(unsigned int)); wdata[i].len = i + 1; for (j = 0; j < (i + 1); j++) ((unsigned int *)wdata[i].p)[j] = i * 10 + j; @@ -10905,20 +10871,20 @@ test_get_vlen_buf_size(void) /* Open the file */ if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, DATASET_GET_VLEN_BUF_SIZE_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container sub-group '%s'\n", DATASET_GET_VLEN_BUF_SIZE_GROUP_NAME); + printf(" couldn't create container sub-group '%s'\n", DATASET_GET_VLEN_BUF_SIZE_GROUP_NAME); goto error; } @@ -10948,11 +10914,11 @@ test_get_vlen_buf_size(void) ((DATASET_GET_VLEN_BUF_SIZE_DSET_SPACE_DIM * (DATASET_GET_VLEN_BUF_SIZE_DSET_SPACE_DIM + 1)) / 2) * sizeof(unsigned int)) { H5_FAILED(); - HDprintf( - " H5Dvlen_get_buf_size returned wrong size (%lu), compared to the correct size (%lu)\n", size, - ((DATASET_GET_VLEN_BUF_SIZE_DSET_SPACE_DIM * (DATASET_GET_VLEN_BUF_SIZE_DSET_SPACE_DIM + 1)) / - 2) * - sizeof(unsigned int)); + printf(" H5Dvlen_get_buf_size returned wrong size (%lu), compared to the correct size (%lu)\n", + size, + ((DATASET_GET_VLEN_BUF_SIZE_DSET_SPACE_DIM * (DATASET_GET_VLEN_BUF_SIZE_DSET_SPACE_DIM + 1)) / + 2) * + sizeof(unsigned int)); goto error; } @@ -11005,17 +10971,17 @@ H5_api_dataset_test(void) size_t i; int nerrors; - HDprintf("**********************************************\n"); - HDprintf("* *\n"); - HDprintf("* API Dataset Tests *\n"); - HDprintf("* *\n"); - HDprintf("**********************************************\n\n"); + printf("**********************************************\n"); + printf("* *\n"); + printf("* API Dataset Tests *\n"); + printf("* *\n"); + printf("**********************************************\n\n"); for (i = 0, nerrors = 0; i < ARRAY_LENGTH(dataset_tests); i++) { nerrors += (*dataset_tests[i])() ? 1 : 0; } - HDprintf("\n"); + printf("\n"); return nerrors; } diff --git a/test/API/H5_api_datatype_test.c b/test/API/H5_api_datatype_test.c index 8bcd19a..7a67210 100644 --- a/test/API/H5_api_datatype_test.c +++ b/test/API/H5_api_datatype_test.c @@ -90,40 +90,40 @@ test_create_committed_datatype(void) if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_STORED_DATATYPES)) { SKIPPED(); - HDprintf(" API functions for basic file, group, or stored datatype aren't supported with this " - "connector\n"); + printf(" API functions for basic file, group, or stored datatype aren't supported with this " + "connector\n"); return 0; } if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, DATATYPE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", DATATYPE_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", DATATYPE_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, DATATYPE_CREATE_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container sub-group '%s'\n", DATATYPE_CREATE_TEST_GROUP_NAME); + printf(" couldn't create container sub-group '%s'\n", DATATYPE_CREATE_TEST_GROUP_NAME); goto error; } if ((type_id = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) { H5_FAILED(); - HDprintf(" couldn't create datatype to commit\n"); + printf(" couldn't create datatype to commit\n"); goto error; } if (H5Tcommit2(group_id, DATATYPE_CREATE_TEST_TYPE_NAME, type_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't commit datatype '%s'\n", DATATYPE_CREATE_TEST_TYPE_NAME); + printf(" couldn't commit datatype '%s'\n", DATATYPE_CREATE_TEST_TYPE_NAME); goto error; } @@ -171,8 +171,8 @@ test_create_committed_datatype_invalid_params(void) if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_STORED_DATATYPES)) { SKIPPED(); - HDprintf(" API functions for basic file, group, or stored datatype aren't supported with this " - "connector\n"); + printf(" API functions for basic file, group, or stored datatype aren't supported with this " + "connector\n"); return 0; } @@ -180,27 +180,27 @@ test_create_committed_datatype_invalid_params(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, DATATYPE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", DATATYPE_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", DATATYPE_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, DATATYPE_CREATE_INVALID_PARAMS_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container sub-group '%s'\n", - DATATYPE_CREATE_INVALID_PARAMS_TEST_GROUP_NAME); + printf(" couldn't create container sub-group '%s'\n", + DATATYPE_CREATE_INVALID_PARAMS_TEST_GROUP_NAME); goto error; } if ((type_id = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) { H5_FAILED(); - HDprintf(" couldn't create datatype to commit\n"); + printf(" couldn't create datatype to commit\n"); goto error; } @@ -221,7 +221,7 @@ test_create_committed_datatype_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Tcommit2 succeeded with an invalid loc_id!\n"); + printf(" H5Tcommit2 succeeded with an invalid loc_id!\n"); PART_ERROR(H5Tcommit2_invalid_loc_id); } @@ -241,7 +241,7 @@ test_create_committed_datatype_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Tcommit2 succeeded with an invalid datatype name!\n"); + printf(" H5Tcommit2 succeeded with an invalid datatype name!\n"); PART_ERROR(H5Tcommit2_invalid_type_name); } @@ -253,7 +253,7 @@ test_create_committed_datatype_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Tcommit2 succeeded with an invalid datatype name!\n"); + printf(" H5Tcommit2 succeeded with an invalid datatype name!\n"); PART_ERROR(H5Tcommit2_invalid_type_name); } @@ -274,7 +274,7 @@ test_create_committed_datatype_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Tcommit2 succeeded with an invalid datatype ID!\n"); + printf(" H5Tcommit2 succeeded with an invalid datatype ID!\n"); PART_ERROR(H5Tcommit2_invalid_type_id); } @@ -295,7 +295,7 @@ test_create_committed_datatype_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Tcommit2 succeeded with an invalid LCPL!\n"); + printf(" H5Tcommit2 succeeded with an invalid LCPL!\n"); PART_ERROR(H5Tcommit2_invalid_lcpl); } @@ -316,7 +316,7 @@ test_create_committed_datatype_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Tcommit2 succeeded with an invalid TCPL!\n"); + printf(" H5Tcommit2 succeeded with an invalid TCPL!\n"); PART_ERROR(H5Tcommit2_invalid_tcpl); } @@ -337,7 +337,7 @@ test_create_committed_datatype_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Tcommit2 succeeded with an invalid TAPL!\n"); + printf(" H5Tcommit2 succeeded with an invalid TAPL!\n"); PART_ERROR(H5Tcommit2_invalid_tapl); } @@ -392,39 +392,39 @@ test_create_anonymous_committed_datatype(void) if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_STORED_DATATYPES)) { SKIPPED(); - HDprintf(" API functions for basic file, group, or stored datatype aren't supported with this " - "connector\n"); + printf(" API functions for basic file, group, or stored datatype aren't supported with this " + "connector\n"); return 0; } if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, DATATYPE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", DATATYPE_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", DATATYPE_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, DATATYPE_CREATE_ANONYMOUS_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container sub-group '%s'\n", DATATYPE_CREATE_ANONYMOUS_GROUP_NAME); + printf(" couldn't create container sub-group '%s'\n", DATATYPE_CREATE_ANONYMOUS_GROUP_NAME); goto error; } if ((type_id = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) { H5_FAILED(); - HDprintf(" couldn't create datatype\n"); + printf(" couldn't create datatype\n"); goto error; } if (H5Tcommit_anon(group_id, type_id, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't commit anonymous datatype\n"); + printf(" couldn't commit anonymous datatype\n"); goto error; } @@ -472,8 +472,8 @@ test_create_anonymous_committed_datatype_invalid_params(void) if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_STORED_DATATYPES)) { SKIPPED(); - HDprintf(" API functions for basic file, group, or stored datatype aren't supported with this " - "connector\n"); + printf(" API functions for basic file, group, or stored datatype aren't supported with this " + "connector\n"); return 0; } @@ -481,27 +481,27 @@ test_create_anonymous_committed_datatype_invalid_params(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, DATATYPE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", DATATYPE_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", DATATYPE_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, DATATYPE_CREATE_ANONYMOUS_INVALID_PARAMS_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container sub-group '%s'\n", - DATATYPE_CREATE_ANONYMOUS_INVALID_PARAMS_GROUP_NAME); + printf(" couldn't create container sub-group '%s'\n", + DATATYPE_CREATE_ANONYMOUS_INVALID_PARAMS_GROUP_NAME); goto error; } if ((type_id = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) { H5_FAILED(); - HDprintf(" couldn't create datatype\n"); + printf(" couldn't create datatype\n"); goto error; } @@ -521,7 +521,7 @@ test_create_anonymous_committed_datatype_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Tcommit_anon succeeded with an invalid loc_id!\n"); + printf(" H5Tcommit_anon succeeded with an invalid loc_id!\n"); PART_ERROR(H5Tcommit_anon_invalid_loc_id); } @@ -541,7 +541,7 @@ test_create_anonymous_committed_datatype_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Tcommit_anon succeeded with an invalid datatype ID!\n"); + printf(" H5Tcommit_anon succeeded with an invalid datatype ID!\n"); PART_ERROR(H5Tcommit_anon_invalid_type_id); } @@ -561,7 +561,7 @@ test_create_anonymous_committed_datatype_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Tcommit_anon succeeded with an invalid TCPL!\n"); + printf(" H5Tcommit_anon succeeded with an invalid TCPL!\n"); PART_ERROR(H5Tcommit_anon_invalid_tcpl); } @@ -581,7 +581,7 @@ test_create_anonymous_committed_datatype_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Tcommit_anon succeeded with an invalid TAPL!\n"); + printf(" H5Tcommit_anon succeeded with an invalid TAPL!\n"); PART_ERROR(H5Tcommit_anon_invalid_tapl); } @@ -638,8 +638,8 @@ test_create_committed_datatype_empty_types(void) if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_STORED_DATATYPES)) { SKIPPED(); - HDprintf(" API functions for basic file, group, or stored datatype aren't supported with this " - "connector\n"); + printf(" API functions for basic file, group, or stored datatype aren't supported with this " + "connector\n"); return 0; } @@ -647,21 +647,20 @@ test_create_committed_datatype_empty_types(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, DATATYPE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", DATATYPE_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", DATATYPE_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, DATATYPE_CREATE_EMPTY_TYPES_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container sub-group '%s'\n", - DATATYPE_CREATE_EMPTY_TYPES_TEST_GROUP_NAME); + printf(" couldn't create container sub-group '%s'\n", DATATYPE_CREATE_EMPTY_TYPES_TEST_GROUP_NAME); goto error; } @@ -675,7 +674,7 @@ test_create_committed_datatype_empty_types(void) if ((type_id = H5Tcreate(H5T_COMPOUND, (size_t)32)) < 0) { H5_FAILED(); - HDprintf(" failed to create compound type\n"); + printf(" failed to create compound type\n"); PART_ERROR(H5Tcommit_empty_compound_type); } @@ -688,14 +687,14 @@ test_create_committed_datatype_empty_types(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" committed empty compound datatype!\n"); + printf(" committed empty compound datatype!\n"); PART_ERROR(H5Tcommit_empty_compound_type); } /* Add a field to the compound datatype */ if (H5Tinsert(type_id, "a", (size_t)0, H5T_NATIVE_INT) < 0) { H5_FAILED(); - HDprintf(" failed to insert field into compound datatype\n"); + printf(" failed to insert field into compound datatype\n"); PART_ERROR(H5Tcommit_empty_compound_type); } @@ -703,7 +702,7 @@ test_create_committed_datatype_empty_types(void) if (H5Tcommit2(group_id, DATATYPE_CREATE_EMPTY_TYPES_TEST_CMPD_TYPE_NAME, type_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to commit non-empty compound datatype\n"); + printf(" failed to commit non-empty compound datatype\n"); PART_ERROR(H5Tcommit_empty_compound_type); } @@ -728,7 +727,7 @@ test_create_committed_datatype_empty_types(void) if ((type_id = H5Tenum_create(H5T_NATIVE_INT)) < 0) { H5_FAILED(); - HDprintf(" failed to create enum type\n"); + printf(" failed to create enum type\n"); PART_ERROR(H5Tcommit_empty_enum_type); } @@ -741,14 +740,14 @@ test_create_committed_datatype_empty_types(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" committed empty enum datatype!\n"); + printf(" committed empty enum datatype!\n"); PART_ERROR(H5Tcommit_empty_enum_type); } /* Add a field to the enum datatype */ if (H5Tenum_insert(type_id, "a", &enum_val) < 0) { H5_FAILED(); - HDprintf(" failed to insert field into enum datatype\n"); + printf(" failed to insert field into enum datatype\n"); PART_ERROR(H5Tcommit_empty_enum_type); } @@ -756,7 +755,7 @@ test_create_committed_datatype_empty_types(void) if (H5Tcommit2(group_id, DATATYPE_CREATE_EMPTY_TYPES_TEST_ENUM_TYPE_NAME, type_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to commit non-empty enum datatype\n"); + printf(" failed to commit non-empty enum datatype\n"); PART_ERROR(H5Tcommit_empty_enum_type); } @@ -814,52 +813,52 @@ test_recommit_committed_type(void) if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_STORED_DATATYPES)) { SKIPPED(); - HDprintf(" API functions for basic file, group, or stored datatype aren't supported with this " - "connector\n"); + printf(" API functions for basic file, group, or stored datatype aren't supported with this " + "connector\n"); return 0; } if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, DATATYPE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", DATATYPE_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", DATATYPE_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, RECOMMIT_COMMITTED_TYPE_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container sub-group '%s'\n", RECOMMIT_COMMITTED_TYPE_TEST_GROUP_NAME); + printf(" couldn't create container sub-group '%s'\n", RECOMMIT_COMMITTED_TYPE_TEST_GROUP_NAME); goto error; } /* Copy a predefined datatype and commit the copy */ if ((type_id = H5Tcopy(H5T_NATIVE_INT)) < 0) { H5_FAILED(); - HDprintf(" failed to copy predefined integer datatype\n"); + printf(" failed to copy predefined integer datatype\n"); goto error; } if (H5Tcommit2(group_id, "native_int", type_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to commit datatype\n"); + printf(" failed to commit datatype\n"); goto error; } if ((is_committed = H5Tcommitted(type_id)) < 0) { H5_FAILED(); - HDprintf(" failed to determine if datatype is committed\n"); + printf(" failed to determine if datatype is committed\n"); goto error; } if (!is_committed) { H5_FAILED(); - HDprintf(" H5Tcommitted() returned false!\n"); + printf(" H5Tcommitted() returned false!\n"); goto error; } @@ -872,7 +871,7 @@ test_recommit_committed_type(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" re-committed an already committed datatype!\n"); + printf(" re-committed an already committed datatype!\n"); goto error; } @@ -919,40 +918,40 @@ test_open_committed_datatype(void) if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_STORED_DATATYPES)) { SKIPPED(); - HDprintf(" API functions for basic file, group, or stored datatype aren't supported with this " - "connector\n"); + printf(" API functions for basic file, group, or stored datatype aren't supported with this " + "connector\n"); return 0; } if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, DATATYPE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", DATATYPE_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", DATATYPE_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, DATATYPE_OPEN_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container sub-group '%s'\n", DATATYPE_OPEN_TEST_GROUP_NAME); + printf(" couldn't create container sub-group '%s'\n", DATATYPE_OPEN_TEST_GROUP_NAME); goto error; } if ((type_id = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) { H5_FAILED(); - HDprintf(" couldn't create datatype to commit\n"); + printf(" couldn't create datatype to commit\n"); goto error; } if (H5Tcommit2(group_id, DATATYPE_OPEN_TEST_TYPE_NAME, type_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't commit datatype '%s'\n", DATATYPE_OPEN_TEST_TYPE_NAME); + printf(" couldn't commit datatype '%s'\n", DATATYPE_OPEN_TEST_TYPE_NAME); goto error; } @@ -961,7 +960,7 @@ test_open_committed_datatype(void) if ((type_id = H5Topen2(group_id, DATATYPE_OPEN_TEST_TYPE_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open committed datatype '%s'\n", DATATYPE_OPEN_TEST_TYPE_NAME); + printf(" couldn't open committed datatype '%s'\n", DATATYPE_OPEN_TEST_TYPE_NAME); goto error; } @@ -1008,8 +1007,8 @@ test_open_committed_datatype_invalid_params(void) if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_STORED_DATATYPES)) { SKIPPED(); - HDprintf(" API functions for basic file, group, or stored datatype aren't supported with this " - "connector\n"); + printf(" API functions for basic file, group, or stored datatype aren't supported with this " + "connector\n"); return 0; } @@ -1017,34 +1016,34 @@ test_open_committed_datatype_invalid_params(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, DATATYPE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", DATATYPE_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", DATATYPE_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, DATATYPE_OPEN_INVALID_PARAMS_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container sub-group '%s'\n", - DATATYPE_OPEN_INVALID_PARAMS_TEST_GROUP_NAME); + printf(" couldn't create container sub-group '%s'\n", + DATATYPE_OPEN_INVALID_PARAMS_TEST_GROUP_NAME); goto error; } if ((type_id = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) { H5_FAILED(); - HDprintf(" couldn't create datatype to commit\n"); + printf(" couldn't create datatype to commit\n"); goto error; } if (H5Tcommit2(group_id, DATATYPE_OPEN_INVALID_PARAMS_TEST_TYPE_NAME, type_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't commit datatype '%s'\n", DATATYPE_OPEN_INVALID_PARAMS_TEST_TYPE_NAME); + printf(" couldn't commit datatype '%s'\n", DATATYPE_OPEN_INVALID_PARAMS_TEST_TYPE_NAME); goto error; } @@ -1067,7 +1066,7 @@ test_open_committed_datatype_invalid_params(void) if (type_id >= 0) { H5_FAILED(); - HDprintf(" opened committed datatype with an invalid location ID!\n"); + printf(" opened committed datatype with an invalid location ID!\n"); H5Tclose(type_id); PART_ERROR(H5Topen2_invalid_loc_id); } @@ -1088,7 +1087,7 @@ test_open_committed_datatype_invalid_params(void) if (type_id >= 0) { H5_FAILED(); - HDprintf(" opened committed datatype with an invalid datatype name!\n"); + printf(" opened committed datatype with an invalid datatype name!\n"); H5Tclose(type_id); PART_ERROR(H5Topen2_invalid_type_name); } @@ -1101,7 +1100,7 @@ test_open_committed_datatype_invalid_params(void) if (type_id >= 0) { H5_FAILED(); - HDprintf(" opened committed datatype with an invalid datatype name!\n"); + printf(" opened committed datatype with an invalid datatype name!\n"); H5Tclose(type_id); PART_ERROR(H5Topen2_invalid_type_name); } @@ -1122,7 +1121,7 @@ test_open_committed_datatype_invalid_params(void) if (type_id >= 0) { H5_FAILED(); - HDprintf(" opened committed datatype with an invalid TAPL!\n"); + printf(" opened committed datatype with an invalid TAPL!\n"); H5Tclose(type_id); PART_ERROR(H5Topen2_invalid_tapl); } @@ -1182,8 +1181,8 @@ test_reopen_committed_datatype_indirect(void) !(vol_cap_flags_g & H5VL_CAP_FLAG_STORED_DATATYPES) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_MORE)) { SKIPPED(); - HDprintf(" API functions for basic file, group, dataset, or stored datatype aren't supported with " - "this connector\n"); + printf(" API functions for basic file, group, dataset, or stored datatype aren't supported with " + "this connector\n"); return 0; } @@ -1191,20 +1190,20 @@ test_reopen_committed_datatype_indirect(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, DATATYPE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", DATATYPE_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", DATATYPE_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, DATATYPE_REOPEN_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container sub-group '%s'\n", DATATYPE_REOPEN_TEST_GROUP_NAME); + printf(" couldn't create container sub-group '%s'\n", DATATYPE_REOPEN_TEST_GROUP_NAME); goto error; } @@ -1221,51 +1220,51 @@ test_reopen_committed_datatype_indirect(void) if ((strtype = H5Tcopy(H5T_C_S1)) < 0) { H5_FAILED(); - HDprintf(" failed to copy C-string datatype\n"); + printf(" failed to copy C-string datatype\n"); PART_ERROR(reopen_compound_type); } if (H5Tset_size(strtype, H5T_VARIABLE) < 0) { H5_FAILED(); - HDprintf(" failed to set string datatype's size to variable\n"); + printf(" failed to set string datatype's size to variable\n"); PART_ERROR(reopen_compound_type); } if ((type_id = H5Tcreate(H5T_COMPOUND, sizeof(char *))) < 0) { H5_FAILED(); - HDprintf(" failed to create compound datatype\n"); + printf(" failed to create compound datatype\n"); PART_ERROR(reopen_compound_type); } if (H5Tinsert(type_id, "vlstr", (size_t)0, strtype) < 0) { H5_FAILED(); - HDprintf(" failed to insert field into compound datatype\n"); + printf(" failed to insert field into compound datatype\n"); PART_ERROR(reopen_compound_type); } if (H5Tclose(strtype) < 0) { H5_FAILED(); - HDprintf(" failed to close string datatype\n"); + printf(" failed to close string datatype\n"); PART_ERROR(reopen_compound_type); } /* Get size of compound type */ if ((dt_size = H5Tget_size(type_id)) == 0) { H5_FAILED(); - HDprintf(" failed to retrieve size of compound datatype\n"); + printf(" failed to retrieve size of compound datatype\n"); PART_ERROR(reopen_compound_type); } /* Commit compound type and verify the size doesn't change */ if (H5Tcommit2(group_id, "cmpd_type", type_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to commit compound datatype\n"); + printf(" failed to commit compound datatype\n"); PART_ERROR(reopen_compound_type); } if (dt_size != H5Tget_size(type_id)) { H5_FAILED(); - HDprintf(" committing datatype caused its size to change!\n"); + printf(" committing datatype caused its size to change!\n"); PART_ERROR(reopen_compound_type); } @@ -1273,20 +1272,20 @@ test_reopen_committed_datatype_indirect(void) if ((dset_id = H5Dcreate2(group_id, "cmpd_dset", type_id, space_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" failed to create dataset using committed datatype\n"); + printf(" failed to create dataset using committed datatype\n"); PART_ERROR(reopen_compound_type); } /* Indirectly reopen type and verify that the size doesn't change */ if ((reopened_type_id = H5Dget_type(dset_id)) < 0) { H5_FAILED(); - HDprintf(" failed to re-open committed datatype using H5Dget_type\n"); + printf(" failed to re-open committed datatype using H5Dget_type\n"); PART_ERROR(reopen_compound_type); } if (dt_size != H5Tget_size(reopened_type_id)) { H5_FAILED(); - HDprintf(" size of re-opened datatype didn't match size of original datatype\n"); + printf(" size of re-opened datatype didn't match size of original datatype\n"); PART_ERROR(reopen_compound_type); } @@ -1315,41 +1314,41 @@ test_reopen_committed_datatype_indirect(void) if ((type_id = H5Tenum_create(H5T_NATIVE_INT)) < 0) { H5_FAILED(); - HDprintf(" failed to create enum datatype\n"); + printf(" failed to create enum datatype\n"); PART_ERROR(reopen_enum_type); } enum_value = 0; if (H5Tenum_insert(type_id, "val1", &enum_value) < 0) { H5_FAILED(); - HDprintf(" failed to insert value into enum datatype\n"); + printf(" failed to insert value into enum datatype\n"); PART_ERROR(reopen_enum_type); } enum_value = 1; if (H5Tenum_insert(type_id, "val2", &enum_value) < 0) { H5_FAILED(); - HDprintf(" failed to insert value into enum datatype\n"); + printf(" failed to insert value into enum datatype\n"); PART_ERROR(reopen_enum_type); } /* Get size of enum type */ if ((dt_size = H5Tget_size(type_id)) == 0) { H5_FAILED(); - HDprintf(" failed to retrieve size of enum datatype\n"); + printf(" failed to retrieve size of enum datatype\n"); PART_ERROR(reopen_enum_type); } /* Commit enum type and verify the size doesn't change */ if (H5Tcommit2(group_id, "enum_type", type_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to commit enum datatype\n"); + printf(" failed to commit enum datatype\n"); PART_ERROR(reopen_enum_type); } if (dt_size != H5Tget_size(type_id)) { H5_FAILED(); - HDprintf(" committing datatype caused its size to change!\n"); + printf(" committing datatype caused its size to change!\n"); PART_ERROR(reopen_enum_type); } @@ -1357,20 +1356,20 @@ test_reopen_committed_datatype_indirect(void) if ((dset_id = H5Dcreate2(group_id, "enum_dset", type_id, space_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" failed to create dataset using committed datatype\n"); + printf(" failed to create dataset using committed datatype\n"); PART_ERROR(reopen_enum_type); } /* Indirectly reopen type and verify that the size doesn't change */ if ((reopened_type_id = H5Dget_type(dset_id)) < 0) { H5_FAILED(); - HDprintf(" failed to re-open committed datatype using H5Dget_type\n"); + printf(" failed to re-open committed datatype using H5Dget_type\n"); PART_ERROR(reopen_enum_type); } if (dt_size != H5Tget_size(reopened_type_id)) { H5_FAILED(); - HDprintf(" size of re-opened datatype didn't match size of original datatype\n"); + printf(" size of re-opened datatype didn't match size of original datatype\n"); PART_ERROR(reopen_enum_type); } @@ -1395,27 +1394,27 @@ test_reopen_committed_datatype_indirect(void) if ((type_id = H5Tvlen_create(H5T_NATIVE_INT)) < 0) { H5_FAILED(); - HDprintf(" failed to create variable-length datatype\n"); + printf(" failed to create variable-length datatype\n"); PART_ERROR(reopen_vlen_type); } /* Get size of variable-length type */ if ((dt_size = H5Tget_size(type_id)) == 0) { H5_FAILED(); - HDprintf(" failed to retrieve size of variable-length datatype\n"); + printf(" failed to retrieve size of variable-length datatype\n"); PART_ERROR(reopen_vlen_type); } /* Commit variable-length type and verify the size doesn't change */ if (H5Tcommit2(group_id, "vlen_type", type_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to commit variable-length datatype\n"); + printf(" failed to commit variable-length datatype\n"); PART_ERROR(reopen_vlen_type); } if (dt_size != H5Tget_size(type_id)) { H5_FAILED(); - HDprintf(" committing datatype caused its size to change!\n"); + printf(" committing datatype caused its size to change!\n"); PART_ERROR(reopen_vlen_type); } @@ -1423,20 +1422,20 @@ test_reopen_committed_datatype_indirect(void) if ((dset_id = H5Dcreate2(group_id, "vlen_dset", type_id, space_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" failed to create dataset using committed datatype\n"); + printf(" failed to create dataset using committed datatype\n"); PART_ERROR(reopen_vlen_type); } /* Indirectly reopen type and verify that the size doesn't change */ if ((reopened_type_id = H5Dget_type(dset_id)) < 0) { H5_FAILED(); - HDprintf(" failed to re-open committed datatype using H5Dget_type\n"); + printf(" failed to re-open committed datatype using H5Dget_type\n"); PART_ERROR(reopen_vlen_type); } if (dt_size != H5Tget_size(reopened_type_id)) { H5_FAILED(); - HDprintf(" size of re-opened datatype didn't match size of original datatype\n"); + printf(" size of re-opened datatype didn't match size of original datatype\n"); PART_ERROR(reopen_vlen_type); } @@ -1463,33 +1462,33 @@ test_reopen_committed_datatype_indirect(void) if ((type_id = H5Tcreate(H5T_OPAQUE, (size_t)13)) < 0) { H5_FAILED(); - HDprintf(" failed to create opaque datatype\n"); + printf(" failed to create opaque datatype\n"); PART_ERROR(reopen_opaque_type); } if (H5Tset_tag(type_id, tag) < 0) { H5_FAILED(); - HDprintf(" failed to set tag on opaque datatype\n"); + printf(" failed to set tag on opaque datatype\n"); PART_ERROR(reopen_opaque_type); } /* Get size of opaque type */ if ((dt_size = H5Tget_size(type_id)) == 0) { H5_FAILED(); - HDprintf(" failed to retrieve size of opaque datatype\n"); + printf(" failed to retrieve size of opaque datatype\n"); PART_ERROR(reopen_opaque_type); } /* Commit opaque type and verify the size doesn't change */ if (H5Tcommit2(group_id, "opaque_type", type_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to commit opaque datatype\n"); + printf(" failed to commit opaque datatype\n"); PART_ERROR(reopen_opaque_type); } if (dt_size != H5Tget_size(type_id)) { H5_FAILED(); - HDprintf(" committing datatype caused its size to change!\n"); + printf(" committing datatype caused its size to change!\n"); PART_ERROR(reopen_opaque_type); } @@ -1497,20 +1496,20 @@ test_reopen_committed_datatype_indirect(void) if ((dset_id = H5Dcreate2(group_id, "opaque_dset", type_id, space_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" failed to create dataset using committed datatype\n"); + printf(" failed to create dataset using committed datatype\n"); PART_ERROR(reopen_opaque_type); } /* Indirectly reopen type and verify that the size doesn't change */ if ((reopened_type_id = H5Dget_type(dset_id)) < 0) { H5_FAILED(); - HDprintf(" failed to re-open committed datatype using H5Dget_type\n"); + printf(" failed to re-open committed datatype using H5Dget_type\n"); PART_ERROR(reopen_opaque_type); } if (dt_size != H5Tget_size(reopened_type_id)) { H5_FAILED(); - HDprintf(" size of re-opened datatype didn't match size of original datatype\n"); + printf(" size of re-opened datatype didn't match size of original datatype\n"); PART_ERROR(reopen_opaque_type); } @@ -1537,27 +1536,27 @@ test_reopen_committed_datatype_indirect(void) if ((type_id = H5Tarray_create2(H5T_NATIVE_INT, 1, array_dims)) < 0) { H5_FAILED(); - HDprintf(" failed to create array datatype\n"); + printf(" failed to create array datatype\n"); PART_ERROR(reopen_array_type); } /* Get size of array type */ if ((dt_size = H5Tget_size(type_id)) == 0) { H5_FAILED(); - HDprintf(" failed to retrieve size of array datatype\n"); + printf(" failed to retrieve size of array datatype\n"); PART_ERROR(reopen_array_type); } /* Commit array type and verify the size doesn't change */ if (H5Tcommit2(group_id, "array_type", type_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to commit array datatype\n"); + printf(" failed to commit array datatype\n"); PART_ERROR(reopen_array_type); } if (dt_size != H5Tget_size(type_id)) { H5_FAILED(); - HDprintf(" committing datatype caused its size to change!\n"); + printf(" committing datatype caused its size to change!\n"); PART_ERROR(reopen_array_type); } @@ -1565,20 +1564,20 @@ test_reopen_committed_datatype_indirect(void) if ((dset_id = H5Dcreate2(group_id, "array_dset", type_id, space_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" failed to create dataset using committed datatype\n"); + printf(" failed to create dataset using committed datatype\n"); PART_ERROR(reopen_array_type); } /* Indirectly reopen type and verify that the size doesn't change */ if ((reopened_type_id = H5Dget_type(dset_id)) < 0) { H5_FAILED(); - HDprintf(" failed to re-open committed datatype using H5Dget_type\n"); + printf(" failed to re-open committed datatype using H5Dget_type\n"); PART_ERROR(reopen_array_type); } if (dt_size != H5Tget_size(reopened_type_id)) { H5_FAILED(); - HDprintf(" size of re-opened datatype didn't match size of original datatype\n"); + printf(" size of re-opened datatype didn't match size of original datatype\n"); PART_ERROR(reopen_array_type); } @@ -1647,14 +1646,13 @@ test_close_committed_datatype_invalid_id(void) if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_STORED_DATATYPES)) { SKIPPED(); - HDprintf( - " API functions for basic file or stored datatype aren't supported with this connector\n"); + printf(" API functions for basic file or stored datatype aren't supported with this connector\n"); return 0; } if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } @@ -1666,7 +1664,7 @@ test_close_committed_datatype_invalid_id(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Tclose succeeded with an invalid committed datatype ID!\n"); + printf(" H5Tclose succeeded with an invalid committed datatype ID!\n"); goto error; } @@ -1706,8 +1704,8 @@ test_datatype_property_lists(void) if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_STORED_DATATYPES) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GET_PLIST)) { SKIPPED(); - HDprintf(" API functions for basic file, group, stored datatype, or getting property list aren't " - "supported with this connector\n"); + printf(" API functions for basic file, group, stored datatype, or getting property list aren't " + "supported with this connector\n"); return 0; } @@ -1715,38 +1713,38 @@ test_datatype_property_lists(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, DATATYPE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", DATATYPE_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", DATATYPE_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, DATATYPE_PROPERTY_LIST_TEST_SUBGROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container sub-group '%s'\n", DATATYPE_PROPERTY_LIST_TEST_SUBGROUP_NAME); + printf(" couldn't create container sub-group '%s'\n", DATATYPE_PROPERTY_LIST_TEST_SUBGROUP_NAME); goto error; } if ((type_id1 = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) { H5_FAILED(); - HDprintf(" couldn't create datatype\n"); + printf(" couldn't create datatype\n"); goto error; } if ((type_id2 = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) { H5_FAILED(); - HDprintf(" couldn't create datatype\n"); + printf(" couldn't create datatype\n"); goto error; } if ((tcpl_id1 = H5Pcreate(H5P_DATATYPE_CREATE)) < 0) { H5_FAILED(); - HDprintf(" couldn't create TCPL\n"); + printf(" couldn't create TCPL\n"); goto error; } @@ -1755,14 +1753,14 @@ test_datatype_property_lists(void) if (H5Tcommit2(group_id, DATATYPE_PROPERTY_LIST_TEST_DATATYPE_NAME1, type_id1, H5P_DEFAULT, tcpl_id1, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't commit datatype '%s'\n", DATATYPE_PROPERTY_LIST_TEST_DATATYPE_NAME1); + printf(" couldn't commit datatype '%s'\n", DATATYPE_PROPERTY_LIST_TEST_DATATYPE_NAME1); goto error; } if (H5Tcommit2(group_id, DATATYPE_PROPERTY_LIST_TEST_DATATYPE_NAME2, type_id2, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't commit datatype '%s'\n", DATATYPE_PROPERTY_LIST_TEST_DATATYPE_NAME2); + printf(" couldn't commit datatype '%s'\n", DATATYPE_PROPERTY_LIST_TEST_DATATYPE_NAME2); goto error; } @@ -1780,13 +1778,13 @@ test_datatype_property_lists(void) /* Try to receive copies for the two property lists */ if ((tcpl_id1 = H5Tget_create_plist(type_id1)) < 0) { H5_FAILED(); - HDprintf(" couldn't get property list\n"); + printf(" couldn't get property list\n"); PART_ERROR(H5Tget_create_plist); } if ((tcpl_id2 = H5Tget_create_plist(type_id2)) < 0) { H5_FAILED(); - HDprintf(" couldn't get property list\n"); + printf(" couldn't get property list\n"); PART_ERROR(H5Tget_create_plist); } @@ -1837,26 +1835,26 @@ test_datatype_property_lists(void) if ((type_id1 = H5Topen2(group_id, DATATYPE_PROPERTY_LIST_TEST_DATATYPE_NAME1, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open datatype '%s'\n", DATATYPE_PROPERTY_LIST_TEST_DATATYPE_NAME1); + printf(" couldn't open datatype '%s'\n", DATATYPE_PROPERTY_LIST_TEST_DATATYPE_NAME1); PART_ERROR(H5Tget_create_plist_reopened); } if ((type_id2 = H5Topen2(group_id, DATATYPE_PROPERTY_LIST_TEST_DATATYPE_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open datatype '%s'\n", DATATYPE_PROPERTY_LIST_TEST_DATATYPE_NAME2); + printf(" couldn't open datatype '%s'\n", DATATYPE_PROPERTY_LIST_TEST_DATATYPE_NAME2); PART_ERROR(H5Tget_create_plist_reopened); } if ((tcpl_id1 = H5Tget_create_plist(type_id1)) < 0) { H5_FAILED(); - HDprintf(" couldn't get property list\n"); + printf(" couldn't get property list\n"); PART_ERROR(H5Tget_create_plist_reopened); } if ((tcpl_id2 = H5Tget_create_plist(type_id2)) < 0) { H5_FAILED(); - HDprintf(" couldn't get property list\n"); + printf(" couldn't get property list\n"); PART_ERROR(H5Tget_create_plist_reopened); } @@ -1923,40 +1921,40 @@ test_create_dataset_with_committed_type(void) !(vol_cap_flags_g & H5VL_CAP_FLAG_STORED_DATATYPES) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC)) { SKIPPED(); - HDprintf(" API functions for basic file, group, dataset, or stored datatype aren't supported with " - "this connector\n"); + printf(" API functions for basic file, group, dataset, or stored datatype aren't supported with " + "this connector\n"); return 0; } if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, DATATYPE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", DATATYPE_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", DATATYPE_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, DATASET_CREATE_WITH_DATATYPE_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container group '%s'\n", DATASET_CREATE_WITH_DATATYPE_TEST_GROUP_NAME); + printf(" couldn't create container group '%s'\n", DATASET_CREATE_WITH_DATATYPE_TEST_GROUP_NAME); goto error; } if ((type_id = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) { H5_FAILED(); - HDprintf(" couldn't create datatype\n"); + printf(" couldn't create datatype\n"); goto error; } if (H5Tcommit2(group_id, DATASET_CREATE_WITH_DATATYPE_TEST_TYPE_NAME, type_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't commit datatype '%s'\n", DATASET_CREATE_WITH_DATATYPE_TEST_TYPE_NAME); + printf(" couldn't commit datatype '%s'\n", DATASET_CREATE_WITH_DATATYPE_TEST_TYPE_NAME); goto error; } @@ -1971,26 +1969,26 @@ test_create_dataset_with_committed_type(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, DATATYPE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", DATATYPE_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", DATATYPE_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gopen2(container_group, DATASET_CREATE_WITH_DATATYPE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", DATASET_CREATE_WITH_DATATYPE_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", DATASET_CREATE_WITH_DATATYPE_TEST_GROUP_NAME); goto error; } if ((type_id = H5Topen2(group_id, DATASET_CREATE_WITH_DATATYPE_TEST_TYPE_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open committed datatype '%s'\n", DATASET_CREATE_WITH_DATATYPE_TEST_TYPE_NAME); + printf(" couldn't open committed datatype '%s'\n", DATASET_CREATE_WITH_DATATYPE_TEST_TYPE_NAME); goto error; } @@ -2000,8 +1998,8 @@ test_create_dataset_with_committed_type(void) if ((dset_id = H5Dcreate2(group_id, DATASET_CREATE_WITH_DATATYPE_TEST_DSET_NAME, type_id, fspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create dataset '%s' using committed datatype\n", - DATASET_CREATE_WITH_DATATYPE_TEST_DSET_NAME); + printf(" couldn't create dataset '%s' using committed datatype\n", + DATASET_CREATE_WITH_DATATYPE_TEST_DSET_NAME); goto error; } @@ -2010,7 +2008,7 @@ test_create_dataset_with_committed_type(void) if ((dset_id = H5Dopen2(group_id, DATASET_CREATE_WITH_DATATYPE_TEST_DSET_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" failed to open dataset '%s'\n", DATASET_CREATE_WITH_DATATYPE_TEST_DSET_NAME); + printf(" failed to open dataset '%s'\n", DATASET_CREATE_WITH_DATATYPE_TEST_DSET_NAME); goto error; } @@ -2067,41 +2065,40 @@ test_create_attribute_with_committed_type(void) !(vol_cap_flags_g & H5VL_CAP_FLAG_STORED_DATATYPES) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC)) { SKIPPED(); - HDprintf(" API functions for basic file, group, attribute, or stored datatype aren't supported " - "with this connector\n"); + printf(" API functions for basic file, group, attribute, or stored datatype aren't supported " + "with this connector\n"); return 0; } if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, DATATYPE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", DATATYPE_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", DATATYPE_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, ATTRIBUTE_CREATE_WITH_DATATYPE_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container group '%s'\n", - ATTRIBUTE_CREATE_WITH_DATATYPE_TEST_GROUP_NAME); + printf(" couldn't create container group '%s'\n", ATTRIBUTE_CREATE_WITH_DATATYPE_TEST_GROUP_NAME); goto error; } if ((type_id = generate_random_datatype(H5T_NO_CLASS, TRUE)) < 0) { H5_FAILED(); - HDprintf(" couldn't create datatype\n"); + printf(" couldn't create datatype\n"); goto error; } if (H5Tcommit2(group_id, ATTRIBUTE_CREATE_WITH_DATATYPE_TEST_DTYPE_NAME, type_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't commit datatype '%s'\n", ATTRIBUTE_CREATE_WITH_DATATYPE_TEST_DTYPE_NAME); + printf(" couldn't commit datatype '%s'\n", ATTRIBUTE_CREATE_WITH_DATATYPE_TEST_DTYPE_NAME); goto error; } @@ -2110,8 +2107,7 @@ test_create_attribute_with_committed_type(void) if ((type_id = H5Topen2(group_id, ATTRIBUTE_CREATE_WITH_DATATYPE_TEST_DTYPE_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open committed datatype '%s'\n", - ATTRIBUTE_CREATE_WITH_DATATYPE_TEST_DTYPE_NAME); + printf(" couldn't open committed datatype '%s'\n", ATTRIBUTE_CREATE_WITH_DATATYPE_TEST_DTYPE_NAME); goto error; } @@ -2122,21 +2118,21 @@ test_create_attribute_with_committed_type(void) if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_CREATE_WITH_DATATYPE_TEST_ATTR_NAME, type_id, space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create attribute '%s'\n", ATTRIBUTE_CREATE_WITH_DATATYPE_TEST_ATTR_NAME); + printf(" couldn't create attribute '%s'\n", ATTRIBUTE_CREATE_WITH_DATATYPE_TEST_ATTR_NAME); goto error; } /* Verify the attribute has been created */ if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_CREATE_WITH_DATATYPE_TEST_ATTR_NAME)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if attribute '%s' exists\n", - ATTRIBUTE_CREATE_WITH_DATATYPE_TEST_ATTR_NAME); + printf(" couldn't determine if attribute '%s' exists\n", + ATTRIBUTE_CREATE_WITH_DATATYPE_TEST_ATTR_NAME); goto error; } if (!attr_exists) { H5_FAILED(); - HDprintf(" attribute did not exist\n"); + printf(" attribute did not exist\n"); goto error; } @@ -2145,7 +2141,7 @@ test_create_attribute_with_committed_type(void) if ((attr_id = H5Aopen(group_id, ATTRIBUTE_CREATE_WITH_DATATYPE_TEST_ATTR_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open attribute '%s'\n", ATTRIBUTE_CREATE_WITH_DATATYPE_TEST_ATTR_NAME); + printf(" couldn't open attribute '%s'\n", ATTRIBUTE_CREATE_WITH_DATATYPE_TEST_ATTR_NAME); goto error; } @@ -2200,70 +2196,70 @@ test_delete_committed_type(void) !(vol_cap_flags_g & H5VL_CAP_FLAG_STORED_DATATYPES) || !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC)) { SKIPPED(); - HDprintf(" API functions for basic file, group, attribute, or stored datatype aren't supported " - "with this connector\n"); + printf(" API functions for basic file, group, attribute, or stored datatype aren't supported " + "with this connector\n"); return 0; } if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s\n", H5_api_test_filename); + printf(" couldn't open file '%s\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, DATATYPE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", DATATYPE_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", DATATYPE_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, DATATYPE_DELETE_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container group '%s'\n", DATATYPE_DELETE_TEST_GROUP_NAME); + printf(" couldn't create container group '%s'\n", DATATYPE_DELETE_TEST_GROUP_NAME); goto error; } if ((type_id = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) { H5_FAILED(); - HDprintf(" couldn't create datatype\n"); + printf(" couldn't create datatype\n"); goto error; } if (H5Tcommit2(group_id, DATATYPE_DELETE_TEST_DTYPE_NAME, type_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't commit datatype '%s'\n", DATATYPE_DELETE_TEST_DTYPE_NAME); + printf(" couldn't commit datatype '%s'\n", DATATYPE_DELETE_TEST_DTYPE_NAME); goto error; } if ((type_exists = H5Lexists(group_id, DATATYPE_DELETE_TEST_DTYPE_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if datatype '%s' exists\n", DATATYPE_DELETE_TEST_DTYPE_NAME); + printf(" couldn't determine if datatype '%s' exists\n", DATATYPE_DELETE_TEST_DTYPE_NAME); goto error; } if (!type_exists) { H5_FAILED(); - HDprintf(" datatype didn't exist\n"); + printf(" datatype didn't exist\n"); goto error; } if (H5Ldelete(group_id, DATATYPE_DELETE_TEST_DTYPE_NAME, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't delete datatype '%s'\n", DATATYPE_DELETE_TEST_DTYPE_NAME); + printf(" couldn't delete datatype '%s'\n", DATATYPE_DELETE_TEST_DTYPE_NAME); goto error; } if ((type_exists = H5Lexists(group_id, DATATYPE_DELETE_TEST_DTYPE_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if datatype '%s' exists\n", DATATYPE_DELETE_TEST_DTYPE_NAME); + printf(" couldn't determine if datatype '%s' exists\n", DATATYPE_DELETE_TEST_DTYPE_NAME); goto error; } if (type_exists) { H5_FAILED(); - HDprintf(" datatype exists\n"); + printf(" datatype exists\n"); goto error; } @@ -2312,55 +2308,55 @@ test_resurrect_datatype(void) !(vol_cap_flags_g & H5VL_CAP_FLAG_STORED_DATATYPES) || !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_HARD_LINKS)) { SKIPPED(); - HDprintf(" API functions for basic file, group, link, hard link, or stored datatype aren't " - "supported with this connector\n"); + printf(" API functions for basic file, group, link, hard link, or stored datatype aren't " + "supported with this connector\n"); return 0; } if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, DATATYPE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", DATATYPE_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", DATATYPE_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, DATATYPE_RESURRECT_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container sub-group '%s'\n", DATATYPE_RESURRECT_TEST_GROUP_NAME); + printf(" couldn't create container sub-group '%s'\n", DATATYPE_RESURRECT_TEST_GROUP_NAME); goto error; } /* Create a named datatype in the file */ if ((type_id = H5Tcopy(H5T_NATIVE_INT)) < 0) { H5_FAILED(); - HDprintf(" failed to copy predefined integer type\n"); + printf(" failed to copy predefined integer type\n"); goto error; } if (H5Tcommit2(group_id, DATATYPE_RESURRECT_TEST_DTYPE_NAME, type_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to commit datatype\n"); + printf(" failed to commit datatype\n"); goto error; } /* Unlink the datatype while it's open (will mark it for deletion when closed) */ if (H5Ldelete(group_id, DATATYPE_RESURRECT_TEST_DTYPE_NAME, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to delete datatype\n"); + printf(" failed to delete datatype\n"); goto error; } /* Check that datatype name is NULL */ if (H5Iget_name(type_id, NULL, (size_t)0) != 0) { H5_FAILED(); - HDprintf(" deleted datatype name was not NULL!\n"); + printf(" deleted datatype name was not NULL!\n"); goto error; } @@ -2368,7 +2364,7 @@ test_resurrect_datatype(void) if (H5Lcreate_hard(type_id, ".", group_id, DATATYPE_RESURRECT_TEST_DTYPE_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to create new link for deleted datatype\n"); + printf(" failed to create new link for deleted datatype\n"); goto error; } @@ -2385,26 +2381,26 @@ test_resurrect_datatype(void) /* Re-open the file */ if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, DATATYPE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", DATATYPE_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", DATATYPE_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gopen2(container_group, DATATYPE_RESURRECT_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container sub-group '%s'\n", DATATYPE_RESURRECT_TEST_GROUP_NAME); + printf(" couldn't open container sub-group '%s'\n", DATATYPE_RESURRECT_TEST_GROUP_NAME); goto error; } /* Attempt to open the datatype under the new name */ if ((type_id = H5Topen2(group_id, DATATYPE_RESURRECT_TEST_DTYPE_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" failed to open resurrected datatype\n"); + printf(" failed to open resurrected datatype\n"); goto error; } @@ -2494,27 +2490,27 @@ test_cant_commit_predefined(void) if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_STORED_DATATYPES)) { SKIPPED(); - HDprintf(" API functions for basic file, group, or stored datatype aren't supported with this " - "connector\n"); + printf(" API functions for basic file, group, or stored datatype aren't supported with this " + "connector\n"); return 0; } if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, DATATYPE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", DATATYPE_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", DATATYPE_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, PREDEFINED_TYPE_COMMIT_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container sub-group '%s'\n", PREDEFINED_TYPE_COMMIT_TEST_GROUP_NAME); + printf(" couldn't create container sub-group '%s'\n", PREDEFINED_TYPE_COMMIT_TEST_GROUP_NAME); goto error; } @@ -2527,7 +2523,7 @@ test_cant_commit_predefined(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" committed a predefined datatype directly (without copying it)!\n"); + printf(" committed a predefined datatype directly (without copying it)!\n"); goto error; } @@ -2574,52 +2570,52 @@ test_cant_modify_committed_type(void) if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_STORED_DATATYPES)) { SKIPPED(); - HDprintf(" API functions for basic file, group, or stored datatype aren't supported with this " - "connector\n"); + printf(" API functions for basic file, group, or stored datatype aren't supported with this " + "connector\n"); return 0; } if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, DATATYPE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", DATATYPE_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", DATATYPE_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, MODIFY_COMMITTED_TYPE_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container sub-group '%s'\n", MODIFY_COMMITTED_TYPE_TEST_GROUP_NAME); + printf(" couldn't create container sub-group '%s'\n", MODIFY_COMMITTED_TYPE_TEST_GROUP_NAME); goto error; } /* Copy a predefined datatype and commit the copy */ if ((type_id = H5Tcopy(H5T_NATIVE_INT)) < 0) { H5_FAILED(); - HDprintf(" failed to copy predefined integer datatype\n"); + printf(" failed to copy predefined integer datatype\n"); goto error; } if (H5Tcommit2(group_id, "native_int", type_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to commit datatype\n"); + printf(" failed to commit datatype\n"); goto error; } if ((is_committed = H5Tcommitted(type_id)) < 0) { H5_FAILED(); - HDprintf(" failed to determine if datatype is committed\n"); + printf(" failed to determine if datatype is committed\n"); goto error; } if (!is_committed) { H5_FAILED(); - HDprintf(" H5Tcommitted() returned false!\n"); + printf(" H5Tcommitted() returned false!\n"); goto error; } @@ -2632,7 +2628,7 @@ test_cant_modify_committed_type(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" modified committed datatype!\n"); + printf(" modified committed datatype!\n"); goto error; } @@ -2668,17 +2664,17 @@ H5_api_datatype_test(void) size_t i; int nerrors; - HDprintf("**********************************************\n"); - HDprintf("* *\n"); - HDprintf("* API Datatype Tests *\n"); - HDprintf("* *\n"); - HDprintf("**********************************************\n\n"); + printf("**********************************************\n"); + printf("* *\n"); + printf("* API Datatype Tests *\n"); + printf("* *\n"); + printf("**********************************************\n\n"); for (i = 0, nerrors = 0; i < ARRAY_LENGTH(datatype_tests); i++) { nerrors += (*datatype_tests[i])() ? 1 : 0; } - HDprintf("\n"); + printf("\n"); return nerrors; } diff --git a/test/API/H5_api_file_test.c b/test/API/H5_api_file_test.c index a8169e2..d3d686c 100644 --- a/test/API/H5_api_file_test.c +++ b/test/API/H5_api_file_test.c @@ -67,26 +67,26 @@ test_create_file(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC)) { SKIPPED(); - HDprintf(" API functions for basic file aren't supported with this connector\n"); + printf(" API functions for basic file aren't supported with this connector\n"); return 0; } if (prefix_filename(test_path_prefix, FILE_CREATE_TEST_FILENAME, &prefixed_filename) < 0) { H5_FAILED(); - HDprintf(" couldn't prefix filename\n"); + printf(" couldn't prefix filename\n"); goto error; } if ((file_id = H5Fcreate(prefixed_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create file '%s'\n", prefixed_filename); + printf(" couldn't create file '%s'\n", prefixed_filename); goto error; } if (H5Fclose(file_id) < 0) TEST_ERROR; - HDfree(prefixed_filename); + free(prefixed_filename); prefixed_filename = NULL; PASSED(); @@ -100,7 +100,7 @@ error: } H5E_END_TRY; - HDfree(prefixed_filename); + free(prefixed_filename); return 1; } @@ -120,13 +120,13 @@ test_create_file_invalid_params(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC)) { SKIPPED(); - HDprintf(" API functions for basic file aren't supported with this connector\n"); + printf(" API functions for basic file aren't supported with this connector\n"); return 0; } if (prefix_filename(test_path_prefix, FILE_CREATE_INVALID_PARAMS_FILE_NAME, &prefixed_filename) < 0) { H5_FAILED(); - HDprintf(" couldn't prefix filename\n"); + printf(" couldn't prefix filename\n"); goto error; } @@ -144,7 +144,7 @@ test_create_file_invalid_params(void) if (file_id >= 0) { H5_FAILED(); - HDprintf(" file was created with a NULL name!\n"); + printf(" file was created with a NULL name!\n"); H5Fclose(file_id); PART_ERROR(H5Fcreate_invalid_name); } @@ -157,7 +157,7 @@ test_create_file_invalid_params(void) if (file_id >= 0) { H5_FAILED(); - HDprintf(" file was created with an invalid name of ''!\n"); + printf(" file was created with an invalid name of ''!\n"); H5Fclose(file_id); PART_ERROR(H5Fcreate_invalid_name); } @@ -178,7 +178,7 @@ test_create_file_invalid_params(void) if (file_id >= 0) { H5_FAILED(); - HDprintf(" file was created with invalid flag H5F_ACC_RDWR!\n"); + printf(" file was created with invalid flag H5F_ACC_RDWR!\n"); H5Fclose(file_id); PART_ERROR(H5Fcreate_invalid_flags); } @@ -191,7 +191,7 @@ test_create_file_invalid_params(void) if (file_id >= 0) { H5_FAILED(); - HDprintf(" file was created with invalid flag H5F_ACC_CREAT!\n"); + printf(" file was created with invalid flag H5F_ACC_CREAT!\n"); H5Fclose(file_id); PART_ERROR(H5Fcreate_invalid_flags); } @@ -204,7 +204,7 @@ test_create_file_invalid_params(void) if (file_id >= 0) { H5_FAILED(); - HDprintf(" file was created with invalid flag H5F_ACC_SWMR_READ!\n"); + printf(" file was created with invalid flag H5F_ACC_SWMR_READ!\n"); H5Fclose(file_id); PART_ERROR(H5Fcreate_invalid_flags); } @@ -225,7 +225,7 @@ test_create_file_invalid_params(void) if (file_id >= 0) { H5_FAILED(); - HDprintf(" file was created with invalid FCPL!\n"); + printf(" file was created with invalid FCPL!\n"); H5Fclose(file_id); PART_ERROR(H5Fcreate_invalid_fcpl); } @@ -236,7 +236,7 @@ test_create_file_invalid_params(void) } END_MULTIPART; - HDfree(prefixed_filename); + free(prefixed_filename); prefixed_filename = NULL; return 0; @@ -251,7 +251,7 @@ error: } H5E_END_TRY; - HDfree(prefixed_filename); + free(prefixed_filename); return 1; } @@ -272,19 +272,19 @@ test_create_file_excl(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC)) { SKIPPED(); - HDprintf(" API functions for basic file aren't supported with this connector\n"); + printf(" API functions for basic file aren't supported with this connector\n"); return 0; } if (prefix_filename(test_path_prefix, FILE_CREATE_EXCL_FILE_NAME, &prefixed_filename) < 0) { H5_FAILED(); - HDprintf(" couldn't prefix filename\n"); + printf(" couldn't prefix filename\n"); goto error; } if ((file_id = H5Fcreate(prefixed_filename, H5F_ACC_EXCL, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create first file\n"); + printf(" couldn't create first file\n"); goto error; } @@ -303,21 +303,21 @@ test_create_file_excl(void) if (file_id >= 0) { H5_FAILED(); - HDprintf(" created already existing file using H5F_ACC_EXCL flag!\n"); + printf(" created already existing file using H5F_ACC_EXCL flag!\n"); goto error; } /* Test creating with H5F_ACC_TRUNC. This will truncate the existing file on disk. */ if ((file_id = H5Fcreate(prefixed_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't truncate the existing file\n"); + printf(" couldn't truncate the existing file\n"); goto error; } if (H5Fclose(file_id) < 0) TEST_ERROR; - HDfree(prefixed_filename); + free(prefixed_filename); prefixed_filename = NULL; PASSED(); @@ -332,7 +332,7 @@ error: } H5E_END_TRY; - HDfree(prefixed_filename); + free(prefixed_filename); return 1; } @@ -350,7 +350,7 @@ test_open_file(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC)) { SKIPPED(); - HDprintf(" API functions for basic file aren't supported with this connector\n"); + printf(" API functions for basic file aren't supported with this connector\n"); return 0; } @@ -362,7 +362,7 @@ test_open_file(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" unable to open file '%s' in read-only mode\n", H5_api_test_filename); + printf(" unable to open file '%s' in read-only mode\n", H5_api_test_filename); PART_ERROR(H5Fopen_rdonly); } @@ -385,7 +385,7 @@ test_open_file(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" unable to open file '%s' in read-write mode\n", H5_api_test_filename); + printf(" unable to open file '%s' in read-write mode\n", H5_api_test_filename); PART_ERROR(H5Fopen_rdwrite); } @@ -434,7 +434,7 @@ test_open_file_invalid_params(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC)) { SKIPPED(); - HDprintf(" API functions for basic file aren't supported with this connector\n"); + printf(" API functions for basic file aren't supported with this connector\n"); return 0; } @@ -452,7 +452,7 @@ test_open_file_invalid_params(void) if (file_id >= 0) { H5_FAILED(); - HDprintf(" file was opened with a NULL name!\n"); + printf(" file was opened with a NULL name!\n"); H5Fclose(file_id); PART_ERROR(H5Fopen_invalid_name); } @@ -465,7 +465,7 @@ test_open_file_invalid_params(void) if (file_id >= 0) { H5_FAILED(); - HDprintf(" file was opened with an invalid name of ''!\n"); + printf(" file was opened with an invalid name of ''!\n"); H5Fclose(file_id); PART_ERROR(H5Fopen_invalid_name); } @@ -486,7 +486,7 @@ test_open_file_invalid_params(void) if (file_id >= 0) { H5_FAILED(); - HDprintf(" file was opened with invalid flag H5F_ACC_TRUNC!\n"); + printf(" file was opened with invalid flag H5F_ACC_TRUNC!\n"); H5Fclose(file_id); PART_ERROR(H5Fopen_invalid_flags); } @@ -499,7 +499,7 @@ test_open_file_invalid_params(void) if (file_id >= 0) { H5_FAILED(); - HDprintf(" file was opened with invalid flag H5F_ACC_EXCL!\n"); + printf(" file was opened with invalid flag H5F_ACC_EXCL!\n"); H5Fclose(file_id); PART_ERROR(H5Fopen_invalid_flags); } @@ -536,13 +536,13 @@ test_open_nonexistent_file(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC)) { SKIPPED(); - HDprintf(" API functions for basic file aren't supported with this connector\n"); + printf(" API functions for basic file aren't supported with this connector\n"); return 0; } if (prefix_filename(test_path_prefix, NONEXISTENT_FILENAME, &prefixed_filename) < 0) { H5_FAILED(); - HDprintf(" couldn't prefix filename\n"); + printf(" couldn't prefix filename\n"); goto error; } @@ -556,11 +556,11 @@ test_open_nonexistent_file(void) if (file_id >= 0) { H5_FAILED(); - HDprintf(" non-existent file was opened!\n"); + printf(" non-existent file was opened!\n"); goto error; } - HDfree(prefixed_filename); + free(prefixed_filename); prefixed_filename = NULL; PASSED(); @@ -574,7 +574,7 @@ error: } H5E_END_TRY; - HDfree(prefixed_filename); + free(prefixed_filename); return 1; } @@ -602,8 +602,8 @@ test_file_permission(void) !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_STORED_DATATYPES)) { SKIPPED(); - HDprintf(" API functions for basic file, group, dataset, attribute, or stored datatype aren't " - "supported with this connector\n"); + printf(" API functions for basic file, group, dataset, attribute, or stored datatype aren't " + "supported with this connector\n"); return 0; } @@ -611,26 +611,26 @@ test_file_permission(void) if (prefix_filename(test_path_prefix, FILE_PERMISSION_TEST_FILENAME, &prefixed_filename) < 0) { H5_FAILED(); - HDprintf(" couldn't prefix filename\n"); + printf(" couldn't prefix filename\n"); goto error; } if ((file_id = H5Fcreate(prefixed_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create file '%s'\n", prefixed_filename); + printf(" couldn't create file '%s'\n", prefixed_filename); goto error; } if ((dspace_id = H5Screate(H5S_SCALAR)) < 0) { H5_FAILED(); - HDprintf(" couldn't create data space\n"); + printf(" couldn't create data space\n"); goto error; } if ((dset_id = H5Dcreate2(file_id, FILE_PERMISSION_TEST_DSET_NAME, H5T_STD_U32LE, dspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create data set: %s\n", FILE_PERMISSION_TEST_DSET_NAME); + printf(" couldn't create data set: %s\n", FILE_PERMISSION_TEST_DSET_NAME); goto error; } @@ -642,7 +642,7 @@ test_file_permission(void) /* Open the file (with read-only permission) */ if ((file_id = H5Fopen(prefixed_filename, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file\n"); + printf(" couldn't open file\n"); goto error; } @@ -664,7 +664,7 @@ test_file_permission(void) if (group_id >= 0) { H5_FAILED(); - HDprintf(" a group was created in a read-only file!\n"); + printf(" a group was created in a read-only file!\n"); PART_ERROR(H5Gcreate_rdonly_file); } @@ -676,7 +676,7 @@ test_file_permission(void) if (group_id >= 0) { H5_FAILED(); - HDprintf(" a group was created in a read-only file!\n"); + printf(" a group was created in a read-only file!\n"); PART_ERROR(H5Gcreate_rdonly_file); } @@ -698,7 +698,7 @@ test_file_permission(void) if (dset_id >= 0) { H5_FAILED(); - HDprintf(" a dataset was created in a read-only file!\n"); + printf(" a dataset was created in a read-only file!\n"); PART_ERROR(H5Dcreate_rdonly_file); } @@ -710,7 +710,7 @@ test_file_permission(void) if (dset_id >= 0) { H5_FAILED(); - HDprintf(" a dataset was created in a read-only file!\n"); + printf(" a dataset was created in a read-only file!\n"); PART_ERROR(H5Dcreate_rdonly_file); } @@ -732,7 +732,7 @@ test_file_permission(void) if (attr_id >= 0) { H5_FAILED(); - HDprintf(" an attribute was created in a read-only file!\n"); + printf(" an attribute was created in a read-only file!\n"); PART_ERROR(H5Acreate_rdonly_file); } @@ -746,7 +746,7 @@ test_file_permission(void) if ((dtype_id = H5Tcopy(H5T_NATIVE_INT)) < 0) { H5_FAILED(); - HDprintf(" couldn't copy a native datatype\n"); + printf(" couldn't copy a native datatype\n"); PART_ERROR(H5Tcommit_rdonly_file); } @@ -760,7 +760,7 @@ test_file_permission(void) if (h5_ret >= 0) { H5_FAILED(); - HDprintf(" a named datatype was committed in a read-only file!\n"); + printf(" a named datatype was committed in a read-only file!\n"); PART_ERROR(H5Tcommit_rdonly_file); } @@ -772,7 +772,7 @@ test_file_permission(void) if (h5_ret >= 0) { H5_FAILED(); - HDprintf(" a named datatype was committed in a read-only file!\n"); + printf(" a named datatype was committed in a read-only file!\n"); PART_ERROR(H5Tcommit_rdonly_file); } @@ -791,7 +791,7 @@ test_file_permission(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - HDfree(prefixed_filename); + free(prefixed_filename); prefixed_filename = NULL; PASSED(); @@ -810,7 +810,7 @@ error: } H5E_END_TRY; - HDfree(prefixed_filename); + free(prefixed_filename); return 1; } @@ -829,19 +829,19 @@ test_reopen_file(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC)) { SKIPPED(); - HDprintf(" API functions for basic file aren't supported with this connector\n"); + printf(" API functions for basic file aren't supported with this connector\n"); return 0; } if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file\n"); + printf(" couldn't open file\n"); goto error; } if ((file_id2 = H5Freopen(file_id)) < 0) { H5_FAILED(); - HDprintf(" couldn't re-open file\n"); + printf(" couldn't re-open file\n"); goto error; } @@ -878,7 +878,7 @@ test_close_file_invalid_id(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC)) { SKIPPED(); - HDprintf(" API functions for basic file aren't supported with this connector\n"); + printf(" API functions for basic file aren't supported with this connector\n"); return 0; } @@ -890,7 +890,7 @@ test_close_file_invalid_id(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" closed an invalid file ID!\n"); + printf(" closed an invalid file ID!\n"); goto error; } @@ -921,8 +921,8 @@ test_flush_file(void) if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_FLUSH_REFRESH)) { SKIPPED(); - HDprintf(" API functions for basic file, dataset, or file flush aren't supported with this " - "connector\n"); + printf(" API functions for basic file, dataset, or file flush aren't supported with this " + "connector\n"); return 0; } @@ -930,20 +930,20 @@ test_flush_file(void) if (prefix_filename(test_path_prefix, FILE_FLUSH_TEST_FILENAME, &prefixed_filename) < 0) { H5_FAILED(); - HDprintf(" couldn't prefix filename\n"); + printf(" couldn't prefix filename\n"); goto error; } if ((file_id = H5Fcreate(prefixed_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create file '%s'\n", prefixed_filename); + printf(" couldn't create file '%s'\n", prefixed_filename); goto error; } /* Create multiple small datasets in file */ if ((dspace_id = H5Screate(H5S_SCALAR)) < 0) { H5_FAILED(); - HDprintf(" couldn't create data space\n"); + printf(" couldn't create data space\n"); goto error; } @@ -953,7 +953,7 @@ test_flush_file(void) if ((dset_id = H5Dcreate2(file_id, dset_name, H5T_STD_U32LE, dspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create data set: %s\n", dset_name); + printf(" couldn't create data set: %s\n", dset_name); goto error; } @@ -971,7 +971,7 @@ test_flush_file(void) if (H5Fflush(file_id, H5F_SCOPE_LOCAL) < 0) { H5_FAILED(); - HDprintf(" unable to flush file with scope H5F_SCOPE_LOCAL\n"); + printf(" unable to flush file with scope H5F_SCOPE_LOCAL\n"); PART_ERROR(H5Fflush_local); } @@ -985,7 +985,7 @@ test_flush_file(void) if (H5Fflush(file_id, H5F_SCOPE_GLOBAL) < 0) { H5_FAILED(); - HDprintf(" unable to flush file with scope H5F_SCOPE_GLOBAL\n"); + printf(" unable to flush file with scope H5F_SCOPE_GLOBAL\n"); PART_ERROR(H5Fflush_global); } @@ -1002,7 +1002,7 @@ test_flush_file(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - HDfree(prefixed_filename); + free(prefixed_filename); prefixed_filename = NULL; PASSED(); @@ -1018,7 +1018,7 @@ error: } H5E_END_TRY; - HDfree(prefixed_filename); + free(prefixed_filename); return 1; } @@ -1038,13 +1038,13 @@ test_file_is_accessible(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC)) { SKIPPED(); - HDprintf(" API functions for basic file aren't supported with this connector\n"); + printf(" API functions for basic file aren't supported with this connector\n"); return 0; } if (prefix_filename(test_path_prefix, fake_filename, &prefixed_filename) < 0) { H5_FAILED(); - HDprintf(" couldn't prefix filename\n"); + printf(" couldn't prefix filename\n"); goto error; } @@ -1056,14 +1056,14 @@ test_file_is_accessible(void) if ((is_accessible = H5Fis_accessible(H5_api_test_filename, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if file '%s' is accessible with default FAPL\n", - H5_api_test_filename); + printf(" couldn't determine if file '%s' is accessible with default FAPL\n", + H5_api_test_filename); PART_ERROR(H5Fis_accessible_valid_file); } if (!is_accessible) { H5_FAILED(); - HDprintf(" file '%s' is not accessible with default FAPL\n", H5_api_test_filename); + printf(" file '%s' is not accessible with default FAPL\n", H5_api_test_filename); PART_ERROR(H5Fis_accessible_valid_file); } @@ -1085,8 +1085,8 @@ test_file_is_accessible(void) if (is_accessible > 0) { H5_FAILED(); - HDprintf(" non-existent file '%s' was accessible with default FAPL: is_accessible=%d!\n", - prefixed_filename, is_accessible); + printf(" non-existent file '%s' was accessible with default FAPL: is_accessible=%d!\n", + prefixed_filename, is_accessible); PART_ERROR(H5Fis_accessible_invalid_file); } @@ -1096,13 +1096,13 @@ test_file_is_accessible(void) } END_MULTIPART; - HDfree(prefixed_filename); + free(prefixed_filename); prefixed_filename = NULL; return 0; error: - HDfree(prefixed_filename); + free(prefixed_filename); return 1; } @@ -1133,8 +1133,8 @@ test_file_property_lists(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_MORE) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GET_PLIST)) { SKIPPED(); - HDprintf(" API functions for basic or more file or get property list aren't supported with this " - "connector\n"); + printf(" API functions for basic or more file or get property list aren't supported with this " + "connector\n"); return 0; } @@ -1142,36 +1142,36 @@ test_file_property_lists(void) if (prefix_filename(test_path_prefix, FILE_PROPERTY_LIST_TEST_FNAME1, &prefixed_filename1) < 0) { H5_FAILED(); - HDprintf(" couldn't prefix filename\n"); + printf(" couldn't prefix filename\n"); goto error; } if (prefix_filename(test_path_prefix, FILE_PROPERTY_LIST_TEST_FNAME2, &prefixed_filename2) < 0) { H5_FAILED(); - HDprintf(" couldn't prefix filename\n"); + printf(" couldn't prefix filename\n"); goto error; } if ((fcpl_id1 = H5Pcreate(H5P_FILE_CREATE)) < 0) { H5_FAILED(); - HDprintf(" couldn't create FCPL\n"); + printf(" couldn't create FCPL\n"); goto error; } if (H5Pset_userblock(fcpl_id1, FILE_PROPERTY_LIST_TEST_FCPL_PROP_VAL) < 0) { H5_FAILED(); - HDprintf(" failed to set test property on FCPL\n"); + printf(" failed to set test property on FCPL\n"); goto error; } if ((file_id1 = H5Fcreate(prefixed_filename1, H5F_ACC_TRUNC, fcpl_id1, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create file\n"); + printf(" couldn't create file\n"); goto error; } if ((file_id2 = H5Fcreate(prefixed_filename2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create file\n"); + printf(" couldn't create file\n"); goto error; } @@ -1190,42 +1190,42 @@ test_file_property_lists(void) * does not */ if ((fcpl_id1 = H5Fget_create_plist(file_id1)) < 0) { H5_FAILED(); - HDprintf(" couldn't get FCPL\n"); + printf(" couldn't get FCPL\n"); PART_ERROR(H5Fget_create_plist); } if ((fcpl_id2 = H5Fget_create_plist(file_id2)) < 0) { H5_FAILED(); - HDprintf(" couldn't get FCPL\n"); + printf(" couldn't get FCPL\n"); PART_ERROR(H5Fget_create_plist); } /* Ensure that property list 1 has the property set and property list 2 does not */ if (H5Pget_userblock(fcpl_id1, &prop_val) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve test property from FCPL\n"); + printf(" failed to retrieve test property from FCPL\n"); PART_ERROR(H5Fget_create_plist); } if (prop_val != FILE_PROPERTY_LIST_TEST_FCPL_PROP_VAL) { H5_FAILED(); - HDprintf(" retrieved test property value '%llu' did not match expected value '%llu'\n", - (long long unsigned)prop_val, - (long long unsigned)FILE_PROPERTY_LIST_TEST_FCPL_PROP_VAL); + printf(" retrieved test property value '%llu' did not match expected value '%llu'\n", + (long long unsigned)prop_val, + (long long unsigned)FILE_PROPERTY_LIST_TEST_FCPL_PROP_VAL); PART_ERROR(H5Fget_create_plist); } if (H5Pget_userblock(fcpl_id2, &prop_val) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve test property from FCPL\n"); + printf(" failed to retrieve test property from FCPL\n"); PART_ERROR(H5Fget_create_plist); } if (prop_val == FILE_PROPERTY_LIST_TEST_FCPL_PROP_VAL) { - HDprintf(" retrieved test property value '%llu' matched control value '%llu' when it " - "shouldn't have\n", - (long long unsigned)prop_val, - (long long unsigned)FILE_PROPERTY_LIST_TEST_FCPL_PROP_VAL); + printf(" retrieved test property value '%llu' matched control value '%llu' when it " + "shouldn't have\n", + (long long unsigned)prop_val, + (long long unsigned)FILE_PROPERTY_LIST_TEST_FCPL_PROP_VAL); PART_ERROR(H5Fget_create_plist); } @@ -1244,13 +1244,13 @@ test_file_property_lists(void) */ if ((fapl_id1 = H5Fget_access_plist(file_id1)) < 0) { H5_FAILED(); - HDprintf(" couldn't get FAPL\n"); + printf(" couldn't get FAPL\n"); PART_ERROR(H5Fget_access_plist); } if ((fapl_id2 = H5Fget_access_plist(file_id2)) < 0) { H5_FAILED(); - HDprintf(" couldn't get FAPL\n"); + printf(" couldn't get FAPL\n"); PART_ERROR(H5Fget_access_plist); } @@ -1318,54 +1318,54 @@ test_file_property_lists(void) if ((file_id1 = H5Fopen(prefixed_filename1, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file\n"); + printf(" couldn't open file\n"); PART_ERROR(H5Fget_create_plist_reopened); } if ((file_id2 = H5Fopen(prefixed_filename2, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file\n"); + printf(" couldn't open file\n"); PART_ERROR(H5Fget_create_plist_reopened); } if ((fcpl_id1 = H5Fget_create_plist(file_id1)) < 0) { H5_FAILED(); - HDprintf(" couldn't get FCPL\n"); + printf(" couldn't get FCPL\n"); PART_ERROR(H5Fget_create_plist_reopened); } if ((fcpl_id2 = H5Fget_create_plist(file_id2)) < 0) { H5_FAILED(); - HDprintf(" couldn't get FCPL\n"); + printf(" couldn't get FCPL\n"); PART_ERROR(H5Fget_create_plist_reopened); } /* Check the values of the test property */ if (H5Pget_userblock(fcpl_id1, &prop_val) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve test property from FCPL\n"); + printf(" failed to retrieve test property from FCPL\n"); PART_ERROR(H5Fget_create_plist_reopened); } if (prop_val != FILE_PROPERTY_LIST_TEST_FCPL_PROP_VAL) { H5_FAILED(); - HDprintf(" retrieved test property value '%llu' did not match expected value '%llu'\n", - (long long unsigned)prop_val, - (long long unsigned)FILE_PROPERTY_LIST_TEST_FCPL_PROP_VAL); + printf(" retrieved test property value '%llu' did not match expected value '%llu'\n", + (long long unsigned)prop_val, + (long long unsigned)FILE_PROPERTY_LIST_TEST_FCPL_PROP_VAL); PART_ERROR(H5Fget_create_plist_reopened); } if (H5Pget_userblock(fcpl_id2, &prop_val) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve test property from FCPL\n"); + printf(" failed to retrieve test property from FCPL\n"); PART_ERROR(H5Fget_create_plist_reopened); } if (prop_val == FILE_PROPERTY_LIST_TEST_FCPL_PROP_VAL) { - HDprintf(" retrieved test property value '%llu' matched control value '%llu' when it " - "shouldn't have\n", - (long long unsigned)prop_val, - (long long unsigned)FILE_PROPERTY_LIST_TEST_FCPL_PROP_VAL); + printf(" retrieved test property value '%llu' matched control value '%llu' when it " + "shouldn't have\n", + (long long unsigned)prop_val, + (long long unsigned)FILE_PROPERTY_LIST_TEST_FCPL_PROP_VAL); PART_ERROR(H5Fget_create_plist_reopened); } @@ -1386,9 +1386,9 @@ test_file_property_lists(void) if (H5Fclose(file_id2) < 0) TEST_ERROR; - HDfree(prefixed_filename1); + free(prefixed_filename1); prefixed_filename1 = NULL; - HDfree(prefixed_filename2); + free(prefixed_filename2); prefixed_filename2 = NULL; PASSED(); @@ -1407,8 +1407,8 @@ error: } H5E_END_TRY; - HDfree(prefixed_filename1); - HDfree(prefixed_filename2); + free(prefixed_filename1); + free(prefixed_filename2); return 1; } @@ -1428,7 +1428,7 @@ test_get_file_intent(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_MORE)) { SKIPPED(); - HDprintf(" API functions for basic or more file aren't supported with this connector\n"); + printf(" API functions for basic or more file aren't supported with this connector\n"); return 0; } @@ -1436,14 +1436,14 @@ test_get_file_intent(void) if (prefix_filename(test_path_prefix, FILE_INTENT_TEST_FILENAME, &prefixed_filename) < 0) { H5_FAILED(); - HDprintf(" couldn't prefix filename\n"); + printf(" couldn't prefix filename\n"); goto error; } /* Test that file intent retrieval works correctly for file create */ if ((file_id = H5Fcreate(prefixed_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create file '%s'\n", prefixed_filename); + printf(" couldn't create file '%s'\n", prefixed_filename); goto error; } @@ -1457,13 +1457,13 @@ test_get_file_intent(void) if (H5Fget_intent(file_id, &file_intent) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve file intent\n"); + printf(" failed to retrieve file intent\n"); PART_ERROR(H5Fget_intent_file_creation); } if (H5F_ACC_RDWR != file_intent) { H5_FAILED(); - HDprintf(" received incorrect file intent for file creation\n"); + printf(" received incorrect file intent for file creation\n"); PART_ERROR(H5Fget_intent_file_creation); } @@ -1487,19 +1487,19 @@ test_get_file_intent(void) /* Test that file intent retrieval works correctly for file open */ if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); PART_ERROR(H5Fget_intent_rdonly_file_open); } if (H5Fget_intent(file_id, &file_intent) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve file intent\n"); + printf(" failed to retrieve file intent\n"); PART_ERROR(H5Fget_intent_rdonly_file_open); } if (H5F_ACC_RDONLY != file_intent) { H5_FAILED(); - HDprintf(" received incorrect file intent for read-only file open\n"); + printf(" received incorrect file intent for read-only file open\n"); PART_ERROR(H5Fget_intent_rdonly_file_open); } @@ -1522,19 +1522,19 @@ test_get_file_intent(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); PART_ERROR(H5Fget_intent_rdwrite_file_open); } if (H5Fget_intent(file_id, &file_intent) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve file intent\n"); + printf(" failed to retrieve file intent\n"); PART_ERROR(H5Fget_intent_rdwrite_file_open); } if (H5F_ACC_RDWR != file_intent) { H5_FAILED(); - HDprintf(" received incorrect file intent\n"); + printf(" received incorrect file intent\n"); PART_ERROR(H5Fget_intent_rdwrite_file_open); } @@ -1553,7 +1553,7 @@ test_get_file_intent(void) } END_MULTIPART; - HDfree(prefixed_filename); + free(prefixed_filename); prefixed_filename = NULL; return 0; @@ -1565,7 +1565,7 @@ error: } H5E_END_TRY; - HDfree(prefixed_filename); + free(prefixed_filename); return 1; } @@ -1597,7 +1597,7 @@ test_get_file_obj_count(void) !(vol_cap_flags_g & H5VL_CAP_FLAG_STORED_DATATYPES) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC)) { SKIPPED(); - HDprintf( + printf( " API functions for basic or more file, basic dataset, group, stored datatypes, or attribute " "aren't supported with this connector\n"); return 0; @@ -1607,53 +1607,53 @@ test_get_file_obj_count(void) if (prefix_filename(test_path_prefix, GET_OBJ_COUNT_TEST_FILENAME1, &prefixed_filename1) < 0) { H5_FAILED(); - HDprintf(" couldn't prefix filename\n"); + printf(" couldn't prefix filename\n"); goto error; } if (prefix_filename(test_path_prefix, GET_OBJ_COUNT_TEST_FILENAME2, &prefixed_filename2) < 0) { H5_FAILED(); - HDprintf(" couldn't prefix filename\n"); + printf(" couldn't prefix filename\n"); goto error; } if ((file_id = H5Fcreate(prefixed_filename1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create file '%s'\n", prefixed_filename1); + printf(" couldn't create file '%s'\n", prefixed_filename1); goto error; } if ((group_id = H5Gcreate2(file_id, GET_OBJ_COUNT_TEST_GRP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create group '%s'\n", GET_OBJ_COUNT_TEST_GRP_NAME); + printf(" couldn't create group '%s'\n", GET_OBJ_COUNT_TEST_GRP_NAME); goto error; } /* Create a second file while keeping the first file open */ if ((file_id2 = H5Fcreate(prefixed_filename2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create file '%s'\n", prefixed_filename2); + printf(" couldn't create file '%s'\n", prefixed_filename2); goto error; } /* Create a named datatype */ if ((named_dtype_id = H5Tcopy(H5T_NATIVE_INT)) < 0) { H5_FAILED(); - HDprintf(" couldn't copy a native datatype\n"); + printf(" couldn't copy a native datatype\n"); goto error; } if (H5Tcommit2(file_id2, GET_OBJ_COUNT_TEST_NAMED_DTYPE, named_dtype_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't commit a named datatype\n"); + printf(" couldn't commit a named datatype\n"); goto error; } /* Create a dataspace for the attribute and dataset */ if ((dspace_id = H5Screate(H5S_SCALAR)) < 0) { H5_FAILED(); - HDprintf(" couldn't create data space for attribute\n"); + printf(" couldn't create data space for attribute\n"); goto error; } @@ -1661,7 +1661,7 @@ test_get_file_obj_count(void) if ((attr_id = H5Acreate2(file_id2, GET_OBJ_COUNT_TEST_ATTR_NAME, H5T_NATIVE_INT, dspace_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create the attribute '%s'\n", GET_OBJ_COUNT_TEST_ATTR_NAME); + printf(" couldn't create the attribute '%s'\n", GET_OBJ_COUNT_TEST_ATTR_NAME); goto error; } @@ -1669,7 +1669,7 @@ test_get_file_obj_count(void) if ((dset_id = H5Dcreate2(file_id2, GET_OBJ_COUNT_TEST_DSET_NAME, H5T_NATIVE_INT, dspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create the dataset '%s'\n", GET_OBJ_COUNT_TEST_DSET_NAME); + printf(" couldn't create the dataset '%s'\n", GET_OBJ_COUNT_TEST_DSET_NAME); goto error; } @@ -1684,13 +1684,13 @@ test_get_file_obj_count(void) /* Get the number of files currently opened */ if ((obj_count = H5Fget_obj_count((hid_t)H5F_OBJ_ALL, H5F_OBJ_FILE)) < 0) { H5_FAILED(); - HDprintf(" couldn't get the number of open files\n"); + printf(" couldn't get the number of open files\n"); PART_ERROR(H5Fget_obj_count_files); } if (obj_count != 2) { H5_FAILED(); - HDprintf(" number of open files (%ld) did not match expected number (2)\n", obj_count); + printf(" number of open files (%ld) did not match expected number (2)\n", obj_count); PART_ERROR(H5Fget_obj_count_files); } @@ -1705,13 +1705,13 @@ test_get_file_obj_count(void) /* Get the number of groups */ if ((obj_count = H5Fget_obj_count(file_id, H5F_OBJ_GROUP)) < 0) { H5_FAILED(); - HDprintf(" couldn't retrieve number of open groups\n"); + printf(" couldn't retrieve number of open groups\n"); PART_ERROR(H5Fget_obj_count_grps_single_file); } if (obj_count != 1) { H5_FAILED(); - HDprintf(" number of open groups (%ld) did not match expected number (1)\n", obj_count); + printf(" number of open groups (%ld) did not match expected number (1)\n", obj_count); PART_ERROR(H5Fget_obj_count_grps_single_file); } @@ -1726,13 +1726,13 @@ test_get_file_obj_count(void) /* Get the number of groups in two opened files */ if ((obj_count = H5Fget_obj_count((hid_t)H5F_OBJ_ALL, H5F_OBJ_GROUP)) < 0) { H5_FAILED(); - HDprintf(" couldn't get the number of open groups\n"); + printf(" couldn't get the number of open groups\n"); PART_ERROR(H5Fget_obj_count_grps); } if (obj_count != 1) { H5_FAILED(); - HDprintf(" number of open groups (%ld) did not match expected number (1)\n", obj_count); + printf(" number of open groups (%ld) did not match expected number (1)\n", obj_count); PART_ERROR(H5Fget_obj_count_grps); } @@ -1747,14 +1747,14 @@ test_get_file_obj_count(void) /* Get the number of named datatype in two opened files */ if ((obj_count = H5Fget_obj_count((hid_t)H5F_OBJ_ALL, H5F_OBJ_DATATYPE)) < 0) { H5_FAILED(); - HDprintf(" couldn't get the number of open named datatypes\n"); + printf(" couldn't get the number of open named datatypes\n"); PART_ERROR(H5Fget_obj_count_types); } if (obj_count != 1) { H5_FAILED(); - HDprintf(" number of open named datatypes (%ld) did not match expected number (1)\n", - obj_count); + printf(" number of open named datatypes (%ld) did not match expected number (1)\n", + obj_count); PART_ERROR(H5Fget_obj_count_types); } @@ -1769,14 +1769,13 @@ test_get_file_obj_count(void) /* Get the number of attribute in two opened files */ if ((obj_count = H5Fget_obj_count((hid_t)H5F_OBJ_ALL, H5F_OBJ_ATTR)) < 0) { H5_FAILED(); - HDprintf(" couldn't get the number of open attributes\n"); + printf(" couldn't get the number of open attributes\n"); PART_ERROR(H5Fget_obj_count_attrs); } if (obj_count != 1) { H5_FAILED(); - HDprintf(" number of open attributes (%ld) did not match expected number (1)\n", - obj_count); + printf(" number of open attributes (%ld) did not match expected number (1)\n", obj_count); PART_ERROR(H5Fget_obj_count_attrs); } @@ -1791,13 +1790,13 @@ test_get_file_obj_count(void) /* Get the number of dataset in two opened files */ if ((obj_count = H5Fget_obj_count((hid_t)H5F_OBJ_ALL, H5F_OBJ_DATASET)) < 0 || obj_count != 1) { H5_FAILED(); - HDprintf(" couldn't get the number of open datasets\n"); + printf(" couldn't get the number of open datasets\n"); PART_ERROR(H5Fget_obj_count_dsets); } if (obj_count != 1) { H5_FAILED(); - HDprintf(" number of open datasets (%ld) did not match expected number (1)\n", obj_count); + printf(" number of open datasets (%ld) did not match expected number (1)\n", obj_count); PART_ERROR(H5Fget_obj_count_dsets); } @@ -1812,14 +1811,14 @@ test_get_file_obj_count(void) /* Get the number of all open objects */ if ((obj_count = H5Fget_obj_count(file_id, H5F_OBJ_ALL)) < 0) { H5_FAILED(); - HDprintf(" couldn't retrieve number of open objects\n"); + printf(" couldn't retrieve number of open objects\n"); PART_ERROR(H5Fget_obj_count_all_single_file); } /* One for the file and another for the group */ if (obj_count != 2) { H5_FAILED(); - HDprintf(" number of open objects (%ld) did not match expected number (2)\n", obj_count); + printf(" number of open objects (%ld) did not match expected number (2)\n", obj_count); PART_ERROR(H5Fget_obj_count_all_single_file); } @@ -1834,13 +1833,13 @@ test_get_file_obj_count(void) /* Get the number of all open objects */ if ((obj_count = H5Fget_obj_count(H5F_OBJ_ALL, H5F_OBJ_ALL)) < 0) { H5_FAILED(); - HDprintf(" couldn't retrieve number of open objects\n"); + printf(" couldn't retrieve number of open objects\n"); PART_ERROR(H5Fget_obj_count_all); } if (obj_count != 6) { H5_FAILED(); - HDprintf(" number of open objects (%ld) did not match expected number (6)\n", obj_count); + printf(" number of open objects (%ld) did not match expected number (6)\n", obj_count); PART_ERROR(H5Fget_obj_count_all); } @@ -1854,14 +1853,14 @@ test_get_file_obj_count(void) if (H5Fget_obj_ids(file_id, H5F_OBJ_GROUP, (size_t)obj_count, &object_id) < 0) { H5_FAILED(); - HDprintf(" couldn't get opened group IDs\n"); + printf(" couldn't get opened group IDs\n"); PART_ERROR(H5Fget_obj_ids_singular_grp); } if (object_id != group_id) { H5_FAILED(); - HDprintf(" opened object ID (%ld) did not match only currently open group ID (%ld)\n", - object_id, group_id); + printf(" opened object ID (%ld) did not match only currently open group ID (%ld)\n", + object_id, group_id); PART_ERROR(H5Fget_obj_ids_singular_grp); } @@ -1888,9 +1887,9 @@ test_get_file_obj_count(void) if (H5Fclose(file_id2) < 0) TEST_ERROR; - HDfree(prefixed_filename1); + free(prefixed_filename1); prefixed_filename1 = NULL; - HDfree(prefixed_filename2); + free(prefixed_filename2); prefixed_filename2 = NULL; PASSED(); @@ -1910,8 +1909,8 @@ error: } H5E_END_TRY; - HDfree(prefixed_filename1); - HDfree(prefixed_filename2); + free(prefixed_filename1); + free(prefixed_filename2); return 1; } @@ -1937,40 +1936,40 @@ test_file_open_overlap(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_MORE) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC)) { SKIPPED(); - HDprintf(" API functions for basic or more file, dataset, or group aren't supported with this " - "connector\n"); + printf(" API functions for basic or more file, dataset, or group aren't supported with this " + "connector\n"); return 0; } if (prefix_filename(test_path_prefix, OVERLAPPING_FILENAME, &prefixed_filename) < 0) { H5_FAILED(); - HDprintf(" couldn't prefix filename\n"); + printf(" couldn't prefix filename\n"); goto error; } if ((file_id = H5Fcreate(prefixed_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create file '%s'\n", prefixed_filename); + printf(" couldn't create file '%s'\n", prefixed_filename); goto error; } if ((file_id2 = H5Fopen(prefixed_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", prefixed_filename); + printf(" couldn't open file '%s'\n", prefixed_filename); goto error; } if ((group_id = H5Gcreate2(file_id, OVERLAPPING_OPEN_TEST_GRP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create group '%s'\n", OVERLAPPING_OPEN_TEST_GRP_NAME); + printf(" couldn't create group '%s'\n", OVERLAPPING_OPEN_TEST_GRP_NAME); goto error; } /* Create a dataspace for the dataset */ if ((dspace_id = H5Screate(H5S_SCALAR)) < 0) { H5_FAILED(); - HDprintf(" couldn't create data space for dataset\n"); + printf(" couldn't create data space for dataset\n"); goto error; } @@ -1978,20 +1977,20 @@ test_file_open_overlap(void) if ((dset_id = H5Dcreate2(group_id, OVERLAPPING_OPEN_TEST_DSET_NAME, H5T_NATIVE_INT, dspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create the dataset '%s'\n", OVERLAPPING_OPEN_TEST_DSET_NAME); + printf(" couldn't create the dataset '%s'\n", OVERLAPPING_OPEN_TEST_DSET_NAME); goto error; } /* Get the number of objects opened in the first file: 3 == file + dataset + group */ if ((obj_count = H5Fget_obj_count(file_id, H5F_OBJ_LOCAL | H5F_OBJ_ALL)) < 0) { H5_FAILED(); - HDprintf(" couldn't retrieve the number of objects opened in the file\n"); + printf(" couldn't retrieve the number of objects opened in the file\n"); goto error; } if (obj_count != 3) { H5_FAILED(); - HDprintf(" number of objects opened in file (%ld) did not match expected number (3)\n", obj_count); + printf(" number of objects opened in file (%ld) did not match expected number (3)\n", obj_count); goto error; } @@ -2006,21 +2005,21 @@ test_file_open_overlap(void) if ((dset_id = H5Dcreate2(file_id2, OVERLAPPING_OPEN_TEST_DSET_NAME, H5T_NATIVE_INT, dspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create the dataset '%s'\n", OVERLAPPING_OPEN_TEST_DSET_NAME); + printf(" couldn't create the dataset '%s'\n", OVERLAPPING_OPEN_TEST_DSET_NAME); goto error; } /* Get the number of objects opened in the first file: 2 == file + dataset */ if ((obj_count = H5Fget_obj_count(file_id2, H5F_OBJ_ALL)) < 0) { H5_FAILED(); - HDprintf(" couldn't retrieve the number of objects opened in the file\n"); + printf(" couldn't retrieve the number of objects opened in the file\n"); goto error; } if (obj_count != 2) { H5_FAILED(); - HDprintf(" number of objects opened in the file (%ld) did not match expected number (2)\n", - obj_count); + printf(" number of objects opened in the file (%ld) did not match expected number (2)\n", + obj_count); goto error; } @@ -2031,7 +2030,7 @@ test_file_open_overlap(void) if (H5Fclose(file_id2) < 0) TEST_ERROR; - HDfree(prefixed_filename); + free(prefixed_filename); prefixed_filename = NULL; PASSED(); @@ -2049,7 +2048,7 @@ error: } H5E_END_TRY; - HDfree(prefixed_filename); + free(prefixed_filename); return 1; } @@ -2072,46 +2071,46 @@ test_file_mounts(void) if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_MOUNT) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC)) { SKIPPED(); - HDprintf(" API functions for basic file, file mount, or basic group aren't supported with this " - "connector\n"); + printf(" API functions for basic file, file mount, or basic group aren't supported with this " + "connector\n"); return 0; } if (prefix_filename(test_path_prefix, FILE_MOUNT_TEST_FILENAME, &prefixed_filename) < 0) { H5_FAILED(); - HDprintf(" couldn't prefix filename\n"); + printf(" couldn't prefix filename\n"); goto error; } if ((file_id = H5Fcreate(prefixed_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create file '%s'\n", prefixed_filename); + printf(" couldn't create file '%s'\n", prefixed_filename); goto error; } if ((group_id = H5Gcreate2(file_id, FILE_MOUNT_TEST_GRP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create group '%s'\n", FILE_MOUNT_TEST_GRP_NAME); + printf(" couldn't create group '%s'\n", FILE_MOUNT_TEST_GRP_NAME); goto error; } if ((child_fid = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } /* Mount one file (child_fid) to the group of another file (file_id) */ if (H5Fmount(file_id, FILE_MOUNT_TEST_GRP_NAME, child_fid, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't mount file\n"); + printf(" couldn't mount file\n"); goto error; } if (H5Funmount(file_id, FILE_MOUNT_TEST_GRP_NAME) < 0) { H5_FAILED(); - HDprintf(" couldn't mount file\n"); + printf(" couldn't mount file\n"); goto error; } @@ -2122,7 +2121,7 @@ test_file_mounts(void) if (H5Fclose(child_fid) < 0) TEST_ERROR; - HDfree(prefixed_filename); + free(prefixed_filename); prefixed_filename = NULL; PASSED(); @@ -2138,7 +2137,7 @@ error: } H5E_END_TRY; - HDfree(prefixed_filename); + free(prefixed_filename); return 1; } @@ -2167,7 +2166,7 @@ test_get_file_name(void) !(vol_cap_flags_g & H5VL_CAP_FLAG_STORED_DATATYPES) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC)) { SKIPPED(); - HDprintf( + printf( " API functions for basic or more file, basic dataset, group, stored datatypes, or attribute " "aren't supported with this connector\n"); return 0; @@ -2177,13 +2176,13 @@ test_get_file_name(void) if (prefix_filename(test_path_prefix, GET_FILE_NAME_TEST_FNAME, &prefixed_filename) < 0) { H5_FAILED(); - HDprintf(" couldn't prefix filename\n"); + printf(" couldn't prefix filename\n"); goto error; } if ((file_id = H5Fcreate(prefixed_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create file '%s'\n", prefixed_filename); + printf(" couldn't create file '%s'\n", prefixed_filename); goto error; } @@ -2192,7 +2191,7 @@ test_get_file_name(void) TEST_ERROR; /* Allocate buffer for file name */ - if (NULL == (file_name_buf = (char *)HDmalloc((size_t)file_name_buf_len + 1))) + if (NULL == (file_name_buf = (char *)malloc((size_t)file_name_buf_len + 1))) TEST_ERROR; PASSED(); @@ -2208,14 +2207,14 @@ test_get_file_name(void) /* Retrieve the actual file name */ if (H5Fget_name(file_id, file_name_buf, (size_t)file_name_buf_len + 1) < 0) { H5_FAILED(); - HDprintf(" couldn't get file name %s\n", prefixed_filename); + printf(" couldn't get file name %s\n", prefixed_filename); PART_ERROR(H5Fget_name_file_id); } if (HDstrncmp(file_name_buf, prefixed_filename, (size_t)file_name_buf_len)) { H5_FAILED(); - HDprintf(" file name '%s' didn't match expected name '%s'\n", file_name_buf, - prefixed_filename); + printf(" file name '%s' didn't match expected name '%s'\n", file_name_buf, + prefixed_filename); PART_ERROR(H5Fget_name_file_id); } @@ -2233,20 +2232,20 @@ test_get_file_name(void) if ((group_id = H5Gcreate2(file_id, GET_FILE_NAME_TEST_GRP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" failed to create group '%s'\n", GET_FILE_NAME_TEST_GRP_NAME); + printf(" failed to create group '%s'\n", GET_FILE_NAME_TEST_GRP_NAME); PART_ERROR(H5Fget_name_grp_id); } if (H5Fget_name(group_id, file_name_buf, (size_t)file_name_buf_len + 1) < 0) { H5_FAILED(); - HDprintf(" couldn't get file name %s\n", prefixed_filename); + printf(" couldn't get file name %s\n", prefixed_filename); PART_ERROR(H5Fget_name_grp_id); } if (HDstrncmp(file_name_buf, prefixed_filename, (size_t)file_name_buf_len)) { H5_FAILED(); - HDprintf(" file name '%s' didn't match expected name '%s'\n", file_name_buf, - prefixed_filename); + printf(" file name '%s' didn't match expected name '%s'\n", file_name_buf, + prefixed_filename); PART_ERROR(H5Fget_name_grp_id); } @@ -2269,7 +2268,7 @@ test_get_file_name(void) if ((dspace_id = H5Screate(H5S_SCALAR)) < 0) { H5_FAILED(); - HDprintf(" couldn't create dataspace\n"); + printf(" couldn't create dataspace\n"); PART_ERROR(H5Fget_name_dset_id); } @@ -2277,21 +2276,21 @@ test_get_file_name(void) if ((dset_id = H5Dcreate2(file_id, GET_FILE_NAME_TEST_DSET_NAME, H5T_NATIVE_INT, dspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create the dataset '%s'\n", GET_FILE_NAME_TEST_DSET_NAME); + printf(" couldn't create the dataset '%s'\n", GET_FILE_NAME_TEST_DSET_NAME); PART_ERROR(H5Fget_name_dset_id); } /* Get and verify file name from the dataset */ if (H5Fget_name(dset_id, file_name_buf, (size_t)file_name_buf_len + 1) < 0) { H5_FAILED(); - HDprintf(" couldn't get file name %s\n", prefixed_filename); + printf(" couldn't get file name %s\n", prefixed_filename); PART_ERROR(H5Fget_name_dset_id); } if (HDstrncmp(file_name_buf, prefixed_filename, (size_t)file_name_buf_len)) { H5_FAILED(); - HDprintf(" file name '%s' didn't match expected name '%s'\n", file_name_buf, - prefixed_filename); + printf(" file name '%s' didn't match expected name '%s'\n", file_name_buf, + prefixed_filename); PART_ERROR(H5Fget_name_dset_id); } @@ -2322,7 +2321,7 @@ test_get_file_name(void) if ((dspace_id = H5Screate(H5S_SCALAR)) < 0) { H5_FAILED(); - HDprintf(" couldn't create dataspace\n"); + printf(" couldn't create dataspace\n"); PART_ERROR(H5Fget_name_attr_id); } @@ -2330,21 +2329,21 @@ test_get_file_name(void) if ((attr_id = H5Acreate2(file_id, GET_FILE_NAME_TEST_ATTR_NAME, H5T_NATIVE_INT, dspace_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create the attribute '%s'\n", GET_FILE_NAME_TEST_ATTR_NAME); + printf(" couldn't create the attribute '%s'\n", GET_FILE_NAME_TEST_ATTR_NAME); PART_ERROR(H5Fget_name_attr_id); } /* Get and verify file name from the attribute */ if (H5Fget_name(attr_id, file_name_buf, (size_t)file_name_buf_len + 1) < 0) { H5_FAILED(); - HDprintf(" couldn't get file name %s\n", prefixed_filename); + printf(" couldn't get file name %s\n", prefixed_filename); PART_ERROR(H5Fget_name_attr_id); } if (HDstrncmp(file_name_buf, prefixed_filename, (size_t)file_name_buf_len)) { H5_FAILED(); - HDprintf(" file name '%s' didn't match expected name '%s'\n", file_name_buf, - prefixed_filename); + printf(" file name '%s' didn't match expected name '%s'\n", file_name_buf, + prefixed_filename); PART_ERROR(H5Fget_name_attr_id); } @@ -2376,28 +2375,28 @@ test_get_file_name(void) /* Create a named datatype */ if ((named_dtype_id = H5Tcopy(H5T_NATIVE_INT)) < 0) { H5_FAILED(); - HDprintf(" couldn't copy a native datatype\n"); + printf(" couldn't copy a native datatype\n"); PART_ERROR(H5Fget_name_dtype_id); } if (H5Tcommit2(file_id, GET_FILE_NAME_TEST_NAMED_DTYPE, named_dtype_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't commit a named datatype\n"); + printf(" couldn't commit a named datatype\n"); PART_ERROR(H5Fget_name_dtype_id); } /* Get and verify file name from the committed datatype */ if (H5Fget_name(named_dtype_id, file_name_buf, (size_t)file_name_buf_len + 1) < 0) { H5_FAILED(); - HDprintf(" couldn't get file name %s\n", prefixed_filename); + printf(" couldn't get file name %s\n", prefixed_filename); PART_ERROR(H5Fget_name_dtype_id); } if (HDstrncmp(file_name_buf, prefixed_filename, (size_t)file_name_buf_len)) { H5_FAILED(); - HDprintf(" file name '%s' didn't match expected name '%s'\n", file_name_buf, - prefixed_filename); + printf(" file name '%s' didn't match expected name '%s'\n", file_name_buf, + prefixed_filename); PART_ERROR(H5Fget_name_dtype_id); } @@ -2422,7 +2421,7 @@ test_get_file_name(void) if ((dspace_id = H5Screate(H5S_SCALAR)) < 0) { H5_FAILED(); - HDprintf(" couldn't create dataspace\n"); + printf(" couldn't create dataspace\n"); PART_ERROR(H5Fget_name_dspace_id); } @@ -2436,7 +2435,7 @@ test_get_file_name(void) if (name_len >= 0) { H5_FAILED(); - HDprintf(" retrieved file name using H5Fget_name on a dataspace ID!\n"); + printf(" retrieved file name using H5Fget_name on a dataspace ID!\n"); PART_ERROR(H5Fget_name_dspace_id); } @@ -2458,14 +2457,14 @@ test_get_file_name(void) TESTING_2("test cleanup"); if (file_name_buf) { - HDfree(file_name_buf); + free(file_name_buf); file_name_buf = NULL; } if (H5Fclose(file_id) < 0) TEST_ERROR; - HDfree(prefixed_filename); + free(prefixed_filename); prefixed_filename = NULL; PASSED(); @@ -2476,7 +2475,7 @@ error: H5E_BEGIN_TRY { if (file_name_buf) - HDfree(file_name_buf); + free(file_name_buf); H5Tclose(named_dtype_id); H5Sclose(dspace_id); H5Dclose(dset_id); @@ -2486,7 +2485,7 @@ error: } H5E_END_TRY; - HDfree(prefixed_filename); + free(prefixed_filename); return 1; } @@ -2521,19 +2520,19 @@ H5_api_file_test(void) size_t i; int nerrors; - HDprintf("**********************************************\n"); - HDprintf("* *\n"); - HDprintf("* API File Tests *\n"); - HDprintf("* *\n"); - HDprintf("**********************************************\n\n"); + printf("**********************************************\n"); + printf("* *\n"); + printf("* API File Tests *\n"); + printf("* *\n"); + printf("**********************************************\n\n"); for (i = 0, nerrors = 0; i < ARRAY_LENGTH(file_tests); i++) { nerrors += (*file_tests[i])() ? 1 : 0; } - HDprintf("\n"); + printf("\n"); - HDprintf("Cleaning up testing files\n"); + printf("Cleaning up testing files\n"); cleanup_files(); return nerrors; diff --git a/test/API/H5_api_group_test.c b/test/API/H5_api_group_test.c index 016d988..20ced5b 100644 --- a/test/API/H5_api_group_test.c +++ b/test/API/H5_api_group_test.c @@ -70,13 +70,13 @@ test_create_group_under_root(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC)) { SKIPPED(); - HDprintf(" API functions for basic file or group aren't supported with this connector\n"); + printf(" API functions for basic file or group aren't supported with this connector\n"); return 0; } if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } @@ -84,7 +84,7 @@ test_create_group_under_root(void) if ((parent_gid = H5Gcreate2(file_id, GROUP_CREATE_UNDER_ROOT_GNAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create group '%s'\n", GROUP_CREATE_UNDER_ROOT_GNAME); + printf(" couldn't create group '%s'\n", GROUP_CREATE_UNDER_ROOT_GNAME); goto error; } @@ -124,20 +124,20 @@ test_create_group_under_existing_group(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC)) { SKIPPED(); - HDprintf(" API functions for basic file or group aren't supported with this connector\n"); + printf(" API functions for basic file or group aren't supported with this connector\n"); return 0; } if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file\n"); + printf(" couldn't open file\n"); goto error; } /* Open the already-existing group (/group_tests) in the file as the parent */ if ((parent_group_id = H5Gopen2(file_id, GROUP_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open group\n"); + printf(" couldn't open group\n"); goto error; } @@ -146,7 +146,7 @@ test_create_group_under_existing_group(void) if ((child_group_id = H5Gcreate2(parent_group_id, GROUP_CREATE_UNDER_GROUP_REL_GNAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create group using relative path: %s\n", GROUP_CREATE_UNDER_GROUP_REL_GNAME); + printf(" couldn't create group using relative path: %s\n", GROUP_CREATE_UNDER_GROUP_REL_GNAME); goto error; } @@ -155,7 +155,7 @@ test_create_group_under_existing_group(void) if ((grandchild_group_id = H5Gcreate2(parent_group_id, GROUP_CREATE_UNDER_GROUP_ABS_GNAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create group using absolute path: %s\n", GROUP_CREATE_UNDER_GROUP_ABS_GNAME); + printf(" couldn't create group using absolute path: %s\n", GROUP_CREATE_UNDER_GROUP_ABS_GNAME); goto error; } @@ -202,38 +202,38 @@ test_create_many_groups(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC)) { SKIPPED(); - HDprintf(" API functions for basic file or group aren't supported with this connector\n"); + printf(" API functions for basic file or group aren't supported with this connector\n"); return 0; } if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, GROUP_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group\n"); + printf(" couldn't open container group\n"); goto error; } if ((parent_group_id = H5Gcreate2(container_group, MANY_GROUP_CREATIONS_GNAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create group '%s'\n", MANY_GROUP_CREATIONS_GNAME); + printf(" couldn't create group '%s'\n", MANY_GROUP_CREATIONS_GNAME); goto error; } /* Create multiple groups under the parent group */ - HDprintf("\n"); + printf("\n"); for (i = 0; i < GROUP_NUMB_MANY; i++) { - HDprintf("\r %u/%u", i + 1, GROUP_NUMB_MANY); + printf("\r %u/%u", i + 1, GROUP_NUMB_MANY); sprintf(group_name, "group %02u", i); if ((child_group_id = H5Gcreate2(parent_group_id, group_name, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create group '%s'\n", group_name); + printf(" couldn't create group '%s'\n", group_name); goto error; } @@ -280,19 +280,19 @@ test_create_deep_groups(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC)) { SKIPPED(); - HDprintf(" API functions for basic file or group aren't supported with this connector\n"); + printf(" API functions for basic file or group aren't supported with this connector\n"); return 0; } if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, GROUP_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group\n"); + printf(" couldn't open container group\n"); goto error; } @@ -300,11 +300,11 @@ test_create_deep_groups(void) if ((group_id = H5Gcreate2(container_group, DEEP_GROUP_CREATIONS_GNAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create group '%s'\n", DEEP_GROUP_CREATIONS_GNAME); + printf(" couldn't create group '%s'\n", DEEP_GROUP_CREATIONS_GNAME); goto error; } - HDprintf("\n"); + printf("\n"); if (create_group_recursive(group_id, 1) < 0) TEST_ERROR; @@ -340,7 +340,7 @@ create_group_recursive(hid_t parent_gid, unsigned counter) hid_t child_gid = H5I_INVALID_HID; char gname[NAME_BUF_SIZE]; - HDprintf("\r %u/%u", counter, GROUP_DEPTH); + printf("\r %u/%u", counter, GROUP_DEPTH); if (counter == 1) sprintf(gname, "2nd_child_group"); else if (counter == 2) @@ -349,7 +349,7 @@ create_group_recursive(hid_t parent_gid, unsigned counter) sprintf(gname, "%dth_child_group", counter + 1); if ((child_gid = H5Gcreate2(parent_gid, gname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create group '%s'\n", gname); + printf(" couldn't create group '%s'\n", gname); goto error; } @@ -389,19 +389,19 @@ test_create_intermediate_group(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC)) { SKIPPED(); - HDprintf(" API functions for basic file or group aren't supported with this connector\n"); + printf(" API functions for basic file or group aren't supported with this connector\n"); return 0; } if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, GROUP_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group\n"); + printf(" couldn't open container group\n"); goto error; } @@ -536,7 +536,7 @@ test_create_group_invalid_params(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC)) { SKIPPED(); - HDprintf(" API functions for basic file or group aren't supported with this connector\n"); + printf(" API functions for basic file or group aren't supported with this connector\n"); return 0; } @@ -544,7 +544,7 @@ test_create_group_invalid_params(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } @@ -565,7 +565,7 @@ test_create_group_invalid_params(void) if (group_id >= 0) { H5_FAILED(); - HDprintf(" created group with invalid loc_id!\n"); + printf(" created group with invalid loc_id!\n"); H5Gclose(group_id); PART_ERROR(H5Gcreate_invalid_loc_id); } @@ -586,7 +586,7 @@ test_create_group_invalid_params(void) if (group_id >= 0) { H5_FAILED(); - HDprintf(" created group with a NULL name!\n"); + printf(" created group with a NULL name!\n"); H5Gclose(group_id); PART_ERROR(H5Gcreate_invalid_grp_name); } @@ -599,7 +599,7 @@ test_create_group_invalid_params(void) if (group_id >= 0) { H5_FAILED(); - HDprintf(" created group with an invalid group name of ''!\n"); + printf(" created group with an invalid group name of ''!\n"); H5Gclose(group_id); PART_ERROR(H5Gcreate_invalid_grp_name); } @@ -621,7 +621,7 @@ test_create_group_invalid_params(void) if (group_id >= 0) { H5_FAILED(); - HDprintf(" created group with invalid LCPL!\n"); + printf(" created group with invalid LCPL!\n"); H5Gclose(group_id); PART_ERROR(H5Gcreate_invalid_lcpl); } @@ -643,7 +643,7 @@ test_create_group_invalid_params(void) if (group_id >= 0) { H5_FAILED(); - HDprintf(" created group with invalid GCPL!\n"); + printf(" created group with invalid GCPL!\n"); H5Gclose(group_id); PART_ERROR(H5Gcreate_invalid_gcpl); } @@ -665,7 +665,7 @@ test_create_group_invalid_params(void) if (group_id >= 0) { H5_FAILED(); - HDprintf(" created group with invalid GAPL!\n"); + printf(" created group with invalid GAPL!\n"); H5Gclose(group_id); PART_ERROR(H5Gcreate_invalid_gapl); } @@ -711,25 +711,25 @@ test_create_anonymous_group(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC)) { SKIPPED(); - HDprintf(" API functions for basic file or group aren't supported with this connector\n"); + printf(" API functions for basic file or group aren't supported with this connector\n"); return 0; } if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file\n"); + printf(" couldn't open file\n"); goto error; } if ((container_group = H5Gopen2(file_id, GROUP_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open group\n"); + printf(" couldn't open group\n"); goto error; } if ((new_group_id = H5Gcreate_anon(file_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create anonymous group\n"); + printf(" couldn't create anonymous group\n"); goto error; } @@ -771,7 +771,7 @@ test_create_anonymous_group_invalid_params(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC)) { SKIPPED(); - HDprintf(" API functions for basic file or group aren't supported with this connector\n"); + printf(" API functions for basic file or group aren't supported with this connector\n"); return 0; } @@ -779,13 +779,13 @@ test_create_anonymous_group_invalid_params(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file\n"); + printf(" couldn't open file\n"); goto error; } if ((container_group = H5Gopen2(file_id, GROUP_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open group\n"); + printf(" couldn't open group\n"); goto error; } @@ -805,7 +805,7 @@ test_create_anonymous_group_invalid_params(void) if (new_group_id >= 0) { H5_FAILED(); - HDprintf(" created anonymous group with invalid loc_id!\n"); + printf(" created anonymous group with invalid loc_id!\n"); H5Gclose(new_group_id); PART_ERROR(H5Gcreate_anon_invalid_loc_id); } @@ -826,7 +826,7 @@ test_create_anonymous_group_invalid_params(void) if (new_group_id >= 0) { H5_FAILED(); - HDprintf(" created anonymous group with invalid GCPL!\n"); + printf(" created anonymous group with invalid GCPL!\n"); H5Gclose(new_group_id); PART_ERROR(H5Gcreate_anon_invalid_gcpl); } @@ -847,7 +847,7 @@ test_create_anonymous_group_invalid_params(void) if (new_group_id >= 0) { H5_FAILED(); - HDprintf(" created anonymous group with invalid GAPL!\n"); + printf(" created anonymous group with invalid GAPL!\n"); H5Gclose(new_group_id); PART_ERROR(H5Gcreate_anon_invalid_gapl); } @@ -896,13 +896,13 @@ test_open_nonexistent_group(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC)) { SKIPPED(); - HDprintf(" API functions for basic file or group aren't supported with this connector\n"); + printf(" API functions for basic file or group aren't supported with this connector\n"); return 0; } if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file\n"); + printf(" couldn't open file\n"); goto error; } @@ -914,7 +914,7 @@ test_open_nonexistent_group(void) if (group_id >= 0) { H5_FAILED(); - HDprintf(" opened non-existent group!\n"); + printf(" opened non-existent group!\n"); goto error; } @@ -951,7 +951,7 @@ test_open_group_invalid_params(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC)) { SKIPPED(); - HDprintf(" API functions for basic file or group aren't supported with this connector\n"); + printf(" API functions for basic file or group aren't supported with this connector\n"); return 0; } @@ -959,7 +959,7 @@ test_open_group_invalid_params(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } @@ -979,7 +979,7 @@ test_open_group_invalid_params(void) if (group_id >= 0) { H5_FAILED(); - HDprintf(" opened group using an invalid loc_id!\n"); + printf(" opened group using an invalid loc_id!\n"); H5Gclose(group_id); PART_ERROR(H5Gopen_invalid_loc_id); } @@ -1000,7 +1000,7 @@ test_open_group_invalid_params(void) if (group_id >= 0) { H5_FAILED(); - HDprintf(" opened group using a NULL name!\n"); + printf(" opened group using a NULL name!\n"); H5Gclose(group_id); PART_ERROR(H5Gopen_invalid_grp_name); } @@ -1013,7 +1013,7 @@ test_open_group_invalid_params(void) if (group_id >= 0) { H5_FAILED(); - HDprintf(" opened group using an invalid name of ''!\n"); + printf(" opened group using an invalid name of ''!\n"); H5Gclose(group_id); PART_ERROR(H5Gopen_invalid_grp_name); } @@ -1034,7 +1034,7 @@ test_open_group_invalid_params(void) if (group_id >= 0) { H5_FAILED(); - HDprintf(" opened group using an invalid GAPL!\n"); + printf(" opened group using an invalid GAPL!\n"); H5Gclose(group_id); PART_ERROR(H5Gopen_invalid_gapl); } @@ -1079,7 +1079,7 @@ test_close_group_invalid_id(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC)) { SKIPPED(); - HDprintf(" API functions for basic group aren't supported with this connector\n"); + printf(" API functions for basic group aren't supported with this connector\n"); return 0; } @@ -1091,7 +1091,7 @@ test_close_group_invalid_id(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" close a group with an invalid ID!\n"); + printf(" close a group with an invalid ID!\n"); goto error; } @@ -1123,8 +1123,8 @@ test_group_property_lists(void) if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GET_PLIST) || !(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" API functions for basic file, group, property list, or creation order aren't supported " - "with this connector\n"); + printf(" API functions for basic file, group, property list, or creation order aren't supported " + "with this connector\n"); return 0; } @@ -1132,25 +1132,25 @@ test_group_property_lists(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file\n"); + printf(" couldn't open file\n"); goto error; } if ((container_group = H5Gopen2(file_id, GROUP_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group\n"); + printf(" couldn't open container group\n"); goto error; } if ((gcpl_id1 = H5Pcreate(H5P_GROUP_CREATE)) < 0) { H5_FAILED(); - HDprintf(" couldn't create GCPL\n"); + printf(" couldn't create GCPL\n"); goto error; } if (H5Pset_link_creation_order(gcpl_id1, dummy_prop_val) < 0) { H5_FAILED(); - HDprintf(" couldn't set property on GCPL\n"); + printf(" couldn't set property on GCPL\n"); goto error; } @@ -1158,7 +1158,7 @@ test_group_property_lists(void) if ((group_id1 = H5Gcreate2(container_group, GROUP_PROPERTY_LIST_TEST_GROUP_NAME1, H5P_DEFAULT, gcpl_id1, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create group\n"); + printf(" couldn't create group\n"); goto error; } @@ -1166,7 +1166,7 @@ test_group_property_lists(void) if ((group_id2 = H5Gcreate2(container_group, GROUP_PROPERTY_LIST_TEST_GROUP_NAME2, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create group\n"); + printf(" couldn't create group\n"); goto error; } @@ -1185,13 +1185,13 @@ test_group_property_lists(void) * does not */ if ((gcpl_id1 = H5Gget_create_plist(group_id1)) < 0) { H5_FAILED(); - HDprintf(" couldn't get GCPL\n"); + printf(" couldn't get GCPL\n"); PART_ERROR(H5Gget_create_plist); } if ((gcpl_id2 = H5Gget_create_plist(group_id2)) < 0) { H5_FAILED(); - HDprintf(" couldn't get GCPL\n"); + printf(" couldn't get GCPL\n"); PART_ERROR(H5Gget_create_plist); } @@ -1200,15 +1200,15 @@ test_group_property_lists(void) if (H5Pget_link_creation_order(gcpl_id1, &dummy_prop_val) < 0) { H5_FAILED(); - HDprintf(" couldn't retrieve GCPL property value\n"); + printf(" couldn't retrieve GCPL property value\n"); PART_ERROR(H5Gget_create_plist); } if (dummy_prop_val != GROUP_PROPERTY_LIST_TEST_DUMMY_VAL) { H5_FAILED(); - HDprintf(" retrieved GCPL property value '%llu' did not match expected value '%llu'\n", - (unsigned long long)dummy_prop_val, - (unsigned long long)GROUP_PROPERTY_LIST_TEST_DUMMY_VAL); + printf(" retrieved GCPL property value '%llu' did not match expected value '%llu'\n", + (unsigned long long)dummy_prop_val, + (unsigned long long)GROUP_PROPERTY_LIST_TEST_DUMMY_VAL); PART_ERROR(H5Gget_create_plist); } @@ -1216,16 +1216,16 @@ test_group_property_lists(void) if (H5Pget_link_creation_order(gcpl_id2, &dummy_prop_val) < 0) { H5_FAILED(); - HDprintf(" couldn't retrieve GCPL property value\n"); + printf(" couldn't retrieve GCPL property value\n"); PART_ERROR(H5Gget_create_plist); } if (dummy_prop_val == GROUP_PROPERTY_LIST_TEST_DUMMY_VAL) { H5_FAILED(); - HDprintf(" retrieved GCPL property value '%llu' matched control value '%llu' when it " - "shouldn't have\n", - (unsigned long long)dummy_prop_val, - (unsigned long long)GROUP_PROPERTY_LIST_TEST_DUMMY_VAL); + printf(" retrieved GCPL property value '%llu' matched control value '%llu' when it " + "shouldn't have\n", + (unsigned long long)dummy_prop_val, + (unsigned long long)GROUP_PROPERTY_LIST_TEST_DUMMY_VAL); PART_ERROR(H5Gget_create_plist); } @@ -1278,26 +1278,26 @@ test_group_property_lists(void) if ((group_id1 = H5Gopen2(container_group, GROUP_PROPERTY_LIST_TEST_GROUP_NAME1, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open group\n"); + printf(" couldn't open group\n"); PART_ERROR(H5Gget_create_plist_reopened); } if ((group_id2 = H5Gopen2(container_group, GROUP_PROPERTY_LIST_TEST_GROUP_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open group\n"); + printf(" couldn't open group\n"); PART_ERROR(H5Gget_create_plist_reopened); } if ((gcpl_id1 = H5Gget_create_plist(group_id1)) < 0) { H5_FAILED(); - HDprintf(" couldn't get property list\n"); + printf(" couldn't get property list\n"); PART_ERROR(H5Gget_create_plist_reopened); } if ((gcpl_id2 = H5Gget_create_plist(group_id2)) < 0) { H5_FAILED(); - HDprintf(" couldn't get property list\n"); + printf(" couldn't get property list\n"); PART_ERROR(H5Gget_create_plist_reopened); } @@ -1306,15 +1306,15 @@ test_group_property_lists(void) if (H5Pget_link_creation_order(gcpl_id1, &dummy_prop_val) < 0) { H5_FAILED(); - HDprintf(" couldn't retrieve GCPL property value\n"); + printf(" couldn't retrieve GCPL property value\n"); PART_ERROR(H5Gget_create_plist_reopened); } if (dummy_prop_val != GROUP_PROPERTY_LIST_TEST_DUMMY_VAL) { H5_FAILED(); - HDprintf(" retrieved GCPL property value '%llu' did not match expected value '%llu'\n", - (unsigned long long)dummy_prop_val, - (unsigned long long)GROUP_PROPERTY_LIST_TEST_DUMMY_VAL); + printf(" retrieved GCPL property value '%llu' did not match expected value '%llu'\n", + (unsigned long long)dummy_prop_val, + (unsigned long long)GROUP_PROPERTY_LIST_TEST_DUMMY_VAL); PART_ERROR(H5Gget_create_plist_reopened); } @@ -1322,16 +1322,16 @@ test_group_property_lists(void) if (H5Pget_link_creation_order(gcpl_id2, &dummy_prop_val) < 0) { H5_FAILED(); - HDprintf(" couldn't retrieve GCPL property value\n"); + printf(" couldn't retrieve GCPL property value\n"); PART_ERROR(H5Gget_create_plist_reopened); } if (dummy_prop_val == GROUP_PROPERTY_LIST_TEST_DUMMY_VAL) { H5_FAILED(); - HDprintf(" retrieved GCPL property value '%llu' matched control value '%llu' when it " - "shouldn't have\n", - (unsigned long long)dummy_prop_val, - (unsigned long long)GROUP_PROPERTY_LIST_TEST_DUMMY_VAL); + printf(" retrieved GCPL property value '%llu' matched control value '%llu' when it " + "shouldn't have\n", + (unsigned long long)dummy_prop_val, + (unsigned long long)GROUP_PROPERTY_LIST_TEST_DUMMY_VAL); PART_ERROR(H5Gget_create_plist_reopened); } @@ -1395,7 +1395,7 @@ test_get_group_info(void) if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_MORE)) { SKIPPED(); - HDprintf(" API functions for basic file or group aren't supported with this connector\n"); + printf(" API functions for basic file or group aren't supported with this connector\n"); return 0; } @@ -1403,26 +1403,26 @@ test_get_group_info(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, GROUP_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group\n"); + printf(" couldn't open container group\n"); goto error; } if ((gcpl_id = H5Pcreate(H5P_GROUP_CREATE)) < 0) { H5_FAILED(); - HDprintf(" couldn't create a GCPL\n"); + printf(" couldn't create a GCPL\n"); goto error; } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (H5Pset_link_creation_order(gcpl_id, H5P_CRT_ORDER_TRACKED | H5P_CRT_ORDER_INDEXED) < 0) { H5_FAILED(); - HDprintf(" couldn't enable link creation order tracking and indexing on GCPL\n"); + printf(" couldn't enable link creation order tracking and indexing on GCPL\n"); goto error; } } @@ -1430,7 +1430,7 @@ test_get_group_info(void) if ((parent_group_id = H5Gcreate2(container_group, GROUP_GET_INFO_TEST_GROUP_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create group '%s'\n", GROUP_GET_INFO_TEST_GROUP_NAME); + printf(" couldn't create group '%s'\n", GROUP_GET_INFO_TEST_GROUP_NAME); goto error; } @@ -1442,7 +1442,7 @@ test_get_group_info(void) if ((group_id = H5Gcreate2(parent_group_id, group_name, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create group '%s'\n", group_name); + printf(" couldn't create group '%s'\n", group_name); goto error; } @@ -1463,14 +1463,14 @@ test_get_group_info(void) /* Retrieve information about the parent group */ if (H5Gget_info(parent_group_id, &group_info) < 0) { H5_FAILED(); - HDprintf(" couldn't get group info\n"); + printf(" couldn't get group info\n"); PART_ERROR(H5Gget_info); } if (group_info.nlinks != GROUP_GET_INFO_TEST_GROUP_NUMB) { H5_FAILED(); - HDprintf(" group's number of links '%lu' doesn't match expected value '%u'\n", - group_info.nlinks, (unsigned int)GROUP_GET_INFO_TEST_GROUP_NUMB); + printf(" group's number of links '%lu' doesn't match expected value '%u'\n", + group_info.nlinks, (unsigned int)GROUP_GET_INFO_TEST_GROUP_NUMB); PART_ERROR(H5Gget_info); } @@ -1480,8 +1480,8 @@ test_get_group_info(void) */ if (group_info.max_corder != GROUP_GET_INFO_TEST_GROUP_NUMB) { H5_FAILED(); - HDprintf(" group's max creation order '%lld' doesn't match expected value '%lld'\n", - (long long)group_info.max_corder, (long long)GROUP_GET_INFO_TEST_GROUP_NUMB); + printf(" group's max creation order '%lld' doesn't match expected value '%lld'\n", + (long long)group_info.max_corder, (long long)GROUP_GET_INFO_TEST_GROUP_NUMB); PART_ERROR(H5Gget_info); } @@ -1491,14 +1491,14 @@ test_get_group_info(void) group_info.storage_type != H5G_STORAGE_TYPE_DENSE && group_info.storage_type != H5G_STORAGE_TYPE_UNKNOWN) { H5_FAILED(); - HDprintf(" group info's 'storage_type' field wasn't set to a meaningful value\n"); + printf(" group info's 'storage_type' field wasn't set to a meaningful value\n"); PART_ERROR(H5Gget_info); } /* Assume that mounted should be FALSE in this case */ if (group_info.mounted != FALSE) { H5_FAILED(); - HDprintf(" 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); } @@ -1516,14 +1516,14 @@ test_get_group_info(void) if (H5Gget_info_by_name(container_group, GROUP_GET_INFO_TEST_GROUP_NAME, &group_info, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't get group info by name\n"); + printf(" couldn't get group info by name\n"); PART_ERROR(H5Gget_info_by_name); } if (group_info.nlinks != GROUP_GET_INFO_TEST_GROUP_NUMB) { H5_FAILED(); - HDprintf(" group's number of links '%lu' doesn't match expected value '%u'\n", - group_info.nlinks, (unsigned int)GROUP_GET_INFO_TEST_GROUP_NUMB); + printf(" group's number of links '%lu' doesn't match expected value '%u'\n", + group_info.nlinks, (unsigned int)GROUP_GET_INFO_TEST_GROUP_NUMB); PART_ERROR(H5Gget_info_by_name); } @@ -1533,8 +1533,8 @@ test_get_group_info(void) */ if (group_info.max_corder != GROUP_GET_INFO_TEST_GROUP_NUMB) { H5_FAILED(); - HDprintf(" group's max creation order '%lld' doesn't match expected value '%lld'\n", - (long long)group_info.max_corder, (long long)GROUP_GET_INFO_TEST_GROUP_NUMB); + printf(" group's max creation order '%lld' doesn't match expected value '%lld'\n", + (long long)group_info.max_corder, (long long)GROUP_GET_INFO_TEST_GROUP_NUMB); PART_ERROR(H5Gget_info_by_name); } @@ -1544,14 +1544,14 @@ test_get_group_info(void) group_info.storage_type != H5G_STORAGE_TYPE_DENSE && group_info.storage_type != H5G_STORAGE_TYPE_UNKNOWN) { H5_FAILED(); - HDprintf(" group info's 'storage_type' field wasn't set to a meaningful value\n"); + printf(" group info's 'storage_type' field wasn't set to a meaningful value\n"); PART_ERROR(H5Gget_info_by_name); } /* Assume that mounted should be FALSE in this case */ if (group_info.mounted != FALSE) { H5_FAILED(); - HDprintf(" 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); } @@ -1565,7 +1565,7 @@ test_get_group_info(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" creation order tracking isn't supported with this VOL connector\n"); + printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Gget_info_by_idx_crt_order_increasing); } @@ -1576,21 +1576,21 @@ test_get_group_info(void) if (H5Gget_info_by_idx(container_group, GROUP_GET_INFO_TEST_GROUP_NAME, H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)i, &group_info, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't get group info for group at index %u\n", i); + printf(" couldn't get group info for group at index %u\n", i); PART_ERROR(H5Gget_info_by_idx_crt_order_increasing); } if (group_info.nlinks != 0) { H5_FAILED(); - HDprintf(" group's number of links '%lu' doesn't match expected value '%d'\n", - group_info.nlinks, 0); + printf(" group's number of links '%lu' doesn't match expected value '%d'\n", + group_info.nlinks, 0); PART_ERROR(H5Gget_info_by_idx_crt_order_increasing); } if (group_info.max_corder != 0) { H5_FAILED(); - HDprintf(" group's max creation order '%lld' doesn't match expected value '%d'\n", - (long long)group_info.max_corder, 0); + printf(" group's max creation order '%lld' doesn't match expected value '%d'\n", + (long long)group_info.max_corder, 0); PART_ERROR(H5Gget_info_by_idx_crt_order_increasing); } @@ -1600,14 +1600,14 @@ test_get_group_info(void) group_info.storage_type != H5G_STORAGE_TYPE_DENSE && group_info.storage_type != H5G_STORAGE_TYPE_UNKNOWN) { H5_FAILED(); - HDprintf(" group info's 'storage_type' field wasn't set to a meaningful value\n"); + printf(" group info's 'storage_type' field wasn't set to a meaningful value\n"); PART_ERROR(H5Gget_info_by_idx_crt_order_increasing); } /* Assume that mounted should be FALSE in this case */ if (group_info.mounted != FALSE) { H5_FAILED(); - HDprintf(" 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); } } @@ -1622,7 +1622,7 @@ test_get_group_info(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" creation order tracking isn't supported with this VOL connector\n"); + printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Gget_info_by_idx_crt_order_decreasing); } @@ -1633,21 +1633,21 @@ test_get_group_info(void) if (H5Gget_info_by_idx(container_group, GROUP_GET_INFO_TEST_GROUP_NAME, H5_INDEX_CRT_ORDER, H5_ITER_DEC, (hsize_t)i, &group_info, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't get group info for group at index %u\n", i); + printf(" couldn't get group info for group at index %u\n", i); PART_ERROR(H5Gget_info_by_idx_crt_order_decreasing); } if (group_info.nlinks != 0) { H5_FAILED(); - HDprintf(" group's number of links '%lu' doesn't match expected value '%d'\n", - group_info.nlinks, 0); + printf(" group's number of links '%lu' doesn't match expected value '%d'\n", + group_info.nlinks, 0); PART_ERROR(H5Gget_info_by_idx_crt_order_decreasing); } if (group_info.max_corder != 0) { H5_FAILED(); - HDprintf(" group's max creation order '%lld' doesn't match expected value '%d'\n", - (long long)group_info.max_corder, 0); + printf(" group's max creation order '%lld' doesn't match expected value '%d'\n", + (long long)group_info.max_corder, 0); PART_ERROR(H5Gget_info_by_idx_crt_order_decreasing); } @@ -1657,14 +1657,14 @@ test_get_group_info(void) group_info.storage_type != H5G_STORAGE_TYPE_DENSE && group_info.storage_type != H5G_STORAGE_TYPE_UNKNOWN) { H5_FAILED(); - HDprintf(" group info's 'storage_type' field wasn't set to a meaningful value\n"); + printf(" group info's 'storage_type' field wasn't set to a meaningful value\n"); PART_ERROR(H5Gget_info_by_idx_crt_order_decreasing); } /* Assume that mounted should be FALSE in this case */ if (group_info.mounted != FALSE) { H5_FAILED(); - HDprintf(" 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); } } @@ -1684,21 +1684,21 @@ test_get_group_info(void) if (H5Gget_info_by_idx(container_group, GROUP_GET_INFO_TEST_GROUP_NAME, H5_INDEX_NAME, H5_ITER_INC, (hsize_t)i, &group_info, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't get group info for group at index %u\n", i); + printf(" couldn't get group info for group at index %u\n", i); PART_ERROR(H5Gget_info_by_idx_name_order_increasing); } if (group_info.nlinks != 0) { H5_FAILED(); - HDprintf(" group's number of links '%lu' doesn't match expected value '%d'\n", - group_info.nlinks, 0); + printf(" group's number of links '%lu' doesn't match expected value '%d'\n", + group_info.nlinks, 0); PART_ERROR(H5Gget_info_by_idx_name_order_increasing); } if (group_info.max_corder != 0) { H5_FAILED(); - HDprintf(" group's max creation order '%lld' doesn't match expected value '%d'\n", - (long long)group_info.max_corder, 0); + printf(" group's max creation order '%lld' doesn't match expected value '%d'\n", + (long long)group_info.max_corder, 0); PART_ERROR(H5Gget_info_by_idx_name_order_increasing); } @@ -1708,14 +1708,14 @@ test_get_group_info(void) group_info.storage_type != H5G_STORAGE_TYPE_DENSE && group_info.storage_type != H5G_STORAGE_TYPE_UNKNOWN) { H5_FAILED(); - HDprintf(" group info's 'storage_type' field wasn't set to a meaningful value\n"); + printf(" group info's 'storage_type' field wasn't set to a meaningful value\n"); PART_ERROR(H5Gget_info_by_idx_name_order_increasing); } /* Assume that mounted should be FALSE in this case */ if (group_info.mounted != FALSE) { H5_FAILED(); - HDprintf(" 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); } } @@ -1735,22 +1735,21 @@ test_get_group_info(void) if (H5Gget_info_by_idx(container_group, GROUP_GET_INFO_TEST_GROUP_NAME, H5_INDEX_NAME, H5_ITER_DEC, (hsize_t)i, &group_info, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't get group info for group at index %u\n", i); + printf(" couldn't get group info for group at index %u\n", i); PART_ERROR(H5Gget_info_by_idx_name_order_decreasing); } if (group_info.nlinks != 0) { H5_FAILED(); - HDprintf(" group's number of links '%" PRIuHSIZE - "' doesn't match expected value '%d'\n", - group_info.nlinks, 0); + printf(" group's number of links '%" PRIuHSIZE "' doesn't match expected value '%d'\n", + group_info.nlinks, 0); PART_ERROR(H5Gget_info_by_idx_name_order_decreasing); } if (group_info.max_corder != 0) { H5_FAILED(); - HDprintf(" group's max creation order '%lld' doesn't match expected value '%d'\n", - (long long)group_info.max_corder, 0); + printf(" group's max creation order '%lld' doesn't match expected value '%d'\n", + (long long)group_info.max_corder, 0); PART_ERROR(H5Gget_info_by_idx_name_order_decreasing); } @@ -1760,14 +1759,14 @@ test_get_group_info(void) group_info.storage_type != H5G_STORAGE_TYPE_DENSE && group_info.storage_type != H5G_STORAGE_TYPE_UNKNOWN) { H5_FAILED(); - HDprintf(" group info's 'storage_type' field wasn't set to a meaningful value\n"); + printf(" group info's 'storage_type' field wasn't set to a meaningful value\n"); PART_ERROR(H5Gget_info_by_idx_name_order_decreasing); } /* Assume that mounted should be FALSE in this case */ if (group_info.mounted != FALSE) { H5_FAILED(); - HDprintf(" 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); } } @@ -1823,8 +1822,8 @@ test_get_group_info_invalid_params(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_MORE)) { SKIPPED(); - HDprintf(" API functions for basic file, or more group aren't supported with this " - "connector\n"); + printf(" API functions for basic file, or more group aren't supported with this " + "connector\n"); return 0; } @@ -1832,7 +1831,7 @@ test_get_group_info_invalid_params(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } @@ -1852,7 +1851,7 @@ test_get_group_info_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" retrieved info of group using H5Gget_info with an invalid loc_id!\n"); + printf(" retrieved info of group using H5Gget_info with an invalid loc_id!\n"); PART_ERROR(H5Gget_info_invalid_loc_id); } @@ -1872,7 +1871,7 @@ test_get_group_info_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" retrieved info of group using H5Gget_info with invalid group info pointer!\n"); + printf(" retrieved info of group using H5Gget_info with invalid group info pointer!\n"); PART_ERROR(H5Gget_info_invalid_grp_info_pointer); } @@ -1892,7 +1891,7 @@ test_get_group_info_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" retrieved info of group using H5Gget_info_by_name with an invalid loc_id!\n"); + printf(" retrieved info of group using H5Gget_info_by_name with an invalid loc_id!\n"); PART_ERROR(H5Gget_info_by_name_invalid_loc_id); } @@ -1912,7 +1911,7 @@ test_get_group_info_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" retrieved info of group using H5Gget_info_by_name with a NULL name!\n"); + printf(" retrieved info of group using H5Gget_info_by_name with a NULL name!\n"); PART_ERROR(H5Gget_info_by_name_invalid_grp_name); } @@ -1924,8 +1923,7 @@ test_get_group_info_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf( - " retrieved info of group using H5Gget_info_by_name with an invalid name of ''!\n"); + printf(" retrieved info of group using H5Gget_info_by_name with an invalid name of ''!\n"); PART_ERROR(H5Gget_info_by_name_invalid_grp_name); } @@ -1945,8 +1943,8 @@ test_get_group_info_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" retrieved info of group using H5Gget_info_by_name with an invalid group info " - "pointer!\n"); + printf(" retrieved info of group using H5Gget_info_by_name with an invalid group info " + "pointer!\n"); PART_ERROR(H5Gget_info_by_name_invalid_grp_info_pointer); } @@ -1966,7 +1964,7 @@ test_get_group_info_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" retrieved info of group using H5Gget_info_by_name with an invalid LAPL!\n"); + printf(" retrieved info of group using H5Gget_info_by_name with an invalid LAPL!\n"); PART_ERROR(H5Gget_info_by_name_invalid_lapl); } @@ -1987,7 +1985,7 @@ test_get_group_info_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" retrieved info of group using H5Gget_info_by_idx with an invalid loc_id!\n"); + printf(" retrieved info of group using H5Gget_info_by_idx with an invalid loc_id!\n"); PART_ERROR(H5Gget_info_by_idx_invalid_loc_id); } @@ -2008,7 +2006,7 @@ test_get_group_info_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" retrieved info of group using H5Gget_info_by_idx with a NULL group name!\n"); + printf(" retrieved info of group using H5Gget_info_by_idx with a NULL group name!\n"); PART_ERROR(H5Gget_info_by_idx_invalid_grp_name); } @@ -2021,8 +2019,8 @@ test_get_group_info_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" retrieved info of group using H5Gget_info_by_idx with an invalid group name of " - "''!\n"); + printf(" retrieved info of group using H5Gget_info_by_idx with an invalid group name of " + "''!\n"); PART_ERROR(H5Gget_info_by_idx_invalid_grp_name); } @@ -2043,8 +2041,8 @@ test_get_group_info_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" retrieved info of group using H5Gget_info_by_idx with invalid index type " - "H5_INDEX_UNKNOWN!\n"); + printf(" retrieved info of group using H5Gget_info_by_idx with invalid index type " + "H5_INDEX_UNKNOWN!\n"); PART_ERROR(H5Gget_info_by_idx_invalid_index_type); } @@ -2057,8 +2055,8 @@ test_get_group_info_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" retrieved info of group using H5Gget_info_by_idx with invalid index type " - "H5_INDEX_N!\n"); + printf(" retrieved info of group using H5Gget_info_by_idx with invalid index type " + "H5_INDEX_N!\n"); PART_ERROR(H5Gget_info_by_idx_invalid_index_type); } @@ -2079,8 +2077,8 @@ test_get_group_info_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" retrieved info of group using H5Gget_info_by_idx with invalid iteration order " - "H5_ITER_UNKNOWN!\n"); + printf(" retrieved info of group using H5Gget_info_by_idx with invalid iteration order " + "H5_ITER_UNKNOWN!\n"); PART_ERROR(H5Gget_info_by_idx_invalid_iter_order); } @@ -2093,8 +2091,8 @@ test_get_group_info_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" retrieved info of group using H5Gget_info_by_idx with invalid iteration order " - "H5_ITER_N!\n"); + printf(" retrieved info of group using H5Gget_info_by_idx with invalid iteration order " + "H5_ITER_N!\n"); PART_ERROR(H5Gget_info_by_idx_invalid_iter_order); } @@ -2114,8 +2112,8 @@ test_get_group_info_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" retrieved info of group using H5Gget_info_by_idx with an invalid group info " - "pointer!\n"); + printf(" retrieved info of group using H5Gget_info_by_idx with an invalid group info " + "pointer!\n"); PART_ERROR(H5Gget_info_by_idx_invalid_grp_info_pointer); } @@ -2136,7 +2134,7 @@ test_get_group_info_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" retrieved info of group using H5Gget_info_by_idx with an invalid LAPL!\n"); + printf(" retrieved info of group using H5Gget_info_by_idx with an invalid LAPL!\n"); PART_ERROR(H5Gget_info_by_idx_invalid_lapl); } @@ -2181,34 +2179,34 @@ test_flush_group(void) if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_FLUSH_REFRESH)) { SKIPPED(); - HDprintf(" API functions for basic file, group, or flush refresh aren't supported with this " - "connector\n"); + printf(" API functions for basic file, group, or flush refresh aren't supported with this " + "connector\n"); return 0; } if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, GROUP_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group\n"); + printf(" couldn't open container group\n"); goto error; } if ((group_id = H5Gcreate2(container_group, GROUP_FLUSH_GNAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create group '%s'\n", GROUP_FLUSH_GNAME); + printf(" couldn't create group '%s'\n", GROUP_FLUSH_GNAME); goto error; } /* Flush the group */ if (H5Gflush(group_id) < 0) { H5_FAILED(); - HDprintf(" couldn't flush the group '%s'\n", GROUP_FLUSH_GNAME); + printf(" couldn't flush the group '%s'\n", GROUP_FLUSH_GNAME); goto error; } @@ -2249,7 +2247,7 @@ test_flush_group_invalid_params(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FLUSH_REFRESH)) { SKIPPED(); - HDprintf(" API functions for group flush aren't supported with this connector\n"); + printf(" API functions for group flush aren't supported with this connector\n"); return 0; } @@ -2261,7 +2259,7 @@ test_flush_group_invalid_params(void) if (status >= 0) { H5_FAILED(); - HDprintf(" flushed group with invalid ID!\n"); + printf(" flushed group with invalid ID!\n"); goto error; } @@ -2289,34 +2287,34 @@ test_refresh_group(void) if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_FLUSH_REFRESH)) { SKIPPED(); - HDprintf(" API functions for basic file, group, or flush refresh aren't supported with this " - "connector\n"); + printf(" API functions for basic file, group, or flush refresh aren't supported with this " + "connector\n"); return 0; } if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, GROUP_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group\n"); + printf(" couldn't open container group\n"); goto error; } if ((group_id = H5Gcreate2(container_group, GROUP_REFRESH_GNAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create group '%s'\n", GROUP_REFRESH_GNAME); + printf(" couldn't create group '%s'\n", GROUP_REFRESH_GNAME); goto error; } /* Refresh the group */ if (H5Grefresh(group_id) < 0) { H5_FAILED(); - HDprintf(" couldn't refresh the group '%s'\n", GROUP_REFRESH_GNAME); + printf(" couldn't refresh the group '%s'\n", GROUP_REFRESH_GNAME); goto error; } @@ -2357,7 +2355,7 @@ test_refresh_group_invalid_params(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FLUSH_REFRESH)) { SKIPPED(); - HDprintf(" API functions for group refresh aren't supported with this connector\n"); + printf(" API functions for group refresh aren't supported with this connector\n"); return 0; } @@ -2369,7 +2367,7 @@ test_refresh_group_invalid_params(void) if (status >= 0) { H5_FAILED(); - HDprintf(" refreshed group with invalid ID!\n"); + printf(" refreshed group with invalid ID!\n"); goto error; } @@ -2387,17 +2385,17 @@ H5_api_group_test(void) size_t i; int nerrors; - HDprintf("**********************************************\n"); - HDprintf("* *\n"); - HDprintf("* API Group Tests *\n"); - HDprintf("* *\n"); - HDprintf("**********************************************\n\n"); + printf("**********************************************\n"); + printf("* *\n"); + printf("* API Group Tests *\n"); + printf("* *\n"); + printf("**********************************************\n\n"); for (i = 0, nerrors = 0; i < ARRAY_LENGTH(group_tests); i++) { nerrors += (*group_tests[i])() ? 1 : 0; } - HDprintf("\n"); + printf("\n"); return nerrors; } diff --git a/test/API/H5_api_link_test.c b/test/API/H5_api_link_test.c index 65a3277..3abd602 100644 --- a/test/API/H5_api_link_test.c +++ b/test/API/H5_api_link_test.c @@ -185,46 +185,46 @@ test_create_hard_link(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_HARD_LINKS)) { SKIPPED(); - HDprintf(" API functions for basic file, group, link, or hard link aren't supported with this " - "connector\n"); + printf(" API functions for basic file, group, link, or hard link aren't supported with this " + "connector\n"); return 0; } if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, HARD_LINK_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container sub-group '%s'\n", HARD_LINK_TEST_GROUP_NAME); + printf(" couldn't create container sub-group '%s'\n", HARD_LINK_TEST_GROUP_NAME); goto error; } if (H5Lcreate_hard(file_id, "/", group_id, HARD_LINK_TEST_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create hard link '%s'\n", HARD_LINK_TEST_LINK_NAME); + printf(" couldn't create hard link '%s'\n", HARD_LINK_TEST_LINK_NAME); goto error; } /* Verify the link has been created */ if ((link_exists = H5Lexists(group_id, HARD_LINK_TEST_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if link '%s' exists\n", HARD_LINK_TEST_LINK_NAME); + printf(" couldn't determine if link '%s' exists\n", HARD_LINK_TEST_LINK_NAME); goto error; } if (!link_exists) { H5_FAILED(); - HDprintf(" link did not exist\n"); + printf(" link did not exist\n"); goto error; } @@ -272,33 +272,33 @@ test_create_hard_link_long_name(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_HARD_LINKS)) { SKIPPED(); - HDprintf(" API functions for basic file, group, link, or hard link aren't supported with this " - "connector\n"); + printf(" API functions for basic file, group, link, or hard link aren't supported with this " + "connector\n"); return 0; } if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, HARD_LINK_TEST_GROUP_LONG_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container sub-group '%s'\n", HARD_LINK_TEST_GROUP_NAME); + printf(" couldn't create container sub-group '%s'\n", HARD_LINK_TEST_GROUP_NAME); goto error; } if (H5VLget_connector_name(file_id, vol_name, 5) < 0) { H5_FAILED(); - HDprintf(" couldn't get VOL connector name\n"); + printf(" couldn't get VOL connector name\n"); goto error; } @@ -307,7 +307,7 @@ test_create_hard_link_long_name(void) name_len = 99; /* Construct very long file name */ - if ((objname = (char *)HDmalloc((size_t)(name_len + 1))) == NULL) + if ((objname = (char *)malloc((size_t)(name_len + 1))) == NULL) TEST_ERROR; for (u = 0; u < name_len; u++) @@ -316,20 +316,20 @@ test_create_hard_link_long_name(void) if (H5Lcreate_hard(file_id, "/", group_id, objname, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create hard link with a long name\n"); + printf(" couldn't create hard link with a long name\n"); goto error; } /* Verify the link has been created */ if ((link_exists = H5Lexists(group_id, objname, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if the link with a long name exists\n"); + printf(" couldn't determine if the link with a long name exists\n"); goto error; } if (!link_exists) { H5_FAILED(); - HDprintf(" link did not exist\n"); + printf(" link did not exist\n"); goto error; } @@ -342,7 +342,7 @@ test_create_hard_link_long_name(void) /* Release memory */ if (objname) - HDfree(objname); + free(objname); PASSED(); @@ -358,7 +358,7 @@ error: H5E_END_TRY; if (objname) - HDfree(objname); + free(objname); return 1; } @@ -382,34 +382,34 @@ test_create_hard_link_many(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_HARD_LINKS)) { SKIPPED(); - HDprintf( + printf( " API functions for basic file, group, or hard link aren't supported with this connector\n"); return 0; } if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, HARD_LINK_TEST_GROUP_MANY_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container sub-group '%s'\n", HARD_LINK_TEST_GROUP_NAME); + printf(" couldn't create container sub-group '%s'\n", HARD_LINK_TEST_GROUP_NAME); goto error; } if ((group_id2 = H5Gcreate2(group_id, HARD_LINK_TEST_GROUP_MANY_FINAL_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container sub-group '%s'\n", HARD_LINK_TEST_GROUP_MANY_FINAL_NAME); + printf(" couldn't create container sub-group '%s'\n", HARD_LINK_TEST_GROUP_MANY_FINAL_NAME); goto error; } @@ -460,13 +460,13 @@ test_create_hard_link_many(void) /* Verify the link has been created */ if ((link_exists = H5Lexists(group_id, "hard21", H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if link 'hard21' exists\n"); + printf(" couldn't determine if link 'hard21' exists\n"); goto error; } if (!link_exists) { H5_FAILED(); - HDprintf(" link 'hard21' did not exist\n"); + printf(" link 'hard21' did not exist\n"); goto error; } @@ -482,39 +482,39 @@ test_create_hard_link_many(void) /* Reopen the file and group and verify the hard link */ if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gopen2(container_group, HARD_LINK_TEST_GROUP_MANY_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container sub-group '%s'\n", HARD_LINK_TEST_GROUP_NAME); + printf(" couldn't open container sub-group '%s'\n", HARD_LINK_TEST_GROUP_NAME); goto error; } /* Open the object through last hard link */ if ((group_id2 = H5Gopen2(group_id, "hard21", H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open the group '%s' with the last hard link 'hard21'\n", - HARD_LINK_TEST_GROUP_MANY_FINAL_NAME); + printf(" couldn't open the group '%s' with the last hard link 'hard21'\n", + HARD_LINK_TEST_GROUP_MANY_FINAL_NAME); goto error; } /* Check name */ if (H5Iget_name(group_id2, objname, (size_t)HARD_LINK_TEST_GROUP_MANY_NAME_BUF_SIZE) < 0) { H5_FAILED(); - HDprintf(" couldn't get the name of the object '%s'\n", HARD_LINK_TEST_GROUP_MANY_FINAL_NAME); + printf(" couldn't get the name of the object '%s'\n", HARD_LINK_TEST_GROUP_MANY_FINAL_NAME); goto error; } if (HDstrcmp(objname, "/" LINK_TEST_GROUP_NAME "/" HARD_LINK_TEST_GROUP_MANY_NAME "/hard21")) { H5_FAILED(); - HDprintf(" wrong name of the object '%s'\n", objname); + printf(" wrong name of the object '%s'\n", objname); goto error; } @@ -561,8 +561,8 @@ test_create_hard_link_same_loc(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_HARD_LINKS)) { SKIPPED(); - HDprintf(" API functions for basic file, group, link, or hard link aren't supported with this " - "connector\n"); + printf(" API functions for basic file, group, link, or hard link aren't supported with this " + "connector\n"); return 0; } @@ -570,20 +570,20 @@ test_create_hard_link_same_loc(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, H5L_SAME_LOC_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create group '%s'\n", H5L_SAME_LOC_TEST_GROUP_NAME); + printf(" couldn't create group '%s'\n", H5L_SAME_LOC_TEST_GROUP_NAME); goto error; } @@ -599,20 +599,20 @@ test_create_hard_link_same_loc(void) if (H5Lcreate_hard(H5L_SAME_LOC, ".", group_id, H5L_SAME_LOC_TEST_LINK_NAME1, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create first link '%s'\n", H5L_SAME_LOC_TEST_LINK_NAME1); + printf(" couldn't create first link '%s'\n", H5L_SAME_LOC_TEST_LINK_NAME1); PART_ERROR(H5L_SAME_LOC_first_param); } /* Verify the link has been created */ if ((link_exists = H5Lexists(group_id, H5L_SAME_LOC_TEST_LINK_NAME1, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if link exists\n"); + printf(" couldn't determine if link exists\n"); PART_ERROR(H5L_SAME_LOC_first_param); } if (!link_exists) { H5_FAILED(); - HDprintf(" link did not exist\n"); + printf(" link did not exist\n"); PART_ERROR(H5L_SAME_LOC_first_param); } @@ -627,20 +627,20 @@ test_create_hard_link_same_loc(void) if (H5Lcreate_hard(group_id, ".", H5L_SAME_LOC, H5L_SAME_LOC_TEST_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create second link '%s'\n", H5L_SAME_LOC_TEST_LINK_NAME2); + printf(" couldn't create second link '%s'\n", H5L_SAME_LOC_TEST_LINK_NAME2); PART_ERROR(H5L_SAME_LOC_third_param); } /* Verify the link has been created */ if ((link_exists = H5Lexists(group_id, H5L_SAME_LOC_TEST_LINK_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if link '%s' exists\n", H5L_SAME_LOC_TEST_LINK_NAME2); + printf(" couldn't determine if link '%s' exists\n", H5L_SAME_LOC_TEST_LINK_NAME2); PART_ERROR(H5L_SAME_LOC_third_param); } if (!link_exists) { H5_FAILED(); - HDprintf(" link did not exist\n"); + printf(" link did not exist\n"); PART_ERROR(H5L_SAME_LOC_third_param); } @@ -695,8 +695,8 @@ test_create_hard_link_invalid_params(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_HARD_LINKS)) { SKIPPED(); - HDprintf(" API functions for basic file, group, link, or hard link aren't supported with this " - "connector\n"); + printf(" API functions for basic file, group, link, or hard link aren't supported with this " + "connector\n"); return 0; } @@ -704,20 +704,20 @@ test_create_hard_link_invalid_params(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, HARD_LINK_INVALID_PARAMS_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container sub-group '%s'\n", HARD_LINK_INVALID_PARAMS_TEST_GROUP_NAME); + printf(" couldn't create container sub-group '%s'\n", HARD_LINK_INVALID_PARAMS_TEST_GROUP_NAME); goto error; } @@ -738,7 +738,7 @@ test_create_hard_link_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" created hard link with an invalid cur_loc_id!\n"); + printf(" created hard link with an invalid cur_loc_id!\n"); PART_ERROR(H5Lcreate_hard_invalid_cur_loc_id); } @@ -759,7 +759,7 @@ test_create_hard_link_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" created hard link with a NULL cur_name!\n"); + printf(" created hard link with a NULL cur_name!\n"); PART_ERROR(H5Lcreate_hard_invalid_cur_name); } @@ -772,7 +772,7 @@ test_create_hard_link_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" created hard link with an invalid cur_name of ''!\n"); + printf(" created hard link with an invalid cur_name of ''!\n"); PART_ERROR(H5Lcreate_hard_invalid_cur_name); } @@ -793,7 +793,7 @@ test_create_hard_link_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" created hard link with an invalid new_loc_id!\n"); + printf(" created hard link with an invalid new_loc_id!\n"); PART_ERROR(H5Lcreate_hard_invalid_new_loc_id); } @@ -813,7 +813,7 @@ test_create_hard_link_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" created hard link with a NULL new_name!\n"); + printf(" created hard link with a NULL new_name!\n"); PART_ERROR(H5Lcreate_hard_invalid_new_name); } @@ -825,7 +825,7 @@ test_create_hard_link_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" created hard link with an invalid new_name of ''!\n"); + printf(" created hard link with an invalid new_name of ''!\n"); PART_ERROR(H5Lcreate_hard_invalid_new_name); } @@ -846,7 +846,7 @@ test_create_hard_link_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" created hard link with an invalid LCPL!\n"); + printf(" created hard link with an invalid LCPL!\n"); PART_ERROR(H5Lcreate_hard_invalid_lcpl); } @@ -867,7 +867,7 @@ test_create_hard_link_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" created hard link with an invalid LAPL!\n"); + printf(" created hard link with an invalid LAPL!\n"); PART_ERROR(H5Lcreate_hard_invalid_lapl); } @@ -888,7 +888,7 @@ test_create_hard_link_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" created hard link with the invalid same location!\n"); + printf(" created hard link with the invalid same location!\n"); PART_ERROR(H5Lcreate_hard_invalid_same_loc); } @@ -905,7 +905,7 @@ test_create_hard_link_invalid_params(void) if ((ext_file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); + printf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); PART_ERROR(H5Lcreate_hard_across_files); } @@ -918,7 +918,7 @@ test_create_hard_link_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" created hard link across files!\n"); + printf(" created hard link across files!\n"); PART_ERROR(H5Lcreate_hard_across_files); } @@ -931,7 +931,7 @@ test_create_hard_link_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" created hard link across files!\n"); + printf(" created hard link across files!\n"); PART_ERROR(H5Lcreate_hard_across_files); } @@ -947,14 +947,14 @@ test_create_hard_link_invalid_params(void) if ((link_exists = H5Lexists(group_id, HARD_LINK_INVALID_PARAMS_TEST_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if link '%s' exists\n", - HARD_LINK_INVALID_PARAMS_TEST_LINK_NAME); + printf(" couldn't determine if link '%s' exists\n", + HARD_LINK_INVALID_PARAMS_TEST_LINK_NAME); PART_ERROR(H5Lcreate_hard_invalid_existence); } if (link_exists) { H5_FAILED(); - HDprintf(" link existed!\n"); + printf(" link existed!\n"); PART_ERROR(H5Lcreate_hard_invalid_existence); } @@ -1010,36 +1010,36 @@ test_create_soft_link_existing_relative(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_SOFT_LINKS)) { SKIPPED(); - HDprintf(" API functions for basic file, group, link, or soft link aren't supported with this " - "connector\n"); + printf(" API functions for basic file, group, link, or soft link aren't supported with this " + "connector\n"); return 0; } if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, SOFT_LINK_EXISTING_RELATIVE_TEST_SUBGROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container subgroup '%s'\n", - SOFT_LINK_EXISTING_RELATIVE_TEST_SUBGROUP_NAME); + printf(" couldn't create container subgroup '%s'\n", + SOFT_LINK_EXISTING_RELATIVE_TEST_SUBGROUP_NAME); goto error; } if ((object_id = H5Gcreate2(group_id, SOFT_LINK_EXISTING_RELATIVE_TEST_OBJECT_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" failed to create object '%s' for soft link's target\n", - SOFT_LINK_EXISTING_RELATIVE_TEST_OBJECT_NAME); + printf(" failed to create object '%s' for soft link's target\n", + SOFT_LINK_EXISTING_RELATIVE_TEST_OBJECT_NAME); goto error; } @@ -1049,27 +1049,27 @@ test_create_soft_link_existing_relative(void) if (H5Lcreate_soft(SOFT_LINK_EXISTING_RELATIVE_TEST_OBJECT_NAME, group_id, SOFT_LINK_EXISTING_RELATIVE_TEST_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create soft link '%s'\n", SOFT_LINK_EXISTING_RELATIVE_TEST_LINK_NAME); + printf(" couldn't create soft link '%s'\n", SOFT_LINK_EXISTING_RELATIVE_TEST_LINK_NAME); goto error; } /* Verify the link has been created */ if ((link_exists = H5Lexists(group_id, SOFT_LINK_EXISTING_RELATIVE_TEST_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if link '%s' exists\n", SOFT_LINK_EXISTING_RELATIVE_TEST_LINK_NAME); + printf(" couldn't determine if link '%s' exists\n", SOFT_LINK_EXISTING_RELATIVE_TEST_LINK_NAME); goto error; } if (!link_exists) { H5_FAILED(); - HDprintf(" link did not exist\n"); + printf(" link did not exist\n"); goto error; } if ((object_id = H5Gopen2(group_id, SOFT_LINK_EXISTING_RELATIVE_TEST_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open object '%s' through the soft link\n", - SOFT_LINK_EXISTING_RELATIVE_TEST_OBJECT_NAME); + printf(" couldn't open object '%s' through the soft link\n", + SOFT_LINK_EXISTING_RELATIVE_TEST_OBJECT_NAME); goto error; } @@ -1116,55 +1116,55 @@ test_create_soft_link_existing_absolute(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_SOFT_LINKS)) { SKIPPED(); - HDprintf(" API functions for basic file, group, link, or soft link aren't supported with this " - "connector\n"); + printf(" API functions for basic file, group, link, or soft link aren't supported with this " + "connector\n"); return 0; } if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, SOFT_LINK_EXISTING_ABSOLUTE_TEST_SUBGROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container subgroup '%s'\n", - SOFT_LINK_EXISTING_ABSOLUTE_TEST_SUBGROUP_NAME); + printf(" couldn't create container subgroup '%s'\n", + SOFT_LINK_EXISTING_ABSOLUTE_TEST_SUBGROUP_NAME); goto error; } if (H5Lcreate_soft("/", group_id, SOFT_LINK_EXISTING_ABSOLUTE_TEST_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create soft link '%s'\n", SOFT_LINK_EXISTING_ABSOLUTE_TEST_LINK_NAME); + printf(" couldn't create soft link '%s'\n", SOFT_LINK_EXISTING_ABSOLUTE_TEST_LINK_NAME); goto error; } /* Verify the link has been created */ if ((link_exists = H5Lexists(group_id, SOFT_LINK_EXISTING_ABSOLUTE_TEST_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if link '%s' exists\n", SOFT_LINK_EXISTING_ABSOLUTE_TEST_LINK_NAME); + printf(" couldn't determine if link '%s' exists\n", SOFT_LINK_EXISTING_ABSOLUTE_TEST_LINK_NAME); goto error; } if (!link_exists) { H5_FAILED(); - HDprintf(" link did not exist\n"); + printf(" link did not exist\n"); goto error; } if ((root_id = H5Gopen2(group_id, SOFT_LINK_EXISTING_ABSOLUTE_TEST_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open object pointed to by soft link '%s'\n", - SOFT_LINK_EXISTING_ABSOLUTE_TEST_LINK_NAME); + printf(" couldn't open object pointed to by soft link '%s'\n", + SOFT_LINK_EXISTING_ABSOLUTE_TEST_LINK_NAME); goto error; } @@ -1213,48 +1213,48 @@ test_create_soft_link_dangling_relative(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_SOFT_LINKS)) { SKIPPED(); - HDprintf(" API functions for basic file, group, link, or soft link aren't supported with this " - "connector\n"); + printf(" API functions for basic file, group, link, or soft link aren't supported with this " + "connector\n"); return 0; } if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, SOFT_LINK_DANGLING_RELATIVE_TEST_SUBGROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container subgroup '%s'\n", - SOFT_LINK_DANGLING_RELATIVE_TEST_SUBGROUP_NAME); + printf(" couldn't create container subgroup '%s'\n", + SOFT_LINK_DANGLING_RELATIVE_TEST_SUBGROUP_NAME); goto error; } if (H5Lcreate_soft(SOFT_LINK_DANGLING_RELATIVE_TEST_OBJECT_NAME, group_id, SOFT_LINK_DANGLING_RELATIVE_TEST_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create soft link '%s'\n", SOFT_LINK_DANGLING_RELATIVE_TEST_LINK_NAME); + printf(" couldn't create soft link '%s'\n", SOFT_LINK_DANGLING_RELATIVE_TEST_LINK_NAME); goto error; } /* Verify the link has been created */ if ((link_exists = H5Lexists(group_id, SOFT_LINK_DANGLING_RELATIVE_TEST_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if link '%s' exists\n", SOFT_LINK_DANGLING_RELATIVE_TEST_LINK_NAME); + printf(" couldn't determine if link '%s' exists\n", SOFT_LINK_DANGLING_RELATIVE_TEST_LINK_NAME); goto error; } if (!link_exists) { H5_FAILED(); - HDprintf(" link did not exist\n"); + printf(" link did not exist\n"); goto error; } @@ -1266,7 +1266,7 @@ test_create_soft_link_dangling_relative(void) if (object_id >= 0) { H5_FAILED(); - HDprintf(" opened target of dangling link '%s'!\n", SOFT_LINK_DANGLING_RELATIVE_TEST_LINK_NAME); + printf(" opened target of dangling link '%s'!\n", SOFT_LINK_DANGLING_RELATIVE_TEST_LINK_NAME); H5Gclose(object_id); goto error; } @@ -1274,8 +1274,8 @@ test_create_soft_link_dangling_relative(void) if ((object_id = H5Gcreate2(group_id, SOFT_LINK_DANGLING_RELATIVE_TEST_OBJECT_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" failed to create object '%s' for soft link's target\n", - SOFT_LINK_DANGLING_RELATIVE_TEST_OBJECT_NAME); + printf(" failed to create object '%s' for soft link's target\n", + SOFT_LINK_DANGLING_RELATIVE_TEST_OBJECT_NAME); goto error; } @@ -1284,8 +1284,8 @@ test_create_soft_link_dangling_relative(void) if ((object_id = H5Gopen2(group_id, SOFT_LINK_DANGLING_RELATIVE_TEST_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" failed to open object pointed to by soft link '%s'\n", - SOFT_LINK_DANGLING_RELATIVE_TEST_LINK_NAME); + printf(" failed to open object pointed to by soft link '%s'\n", + SOFT_LINK_DANGLING_RELATIVE_TEST_LINK_NAME); goto error; } @@ -1334,28 +1334,28 @@ test_create_soft_link_dangling_absolute(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_SOFT_LINKS)) { SKIPPED(); - HDprintf(" API functions for basic file, group, link, or soft link aren't supported with this " - "connector\n"); + printf(" API functions for basic file, group, link, or soft link aren't supported with this " + "connector\n"); return 0; } if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, SOFT_LINK_DANGLING_ABSOLUTE_TEST_SUBGROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container subgroup '%s'\n", - SOFT_LINK_DANGLING_ABSOLUTE_TEST_SUBGROUP_NAME); + printf(" couldn't create container subgroup '%s'\n", + SOFT_LINK_DANGLING_ABSOLUTE_TEST_SUBGROUP_NAME); goto error; } @@ -1363,20 +1363,20 @@ test_create_soft_link_dangling_absolute(void) "/" SOFT_LINK_DANGLING_ABSOLUTE_TEST_OBJECT_NAME, group_id, SOFT_LINK_DANGLING_ABSOLUTE_TEST_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create soft link '%s'\n", SOFT_LINK_DANGLING_ABSOLUTE_TEST_LINK_NAME); + printf(" couldn't create soft link '%s'\n", SOFT_LINK_DANGLING_ABSOLUTE_TEST_LINK_NAME); goto error; } /* Verify the link has been created */ if ((link_exists = H5Lexists(group_id, SOFT_LINK_DANGLING_ABSOLUTE_TEST_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if link '%s' exists\n", SOFT_LINK_DANGLING_ABSOLUTE_TEST_LINK_NAME); + printf(" couldn't determine if link '%s' exists\n", SOFT_LINK_DANGLING_ABSOLUTE_TEST_LINK_NAME); goto error; } if (!link_exists) { H5_FAILED(); - HDprintf(" link did not exist\n"); + printf(" link did not exist\n"); goto error; } @@ -1388,7 +1388,7 @@ test_create_soft_link_dangling_absolute(void) if (object_id >= 0) { H5_FAILED(); - HDprintf(" opened target of dangling link '%s'!\n", SOFT_LINK_DANGLING_ABSOLUTE_TEST_LINK_NAME); + printf(" opened target of dangling link '%s'!\n", SOFT_LINK_DANGLING_ABSOLUTE_TEST_LINK_NAME); H5Gclose(object_id); goto error; } @@ -1396,8 +1396,8 @@ test_create_soft_link_dangling_absolute(void) if ((object_id = H5Gcreate2(group_id, SOFT_LINK_DANGLING_ABSOLUTE_TEST_OBJECT_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" failed to create object '%s' for soft link's target\n", - SOFT_LINK_DANGLING_ABSOLUTE_TEST_OBJECT_NAME); + printf(" failed to create object '%s' for soft link's target\n", + SOFT_LINK_DANGLING_ABSOLUTE_TEST_OBJECT_NAME); goto error; } @@ -1406,8 +1406,8 @@ test_create_soft_link_dangling_absolute(void) if ((object_id = H5Gopen2(group_id, SOFT_LINK_DANGLING_ABSOLUTE_TEST_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" failed to open object pointed to by soft link '%s'\n", - SOFT_LINK_DANGLING_ABSOLUTE_TEST_LINK_NAME); + printf(" failed to open object pointed to by soft link '%s'\n", + SOFT_LINK_DANGLING_ABSOLUTE_TEST_LINK_NAME); goto error; } @@ -1458,33 +1458,33 @@ test_create_soft_link_long_name(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_SOFT_LINKS)) { SKIPPED(); - HDprintf(" API functions for basic file, group, link, or soft link aren't supported with this " - "connector\n"); + printf(" API functions for basic file, group, link, or soft link aren't supported with this " + "connector\n"); return 0; } if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, SOFT_LINK_TEST_GROUP_LONG_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container sub-group '%s'\n", SOFT_LINK_TEST_GROUP_LONG_NAME); + printf(" couldn't create container sub-group '%s'\n", SOFT_LINK_TEST_GROUP_LONG_NAME); goto error; } if (H5VLget_connector_name(file_id, vol_name, 5) < 0) { H5_FAILED(); - HDprintf(" couldn't get VOL connector name\n"); + printf(" couldn't get VOL connector name\n"); goto error; } @@ -1493,7 +1493,7 @@ test_create_soft_link_long_name(void) name_len = 99; /* Construct very long file name */ - if ((objname = (char *)HDmalloc((size_t)(name_len + 1))) == NULL) + if ((objname = (char *)malloc((size_t)(name_len + 1))) == NULL) TEST_ERROR; for (u = 0; u < name_len; u++) @@ -1502,20 +1502,20 @@ test_create_soft_link_long_name(void) if (H5Lcreate_soft(SOFT_LINK_TEST_LONG_OBJECT_NAME, group_id, objname, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create soft link with a long name\n"); + printf(" couldn't create soft link with a long name\n"); goto error; } /* Verify the link has been created */ if ((link_exists = H5Lexists(group_id, objname, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if the link with a long name exists\n"); + printf(" couldn't determine if the link with a long name exists\n"); goto error; } if (!link_exists) { H5_FAILED(); - HDprintf(" link did not exist\n"); + printf(" link did not exist\n"); goto error; } @@ -1528,7 +1528,7 @@ test_create_soft_link_long_name(void) /* Release memory */ if (objname) - HDfree(objname); + free(objname); PASSED(); @@ -1544,7 +1544,7 @@ error: H5E_END_TRY; if (objname) - HDfree(objname); + free(objname); return 1; } @@ -1569,27 +1569,27 @@ test_create_soft_link_many(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_SOFT_LINKS)) { SKIPPED(); - HDprintf(" API functions for basic file, group, link, or soft link aren't supported with this " - "connector\n"); + printf(" API functions for basic file, group, link, or soft link aren't supported with this " + "connector\n"); return 0; } if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, SOFT_LINK_TEST_GROUP_MANY_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container sub-group '%s'\n", SOFT_LINK_TEST_GROUP_MANY_NAME); + printf(" couldn't create container sub-group '%s'\n", SOFT_LINK_TEST_GROUP_MANY_NAME); goto error; } @@ -1631,13 +1631,13 @@ test_create_soft_link_many(void) /* Verify the link has been created */ if ((link_exists = H5Lexists(group_id, "soft16", H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if link 'soft16' exists\n"); + printf(" couldn't determine if link 'soft16' exists\n"); goto error; } if (!link_exists) { H5_FAILED(); - HDprintf(" link 'soft16' did not exist\n"); + printf(" link 'soft16' did not exist\n"); goto error; } @@ -1651,19 +1651,19 @@ test_create_soft_link_many(void) /* Reopen the file and group and verify the hard link */ if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gopen2(container_group, SOFT_LINK_TEST_GROUP_MANY_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container sub-group '%s'\n", SOFT_LINK_TEST_GROUP_MANY_NAME); + printf(" couldn't open container sub-group '%s'\n", SOFT_LINK_TEST_GROUP_MANY_NAME); goto error; } @@ -1679,7 +1679,7 @@ test_create_soft_link_many(void) if (object_id >= 0) { H5_FAILED(); - HDprintf(" opened target of dangling soft link '%s'!\n", SOFT_LINK_TEST_GROUP_MANY_NAME); + printf(" opened target of dangling soft link '%s'!\n", SOFT_LINK_TEST_GROUP_MANY_NAME); H5Gclose(object_id); goto error; } @@ -1687,7 +1687,7 @@ test_create_soft_link_many(void) if ((object_id = H5Gcreate2(group_id, SOFT_LINK_TEST_GROUP_MANY_FINAL_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" failed to create object '%s' for soft link's target\n", SOFT_LINK_TEST_GROUP_MANY_NAME); + printf(" failed to create object '%s' for soft link's target\n", SOFT_LINK_TEST_GROUP_MANY_NAME); goto error; } @@ -1700,19 +1700,19 @@ test_create_soft_link_many(void) */ if ((object_id = H5Gopen2(group_id, "soft16", H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" failed to open object pointed to by soft link '%s'\n", SOFT_LINK_TEST_GROUP_MANY_NAME); + printf(" failed to open object pointed to by soft link '%s'\n", SOFT_LINK_TEST_GROUP_MANY_NAME); goto error; } /* Check name */ if (H5Iget_name(object_id, objname, (size_t)SOFT_LINK_TEST_GROUP_MANY_NAME_BUF_SIZE) < 0) { H5_FAILED(); - HDprintf(" couldn't get the name of the object 'soft16'\n"); + printf(" couldn't get the name of the object 'soft16'\n"); goto error; } if (HDstrcmp(objname, "/" LINK_TEST_GROUP_NAME "/" SOFT_LINK_TEST_GROUP_MANY_NAME "/soft16")) { H5_FAILED(); - HDprintf(" wrong name of the object '%s'\n", objname); + printf(" wrong name of the object '%s'\n", objname); goto error; } @@ -1760,7 +1760,7 @@ test_create_soft_link_invalid_params(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_SOFT_LINKS)) { SKIPPED(); - HDprintf( + printf( " API functions for basic file, group, or soft link aren't supported with this connector\n"); return 0; } @@ -1769,20 +1769,20 @@ test_create_soft_link_invalid_params(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, SOFT_LINK_INVALID_PARAMS_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container sub-group '%s'\n", SOFT_LINK_INVALID_PARAMS_TEST_GROUP_NAME); + printf(" couldn't create container sub-group '%s'\n", SOFT_LINK_INVALID_PARAMS_TEST_GROUP_NAME); goto error; } @@ -1803,8 +1803,8 @@ test_create_soft_link_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" created soft link '%s' with an invalid link target!\n", - SOFT_LINK_INVALID_PARAMS_TEST_LINK_NAME); + printf(" created soft link '%s' with an invalid link target!\n", + SOFT_LINK_INVALID_PARAMS_TEST_LINK_NAME); PART_ERROR(H5Lcreate_soft_invalid_link_target); } @@ -1817,8 +1817,8 @@ test_create_soft_link_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" created soft link '%s' with an invalid link target!\n", - SOFT_LINK_INVALID_PARAMS_TEST_LINK_NAME); + printf(" created soft link '%s' with an invalid link target!\n", + SOFT_LINK_INVALID_PARAMS_TEST_LINK_NAME); PART_ERROR(H5Lcreate_soft_invalid_link_target); } @@ -1839,8 +1839,8 @@ test_create_soft_link_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" created soft link '%s' with an invalid link_loc_id!\n", - SOFT_LINK_INVALID_PARAMS_TEST_LINK_NAME); + printf(" created soft link '%s' with an invalid link_loc_id!\n", + SOFT_LINK_INVALID_PARAMS_TEST_LINK_NAME); PART_ERROR(H5Lcreate_soft_invalid_link_loc_id); } @@ -1860,8 +1860,8 @@ test_create_soft_link_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" created soft link '%s' with a NULL link name!\n", - SOFT_LINK_INVALID_PARAMS_TEST_LINK_NAME); + printf(" created soft link '%s' with a NULL link name!\n", + SOFT_LINK_INVALID_PARAMS_TEST_LINK_NAME); PART_ERROR(H5Lcreate_soft_invalid_link_name); } @@ -1873,8 +1873,8 @@ test_create_soft_link_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" created soft link '%s' with an invalid link name of ''!\n", - SOFT_LINK_INVALID_PARAMS_TEST_LINK_NAME); + printf(" created soft link '%s' with an invalid link name of ''!\n", + SOFT_LINK_INVALID_PARAMS_TEST_LINK_NAME); PART_ERROR(H5Lcreate_soft_invalid_link_name); } @@ -1895,8 +1895,8 @@ test_create_soft_link_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" created soft link '%s' with an invalid LCPL!\n", - SOFT_LINK_INVALID_PARAMS_TEST_LINK_NAME); + printf(" created soft link '%s' with an invalid LCPL!\n", + SOFT_LINK_INVALID_PARAMS_TEST_LINK_NAME); PART_ERROR(H5Lcreate_soft_invalid_lcpl); } @@ -1917,8 +1917,8 @@ test_create_soft_link_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" created soft link '%s' with an invalid LAPL!\n", - SOFT_LINK_INVALID_PARAMS_TEST_LINK_NAME); + printf(" created soft link '%s' with an invalid LAPL!\n", + SOFT_LINK_INVALID_PARAMS_TEST_LINK_NAME); PART_ERROR(H5Lcreate_soft_invalid_lapl); } @@ -1934,14 +1934,14 @@ test_create_soft_link_invalid_params(void) if ((link_exists = H5Lexists(group_id, SOFT_LINK_INVALID_PARAMS_TEST_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if link '%s' exists\n", - SOFT_LINK_INVALID_PARAMS_TEST_LINK_NAME); + printf(" couldn't determine if link '%s' exists\n", + SOFT_LINK_INVALID_PARAMS_TEST_LINK_NAME); PART_ERROR(H5Lcreate_soft_invalid_existence); } if (link_exists) { H5_FAILED(); - HDprintf(" link '%s' existed!\n", SOFT_LINK_INVALID_PARAMS_TEST_LINK_NAME); + printf(" link '%s' existed!\n", SOFT_LINK_INVALID_PARAMS_TEST_LINK_NAME); PART_ERROR(H5Lcreate_soft_invalid_existence); } @@ -1995,8 +1995,8 @@ test_create_external_link(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_EXTERNAL_LINKS)) { SKIPPED(); - HDprintf(" API functions for basic file, group, link, or external link aren't supported " - "with this connector\n"); + printf(" API functions for basic file, group, link, or external link aren't supported " + "with this connector\n"); return 0; } @@ -2004,7 +2004,7 @@ test_create_external_link(void) if ((file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); + printf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); goto error; } @@ -2013,47 +2013,47 @@ test_create_external_link(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, EXTERNAL_LINK_TEST_SUBGROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container subgroup '%s'\n", EXTERNAL_LINK_TEST_SUBGROUP_NAME); + printf(" couldn't create container subgroup '%s'\n", EXTERNAL_LINK_TEST_SUBGROUP_NAME); goto error; } if (H5Lcreate_external(ext_link_filename, "/", group_id, EXTERNAL_LINK_TEST_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create external link '%s'\n", EXTERNAL_LINK_TEST_LINK_NAME); + printf(" couldn't create external link '%s'\n", EXTERNAL_LINK_TEST_LINK_NAME); goto error; } /* Verify the link has been created */ if ((link_exists = H5Lexists(group_id, EXTERNAL_LINK_TEST_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if link '%s' exists\n", EXTERNAL_LINK_TEST_LINK_NAME); + printf(" couldn't determine if link '%s' exists\n", EXTERNAL_LINK_TEST_LINK_NAME); goto error; } if (!link_exists) { H5_FAILED(); - HDprintf(" link did not exist\n"); + printf(" link did not exist\n"); goto error; } if ((root_id = H5Gopen2(group_id, EXTERNAL_LINK_TEST_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open root group of other file using external link '%s'\n", - EXTERNAL_LINK_TEST_LINK_NAME); + printf(" couldn't open root group of other file using external link '%s'\n", + EXTERNAL_LINK_TEST_LINK_NAME); goto error; } @@ -2103,8 +2103,8 @@ test_create_external_link_dangling(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_EXTERNAL_LINKS)) { SKIPPED(); - HDprintf(" API functions for basic file, group, link, or external link aren't supported " - "with this connector\n"); + printf(" API functions for basic file, group, link, or external link aren't supported " + "with this connector\n"); return 0; } @@ -2112,46 +2112,46 @@ test_create_external_link_dangling(void) if ((ext_file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); + printf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); goto error; } if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, EXTERNAL_LINK_TEST_DANGLING_SUBGROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container subgroup '%s'\n", EXTERNAL_LINK_TEST_DANGLING_SUBGROUP_NAME); + printf(" couldn't create container subgroup '%s'\n", EXTERNAL_LINK_TEST_DANGLING_SUBGROUP_NAME); goto error; } if (H5Lcreate_external(ext_link_filename, "/" EXTERNAL_LINK_TEST_DANGLING_OBJECT_NAME, group_id, EXTERNAL_LINK_TEST_DANGLING_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create dangling external link '%s'\n", EXTERNAL_LINK_TEST_DANGLING_LINK_NAME); + printf(" couldn't create dangling external link '%s'\n", EXTERNAL_LINK_TEST_DANGLING_LINK_NAME); goto error; } /* Verify the link has been created */ if ((link_exists = H5Lexists(group_id, EXTERNAL_LINK_TEST_DANGLING_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if link '%s' exists\n", EXTERNAL_LINK_TEST_DANGLING_LINK_NAME); + printf(" couldn't determine if link '%s' exists\n", EXTERNAL_LINK_TEST_DANGLING_LINK_NAME); goto error; } if (!link_exists) { H5_FAILED(); - HDprintf(" link did not exist\n"); + printf(" link did not exist\n"); goto error; } @@ -2163,8 +2163,8 @@ test_create_external_link_dangling(void) if (object_id >= 0) { H5_FAILED(); - HDprintf(" opened non-existent object in other file using dangling external link '%s'!\n", - EXTERNAL_LINK_TEST_DANGLING_LINK_NAME); + printf(" opened non-existent object in other file using dangling external link '%s'!\n", + EXTERNAL_LINK_TEST_DANGLING_LINK_NAME); H5Gclose(object_id); goto error; } @@ -2172,8 +2172,8 @@ test_create_external_link_dangling(void) if ((object_id = H5Gcreate2(ext_file_id, EXTERNAL_LINK_TEST_DANGLING_OBJECT_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" failed to create object '%s' for external link's target\n", - EXTERNAL_LINK_TEST_DANGLING_OBJECT_NAME); + printf(" failed to create object '%s' for external link's target\n", + EXTERNAL_LINK_TEST_DANGLING_OBJECT_NAME); goto error; } @@ -2182,8 +2182,8 @@ test_create_external_link_dangling(void) if ((object_id = H5Gopen2(group_id, EXTERNAL_LINK_TEST_DANGLING_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" failed to open object pointed to by external link '%s'\n", - EXTERNAL_LINK_TEST_DANGLING_LINK_NAME); + printf(" failed to open object pointed to by external link '%s'\n", + EXTERNAL_LINK_TEST_DANGLING_LINK_NAME); goto error; } @@ -2238,8 +2238,8 @@ test_create_external_link_multi(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_EXTERNAL_LINKS)) { SKIPPED(); - HDprintf(" API functions for basic file, group, or external link aren't supported with this " - "connector\n"); + printf(" API functions for basic file, group, or external link aren't supported with this " + "connector\n"); return 0; } @@ -2254,52 +2254,51 @@ test_create_external_link_multi(void) if ((file_id = H5Fcreate(ext_link_filename1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create file '%s' for external link to reference\n", - ext_link_filename1); + printf(" couldn't create file '%s' for external link to reference\n", ext_link_filename1); PART_ERROR(H5Lcreate_external_first_file); } /* Create object down a path */ if ((group_id = H5Gcreate2(file_id, "A", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create a group\n"); + printf(" couldn't create a group\n"); PART_ERROR(H5Lcreate_external_first_file); } if (H5Gclose(group_id) < 0) { H5_FAILED(); - HDprintf(" couldn't close a group\n"); + printf(" couldn't close a group\n"); PART_ERROR(H5Lcreate_external_first_file); } if ((group_id = H5Gcreate2(file_id, "A/B", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create a group\n"); + printf(" couldn't create a group\n"); PART_ERROR(H5Lcreate_external_first_file); } if (H5Gclose(group_id) < 0) { H5_FAILED(); - HDprintf(" couldn't close a group\n"); + printf(" couldn't close a group\n"); PART_ERROR(H5Lcreate_external_first_file); } if ((group_id = H5Gcreate2(file_id, "A/B/C", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create a group\n"); + printf(" couldn't create a group\n"); PART_ERROR(H5Lcreate_external_first_file); } if (H5Gclose(group_id) < 0) { H5_FAILED(); - HDprintf(" couldn't close a group\n"); + printf(" couldn't close a group\n"); PART_ERROR(H5Lcreate_external_first_file); } /* Close file */ if (H5Fclose(file_id) < 0) { H5_FAILED(); - HDprintf(" couldn't close a group\n"); + printf(" couldn't close a group\n"); PART_ERROR(H5Lcreate_external_first_file); } @@ -2316,27 +2315,26 @@ test_create_external_link_multi(void) if ((file_id = H5Fcreate(ext_link_filename2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create file '%s' for external link to reference\n", - ext_link_filename2); + printf(" couldn't create file '%s' for external link to reference\n", ext_link_filename2); PART_ERROR(H5Lcreate_external_second_file); } /* Create object down a path */ if ((group_id = H5Gcreate2(file_id, "D", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create a group\n"); + printf(" couldn't create a group\n"); PART_ERROR(H5Lcreate_external_second_file); } if (H5Gclose(group_id) < 0) { H5_FAILED(); - HDprintf(" couldn't close a group\n"); + printf(" couldn't close a group\n"); PART_ERROR(H5Lcreate_external_second_file); } if ((group_id = H5Gcreate2(file_id, "D/E", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create a group\n"); + printf(" couldn't create a group\n"); PART_ERROR(H5Lcreate_external_second_file); } @@ -2344,20 +2342,20 @@ test_create_external_link_multi(void) if (H5Lcreate_external(ext_link_filename1, "/A/B/C", group_id, "F", H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create external link 'F'\n"); + printf(" couldn't create external link 'F'\n"); PART_ERROR(H5Lcreate_external_second_file); } if (H5Gclose(group_id) < 0) { H5_FAILED(); - HDprintf(" couldn't close a group\n"); + printf(" couldn't close a group\n"); PART_ERROR(H5Lcreate_external_second_file); } /* Close file */ if (H5Fclose(file_id) < 0) { H5_FAILED(); - HDprintf(" couldn't close a file\n"); + printf(" couldn't close a file\n"); PART_ERROR(H5Lcreate_external_second_file); } @@ -2374,27 +2372,26 @@ test_create_external_link_multi(void) if ((file_id = H5Fcreate(ext_link_filename3, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create file '%s' for external link to reference\n", - ext_link_filename3); + printf(" couldn't create file '%s' for external link to reference\n", ext_link_filename3); PART_ERROR(H5Lcreate_external_third_file); } /* Create object down a path */ if ((group_id = H5Gcreate2(file_id, "G", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create a group\n"); + printf(" couldn't create a group\n"); PART_ERROR(H5Lcreate_external_third_file); } if (H5Gclose(group_id) < 0) { H5_FAILED(); - HDprintf(" couldn't close a group\n"); + printf(" couldn't close a group\n"); PART_ERROR(H5Lcreate_external_third_file); } if ((group_id = H5Gcreate2(file_id, "G/H", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create a group\n"); + printf(" couldn't create a group\n"); PART_ERROR(H5Lcreate_external_third_file); } @@ -2402,20 +2399,20 @@ test_create_external_link_multi(void) if (H5Lcreate_external(ext_link_filename2, "/D/E/F", group_id, "I", H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create external link 'I'\n"); + printf(" couldn't create external link 'I'\n"); PART_ERROR(H5Lcreate_external_third_file); } if (H5Gclose(group_id) < 0) { H5_FAILED(); - HDprintf(" couldn't close a group\n"); + printf(" couldn't close a group\n"); PART_ERROR(H5Lcreate_external_third_file); } /* Close file */ if (H5Fclose(file_id) < 0) { H5_FAILED(); - HDprintf(" couldn't close a file\n"); + printf(" couldn't close a file\n"); PART_ERROR(H5Lcreate_external_third_file); } @@ -2429,84 +2426,84 @@ test_create_external_link_multi(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); PART_ERROR(H5Lcreate_external_final_file); } if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); PART_ERROR(H5Lcreate_external_final_file); } if ((group_id = H5Gcreate2(container_group, EXTERNAL_LINK_TEST_MULTI_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container subgroup '%s'\n", EXTERNAL_LINK_TEST_MULTI_NAME); + printf(" couldn't create container subgroup '%s'\n", EXTERNAL_LINK_TEST_MULTI_NAME); PART_ERROR(H5Lcreate_external_final_file); } if (H5Lcreate_external(ext_link_filename3, "/G/H/I", group_id, "ext_link", H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create external link 'ext_link'\n"); + printf(" couldn't create external link 'ext_link'\n"); PART_ERROR(H5Lcreate_external_final_file); } if ((group_id2 = H5Gopen2(group_id, "ext_link", H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open the group that is the external link\n"); + printf(" couldn't open the group that is the external link\n"); PART_ERROR(H5Lcreate_external_final_file); } /* Check name */ if (H5Iget_name(group_id2, objname, (size_t)EXTERNAL_LINK_TEST_MULTI_NAME_BUF_SIZE) < 0) { H5_FAILED(); - HDprintf(" couldn't get the name of the object '%s'\n", - HARD_LINK_TEST_GROUP_MANY_FINAL_NAME); + printf(" couldn't get the name of the object '%s'\n", + HARD_LINK_TEST_GROUP_MANY_FINAL_NAME); PART_ERROR(H5Lcreate_external_final_file); } if (HDstrcmp(objname, "/A/B/C")) { H5_FAILED(); - HDprintf(" wrong name of the object '%s'\n", objname); + printf(" wrong name of the object '%s'\n", objname); PART_ERROR(H5Lcreate_external_final_file); } /* Create an object in the external file */ if ((group_id3 = H5Gcreate2(group_id2, "new_group", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create a group 'new_group' in the external file\n"); + printf(" couldn't create a group 'new_group' in the external file\n"); PART_ERROR(H5Lcreate_external_final_file); } if (H5Gclose(group_id) < 0) { H5_FAILED(); - HDprintf(" couldn't close a group\n"); + printf(" couldn't close a group\n"); PART_ERROR(H5Lcreate_external_final_file); } if (H5Gclose(group_id2) < 0) { H5_FAILED(); - HDprintf(" couldn't close a group\n"); + printf(" couldn't close a group\n"); PART_ERROR(H5Lcreate_external_final_file); } if (H5Gclose(group_id3) < 0) { H5_FAILED(); - HDprintf(" couldn't close a group\n"); + printf(" couldn't close a group\n"); PART_ERROR(H5Lcreate_external_final_file); } if (H5Gclose(container_group) < 0) { H5_FAILED(); - HDprintf(" couldn't close a group\n"); + printf(" couldn't close a group\n"); PART_ERROR(H5Lcreate_external_final_file); } if (H5Fclose(file_id) < 0) { H5_FAILED(); - HDprintf(" couldn't close a file\n"); + printf(" couldn't close a file\n"); PART_ERROR(H5Lcreate_external_final_file); } @@ -2520,38 +2517,38 @@ test_create_external_link_multi(void) if ((file_id = H5Fopen(ext_link_filename1, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", ext_link_filename1); + printf(" couldn't open file '%s'\n", ext_link_filename1); PART_ERROR(H5Lcreate_external_object_created); } if ((group_id = H5Gopen2(file_id, "/A/B/C/new_group", H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open a group 'new_group' in the external file\n"); + printf(" couldn't open a group 'new_group' in the external file\n"); PART_ERROR(H5Lcreate_external_object_created); } /* Check name */ if (H5Iget_name(group_id, objname, (size_t)EXTERNAL_LINK_TEST_MULTI_NAME_BUF_SIZE) < 0) { H5_FAILED(); - HDprintf(" couldn't get the name of the object '/A/B/C/new_group'\n"); + printf(" couldn't get the name of the object '/A/B/C/new_group'\n"); PART_ERROR(H5Lcreate_external_object_created); } if (HDstrcmp(objname, "/A/B/C/new_group")) { H5_FAILED(); - HDprintf(" wrong name of the object '%s'\n", objname); + printf(" wrong name of the object '%s'\n", objname); PART_ERROR(H5Lcreate_external_object_created); } if (H5Gclose(group_id) < 0) { H5_FAILED(); - HDprintf(" couldn't close the group\n"); + printf(" couldn't close the group\n"); PART_ERROR(H5Lcreate_external_object_created); } if (H5Fclose(file_id) < 0) { H5_FAILED(); - HDprintf(" couldn't close the file\n"); + printf(" couldn't close the file\n"); PART_ERROR(H5Lcreate_external_object_created); } @@ -2605,8 +2602,8 @@ test_create_external_link_ping_pong(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_EXTERNAL_LINKS)) { SKIPPED(); - HDprintf(" API functions for basic file, group, or external link aren't supported with this " - "connector\n"); + printf(" API functions for basic file, group, or external link aren't supported with this " + "connector\n"); return 0; } @@ -2622,8 +2619,7 @@ test_create_external_link_ping_pong(void) /* Create the first file */ if ((file_id = H5Fcreate(ext_link_filename1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create file '%s' for external link to reference\n", - ext_link_filename1); + printf(" couldn't create file '%s' for external link to reference\n", ext_link_filename1); PART_ERROR(H5Lcreate_external_first_file); } @@ -2631,41 +2627,41 @@ test_create_external_link_ping_pong(void) if (H5Lcreate_external(ext_link_filename2, "/link2", file_id, "link1", H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create external link\n"); + printf(" couldn't create external link\n"); PART_ERROR(H5Lcreate_external_first_file); } if (H5Lcreate_external(ext_link_filename2, "/link4", file_id, "link3", H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create external link\n"); + printf(" couldn't create external link\n"); PART_ERROR(H5Lcreate_external_first_file); } if (H5Lcreate_external(ext_link_filename2, "/link6", file_id, "link5", H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create external link\n"); + printf(" couldn't create external link\n"); PART_ERROR(H5Lcreate_external_first_file); } /* Create final object */ if ((group_id = H5Gcreate2(file_id, "final", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create a group\n"); + printf(" couldn't create a group\n"); PART_ERROR(H5Lcreate_external_first_file); } if (H5Gclose(group_id) < 0) { H5_FAILED(); - HDprintf(" couldn't close a group\n"); + printf(" couldn't close a group\n"); PART_ERROR(H5Lcreate_external_first_file); } /* Close file */ if (H5Fclose(file_id) < 0) { H5_FAILED(); - HDprintf(" couldn't close a group\n"); + printf(" couldn't close a group\n"); PART_ERROR(H5Lcreate_external_first_file); } @@ -2680,7 +2676,7 @@ test_create_external_link_ping_pong(void) /* Create the second file */ if ((file_id = H5Fcreate(ext_link_filename2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create file '%s' for external link\n", ext_link_filename2); + printf(" couldn't create file '%s' for external link\n", ext_link_filename2); PART_ERROR(H5Lcreate_external_second_file); } @@ -2688,28 +2684,28 @@ test_create_external_link_ping_pong(void) if (H5Lcreate_external(ext_link_filename1, "/link3", file_id, "link2", H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create external link\n"); + printf(" couldn't create external link\n"); PART_ERROR(H5Lcreate_external_second_file); } if (H5Lcreate_external(ext_link_filename1, "/link5", file_id, "link4", H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create external link\n"); + printf(" couldn't create external link\n"); PART_ERROR(H5Lcreate_external_second_file); } if (H5Lcreate_external(ext_link_filename1, "/final", file_id, "link6", H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create external link\n"); + printf(" couldn't create external link\n"); PART_ERROR(H5Lcreate_external_second_file); } /* Close file */ if (H5Fclose(file_id) < 0) { H5_FAILED(); - HDprintf(" couldn't close the file\n"); + printf(" couldn't close the file\n"); PART_ERROR(H5Lcreate_external_second_file); } @@ -2723,53 +2719,53 @@ test_create_external_link_ping_pong(void) if ((file_id = H5Fopen(ext_link_filename1, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", ext_link_filename1); + printf(" couldn't open file '%s'\n", ext_link_filename1); PART_ERROR(H5Lcreate_external_verify); } /* Open object through external link */ if ((group_id = H5Gopen2(file_id, "link1", H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open the group that is the external link 'link1'\n"); + printf(" couldn't open the group that is the external link 'link1'\n"); PART_ERROR(H5Lcreate_external_verify); } /* Check the name of the object being pointed to */ if (H5Iget_name(group_id, objname, (size_t)EXTERNAL_LINK_TEST_PING_PONG_NAME_BUF_SIZE) < 0) { H5_FAILED(); - HDprintf(" couldn't get the name of the object\n"); + printf(" couldn't get the name of the object\n"); PART_ERROR(H5Lcreate_external_verify); } if (HDstrcmp(objname, "/final")) { H5_FAILED(); - HDprintf(" wrong name of the object '%s'\n", objname); + printf(" wrong name of the object '%s'\n", objname); PART_ERROR(H5Lcreate_external_verify); } /* Create an object in the external file */ if ((group_id2 = H5Gcreate2(group_id, "new_group", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create a new group 'new_group'\n"); + printf(" couldn't create a new group 'new_group'\n"); PART_ERROR(H5Lcreate_external_verify); } if (H5Gclose(group_id2) < 0) { H5_FAILED(); - HDprintf(" couldn't close a group\n"); + printf(" couldn't close a group\n"); PART_ERROR(H5Lcreate_external_verify); } if (H5Gclose(group_id) < 0) { H5_FAILED(); - HDprintf(" couldn't close a group\n"); + printf(" couldn't close a group\n"); PART_ERROR(H5Lcreate_external_verify); } /* Close file */ if (H5Fclose(file_id) < 0) { H5_FAILED(); - HDprintf(" couldn't close the file\n"); + printf(" couldn't close the file\n"); PART_ERROR(H5Lcreate_external_verify); } @@ -2783,40 +2779,40 @@ test_create_external_link_ping_pong(void) if ((file_id = H5Fopen(ext_link_filename1, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", ext_link_filename1); + printf(" couldn't open file '%s'\n", ext_link_filename1); PART_ERROR(H5Lcreate_external_verify_again); } /* Open object through external link */ if ((group_id = H5Gopen2(file_id, "/final/new_group", H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open the group that is the external link\n"); + printf(" couldn't open the group that is the external link\n"); PART_ERROR(H5Lcreate_external_verify_again); } /* Check the name of the object being pointed to */ if (H5Iget_name(group_id, objname, (size_t)EXTERNAL_LINK_TEST_PING_PONG_NAME_BUF_SIZE) < 0) { H5_FAILED(); - HDprintf(" couldn't get the name of the object\n"); + printf(" couldn't get the name of the object\n"); PART_ERROR(H5Lcreate_external_verify_again); } if (HDstrcmp(objname, "/final/new_group")) { H5_FAILED(); - HDprintf(" wrong name of the object '%s'\n", objname); + printf(" wrong name of the object '%s'\n", objname); PART_ERROR(H5Lcreate_external_verify_again); } if (H5Gclose(group_id) < 0) { H5_FAILED(); - HDprintf(" couldn't close a group\n"); + printf(" couldn't close a group\n"); PART_ERROR(H5Lcreate_external_verify_again); } /* Close file */ if (H5Fclose(file_id) < 0) { H5_FAILED(); - HDprintf(" couldn't close the file\n"); + printf(" couldn't close the file\n"); PART_ERROR(H5Lcreate_external_verify_again); } @@ -2859,8 +2855,8 @@ test_create_external_link_invalid_params(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_EXTERNAL_LINKS)) { SKIPPED(); - HDprintf(" API functions for basic file, group, link, or external link aren't supported " - "with this connector\n"); + printf(" API functions for basic file, group, link, or external link aren't supported " + "with this connector\n"); return 0; } @@ -2871,7 +2867,7 @@ test_create_external_link_invalid_params(void) if ((file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); + printf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); goto error; } @@ -2880,21 +2876,20 @@ test_create_external_link_invalid_params(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, EXTERNAL_LINK_INVALID_PARAMS_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container subgroup '%s'\n", - EXTERNAL_LINK_INVALID_PARAMS_TEST_GROUP_NAME); + printf(" couldn't create container subgroup '%s'\n", EXTERNAL_LINK_INVALID_PARAMS_TEST_GROUP_NAME); goto error; } @@ -2915,8 +2910,8 @@ test_create_external_link_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" created external link '%s' using a NULL file name!\n", - EXTERNAL_LINK_INVALID_PARAMS_TEST_LINK_NAME); + printf(" created external link '%s' using a NULL file name!\n", + EXTERNAL_LINK_INVALID_PARAMS_TEST_LINK_NAME); PART_ERROR(H5Lcreate_external_invalid_file_name); } @@ -2929,8 +2924,8 @@ test_create_external_link_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" created external link '%s' using an invalid file name of ''!\n", - EXTERNAL_LINK_INVALID_PARAMS_TEST_LINK_NAME); + printf(" created external link '%s' using an invalid file name of ''!\n", + EXTERNAL_LINK_INVALID_PARAMS_TEST_LINK_NAME); PART_ERROR(H5Lcreate_external_invalid_file_name); } @@ -2952,8 +2947,8 @@ test_create_external_link_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" created external link '%s' using a NULL external object name!\n", - EXTERNAL_LINK_INVALID_PARAMS_TEST_LINK_NAME); + printf(" created external link '%s' using a NULL external object name!\n", + EXTERNAL_LINK_INVALID_PARAMS_TEST_LINK_NAME); PART_ERROR(H5Lcreate_external_invalid_ext_obj_name); } @@ -2967,8 +2962,8 @@ test_create_external_link_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" created external link '%s' using an invalid external object name of ''!\n", - EXTERNAL_LINK_INVALID_PARAMS_TEST_LINK_NAME); + printf(" created external link '%s' using an invalid external object name of ''!\n", + EXTERNAL_LINK_INVALID_PARAMS_TEST_LINK_NAME); PART_ERROR(H5Lcreate_external_invalid_ext_obj_name); } @@ -2990,8 +2985,8 @@ test_create_external_link_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" created external link '%s' using an invalid link_loc_id!\n", - EXTERNAL_LINK_INVALID_PARAMS_TEST_LINK_NAME); + printf(" created external link '%s' using an invalid link_loc_id!\n", + EXTERNAL_LINK_INVALID_PARAMS_TEST_LINK_NAME); PART_ERROR(H5Lcreate_external_invalid_link_loc_id); } @@ -3012,8 +3007,8 @@ test_create_external_link_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" created external link '%s' using a NULL link_loc_id!\n", - EXTERNAL_LINK_INVALID_PARAMS_TEST_LINK_NAME); + printf(" created external link '%s' using a NULL link_loc_id!\n", + EXTERNAL_LINK_INVALID_PARAMS_TEST_LINK_NAME); PART_ERROR(H5Lcreate_external_invalid_link_name); } @@ -3025,8 +3020,8 @@ test_create_external_link_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" created external link '%s' using an invalid link name of ''!\n", - EXTERNAL_LINK_INVALID_PARAMS_TEST_LINK_NAME); + printf(" created external link '%s' using an invalid link name of ''!\n", + EXTERNAL_LINK_INVALID_PARAMS_TEST_LINK_NAME); PART_ERROR(H5Lcreate_external_invalid_link_name); } @@ -3048,8 +3043,8 @@ test_create_external_link_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" created external link '%s' using an invalid LCPL!\n", - EXTERNAL_LINK_INVALID_PARAMS_TEST_LINK_NAME); + printf(" created external link '%s' using an invalid LCPL!\n", + EXTERNAL_LINK_INVALID_PARAMS_TEST_LINK_NAME); PART_ERROR(H5Lcreate_external_invalid_lcpl); } @@ -3071,8 +3066,8 @@ test_create_external_link_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" created external link '%s' using an invalid LAPL!\n", - EXTERNAL_LINK_INVALID_PARAMS_TEST_LINK_NAME); + printf(" created external link '%s' using an invalid LAPL!\n", + EXTERNAL_LINK_INVALID_PARAMS_TEST_LINK_NAME); PART_ERROR(H5Lcreate_external_invalid_lapl); } @@ -3088,14 +3083,14 @@ test_create_external_link_invalid_params(void) if ((link_exists = H5Lexists(group_id, EXTERNAL_LINK_INVALID_PARAMS_TEST_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if link '%s' exists\n", - EXTERNAL_LINK_INVALID_PARAMS_TEST_LINK_NAME); + printf(" couldn't determine if link '%s' exists\n", + EXTERNAL_LINK_INVALID_PARAMS_TEST_LINK_NAME); PART_ERROR(H5Lcreate_external_invalid_existence); } if (link_exists) { H5_FAILED(); - HDprintf(" link '%s' existed!\n", EXTERNAL_LINK_INVALID_PARAMS_TEST_LINK_NAME); + printf(" link '%s' existed!\n", EXTERNAL_LINK_INVALID_PARAMS_TEST_LINK_NAME); PART_ERROR(H5Lcreate_external_invalid_existence); } @@ -3148,7 +3143,7 @@ test_create_user_defined_link(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_UD_LINKS)) { SKIPPED(); - HDprintf( + printf( " API functions for basic file, group, link, or user-defined link aren't supported with this " "connector\n"); return 0; @@ -3156,20 +3151,20 @@ test_create_user_defined_link(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, UD_LINK_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container subgroup '%s'\n", UD_LINK_TEST_GROUP_NAME); + printf(" couldn't create container subgroup '%s'\n", UD_LINK_TEST_GROUP_NAME); goto error; } @@ -3179,20 +3174,20 @@ test_create_user_defined_link(void) if (H5Lcreate_ud(group_id, UD_LINK_TEST_LINK_NAME, H5L_TYPE_EXTERNAL, udata, (size_t)udata_size, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create user-defined link '%s'\n", UD_LINK_TEST_LINK_NAME); + printf(" couldn't create user-defined link '%s'\n", UD_LINK_TEST_LINK_NAME); goto error; } /* Verify the link has been created */ if ((link_exists = H5Lexists(group_id, UD_LINK_TEST_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if link '%s' exists\n", UD_LINK_TEST_LINK_NAME); + printf(" couldn't determine if link '%s' exists\n", UD_LINK_TEST_LINK_NAME); goto error; } if (!link_exists) { H5_FAILED(); - HDprintf(" link '%s' didn't exist!\n", UD_LINK_TEST_LINK_NAME); + printf(" link '%s' didn't exist!\n", UD_LINK_TEST_LINK_NAME); goto error; } @@ -3239,8 +3234,8 @@ test_create_user_defined_link_invalid_params(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_UD_LINKS)) { SKIPPED(); - HDprintf(" API functions for basic file, group, or user-defined link aren't supported with this " - "connector\n"); + printf(" API functions for basic file, group, or user-defined link aren't supported with this " + "connector\n"); return 0; } @@ -3248,20 +3243,20 @@ test_create_user_defined_link_invalid_params(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, UD_LINK_INVALID_PARAMS_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container subgroup '%s'\n", UD_LINK_INVALID_PARAMS_TEST_GROUP_NAME); + printf(" couldn't create container subgroup '%s'\n", UD_LINK_INVALID_PARAMS_TEST_GROUP_NAME); goto error; } @@ -3286,8 +3281,8 @@ test_create_user_defined_link_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" created user-defined link '%s' with an invalid link location ID!\n", - UD_LINK_INVALID_PARAMS_TEST_LINK_NAME); + printf(" created user-defined link '%s' with an invalid link location ID!\n", + UD_LINK_INVALID_PARAMS_TEST_LINK_NAME); PART_ERROR(H5Lcreate_ud_invalid_link_loc_id); } @@ -3308,8 +3303,8 @@ test_create_user_defined_link_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" created user-defined link '%s' with a NULL link name!\n", - UD_LINK_INVALID_PARAMS_TEST_LINK_NAME); + printf(" created user-defined link '%s' with a NULL link name!\n", + UD_LINK_INVALID_PARAMS_TEST_LINK_NAME); PART_ERROR(H5Lcreate_ud_invalid_link_name); } @@ -3322,8 +3317,8 @@ test_create_user_defined_link_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" created user-defined link '%s' with an invalid link name of ''!\n", - UD_LINK_INVALID_PARAMS_TEST_LINK_NAME); + printf(" created user-defined link '%s' with an invalid link name of ''!\n", + UD_LINK_INVALID_PARAMS_TEST_LINK_NAME); PART_ERROR(H5Lcreate_ud_invalid_link_name); } @@ -3344,8 +3339,8 @@ test_create_user_defined_link_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" created user-defined link '%s' with an invalid link type!\n", - UD_LINK_INVALID_PARAMS_TEST_LINK_NAME); + printf(" created user-defined link '%s' with an invalid link type!\n", + UD_LINK_INVALID_PARAMS_TEST_LINK_NAME); PART_ERROR(H5Lcreate_ud_invalid_link_type); } @@ -3366,8 +3361,8 @@ test_create_user_defined_link_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" created user-defined link '%s' with an invalid udata pointer!\n", - UD_LINK_INVALID_PARAMS_TEST_LINK_NAME); + printf(" created user-defined link '%s' with an invalid udata pointer!\n", + UD_LINK_INVALID_PARAMS_TEST_LINK_NAME); PART_ERROR(H5Lcreate_ud_invalid_udata_pointer); } @@ -3388,8 +3383,8 @@ test_create_user_defined_link_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" created user-defined link '%s' with an invalid LCPL!\n", - UD_LINK_INVALID_PARAMS_TEST_LINK_NAME); + printf(" created user-defined link '%s' with an invalid LCPL!\n", + UD_LINK_INVALID_PARAMS_TEST_LINK_NAME); PART_ERROR(H5Lcreate_ud_invalid_lcpl); } @@ -3410,8 +3405,8 @@ test_create_user_defined_link_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" created user-defined link '%s' with an invalid LAPL!\n", - UD_LINK_INVALID_PARAMS_TEST_LINK_NAME); + printf(" created user-defined link '%s' with an invalid LAPL!\n", + UD_LINK_INVALID_PARAMS_TEST_LINK_NAME); PART_ERROR(H5Lcreate_ud_invalid_lapl); } @@ -3426,14 +3421,13 @@ test_create_user_defined_link_invalid_params(void) /* Verify the link hasn't been created */ if ((link_exists = H5Lexists(group_id, UD_LINK_INVALID_PARAMS_TEST_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if link '%s' exists\n", - UD_LINK_INVALID_PARAMS_TEST_LINK_NAME); + printf(" couldn't determine if link '%s' exists\n", UD_LINK_INVALID_PARAMS_TEST_LINK_NAME); PART_ERROR(H5Lcreate_ud_invalid_existence); } if (link_exists) { H5_FAILED(); - HDprintf(" link '%s' existed!\n", UD_LINK_INVALID_PARAMS_TEST_LINK_NAME); + printf(" link '%s' existed!\n", UD_LINK_INVALID_PARAMS_TEST_LINK_NAME); PART_ERROR(H5Lcreate_ud_invalid_existence); } @@ -3491,8 +3485,8 @@ test_delete_link(void) !(vol_cap_flags_g & H5VL_CAP_FLAG_HARD_LINKS) || !(vol_cap_flags_g & H5VL_CAP_FLAG_EXTERNAL_LINKS) || !(vol_cap_flags_g & H5VL_CAP_FLAG_SOFT_LINKS)) { SKIPPED(); - HDprintf(" API functions for basic file, group, link, hard link, soft link, or external link " - "aren't supported with this connector\n"); + printf(" API functions for basic file, group, link, hard link, soft link, or external link " + "aren't supported with this connector\n"); return 0; } @@ -3500,26 +3494,26 @@ test_delete_link(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); goto error; } if ((gcpl_id = H5Pcreate(H5P_GROUP_CREATE)) < 0) { H5_FAILED(); - HDprintf(" couldn't create GCPL for link creation order tracking\n"); + printf(" couldn't create GCPL for link creation order tracking\n"); goto error; } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (H5Pset_link_creation_order(gcpl_id, H5P_CRT_ORDER_TRACKED) < 0) { H5_FAILED(); - HDprintf(" couldn't set link creation order tracking\n"); + printf(" couldn't set link creation order tracking\n"); goto error; } } @@ -3527,7 +3521,7 @@ test_delete_link(void) if ((group_id = H5Gcreate2(container_group, LINK_DELETE_TEST_SUBGROUP_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container subgroup '%s'\n", LINK_DELETE_TEST_SUBGROUP_NAME); + printf(" couldn't create container subgroup '%s'\n", LINK_DELETE_TEST_SUBGROUP_NAME); goto error; } @@ -3542,53 +3536,53 @@ test_delete_link(void) if ((subgroup_id = H5Gcreate2(group_id, LINK_DELETE_TEST_SUBGROUP1_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create subgroup '%s'\n", LINK_DELETE_TEST_SUBGROUP1_NAME); + printf(" couldn't create subgroup '%s'\n", LINK_DELETE_TEST_SUBGROUP1_NAME); PART_ERROR(H5Ldelete_hard); } if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create first hard link '%s'\n", LINK_DELETE_TEST_HARD_LINK_NAME); + printf(" couldn't create first hard link '%s'\n", LINK_DELETE_TEST_HARD_LINK_NAME); PART_ERROR(H5Ldelete_hard); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if first hard link '%s' exists\n", - LINK_DELETE_TEST_HARD_LINK_NAME); + printf(" couldn't determine if first hard link '%s' exists\n", + LINK_DELETE_TEST_HARD_LINK_NAME); PART_ERROR(H5Ldelete_hard); } if (!link_exists) { H5_FAILED(); - HDprintf(" first hard link did not exist\n"); + printf(" first hard link did not exist\n"); PART_ERROR(H5Ldelete_hard); } if (H5Ldelete(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't delete hard link '%s' using H5Ldelete\n", - LINK_DELETE_TEST_HARD_LINK_NAME); + printf(" couldn't delete hard link '%s' using H5Ldelete\n", + LINK_DELETE_TEST_HARD_LINK_NAME); PART_ERROR(H5Ldelete_hard); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if first hard link '%s' exists\n", - LINK_DELETE_TEST_HARD_LINK_NAME); + printf(" couldn't determine if first hard link '%s' exists\n", + LINK_DELETE_TEST_HARD_LINK_NAME); PART_ERROR(H5Ldelete_hard); } if (link_exists) { H5_FAILED(); - HDprintf(" first hard link exists!\n"); + printf(" first hard link exists!\n"); PART_ERROR(H5Ldelete_hard); } if (H5Gclose(subgroup_id) < 0) { H5_FAILED(); - HDprintf(" failed to close group '%s'\n", LINK_DELETE_TEST_SUBGROUP1_NAME); + printf(" failed to close group '%s'\n", LINK_DELETE_TEST_SUBGROUP1_NAME); PART_ERROR(H5Ldelete_hard); } @@ -3610,66 +3604,66 @@ test_delete_link(void) if ((subgroup_id = H5Gcreate2(group_id, LINK_DELETE_TEST_NESTED_SUBGROUP_NAME1, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create subgroup '%s'\n", LINK_DELETE_TEST_NESTED_SUBGROUP_NAME1); + printf(" couldn't create subgroup '%s'\n", LINK_DELETE_TEST_NESTED_SUBGROUP_NAME1); PART_ERROR(H5Ldelete_hard_indirect); } if ((nested_grp_id = H5Gcreate2(subgroup_id, LINK_DELETE_TEST_NESTED_GRP_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create subgroup '%s'\n", LINK_DELETE_TEST_NESTED_GRP_NAME); + printf(" couldn't create subgroup '%s'\n", LINK_DELETE_TEST_NESTED_GRP_NAME); PART_ERROR(H5Ldelete_hard_indirect); } if (H5Lcreate_hard(nested_grp_id, ".", nested_grp_id, LINK_DELETE_TEST_HARD_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create first hard link '%s'\n", LINK_DELETE_TEST_HARD_LINK_NAME); + printf(" couldn't create first hard link '%s'\n", LINK_DELETE_TEST_HARD_LINK_NAME); PART_ERROR(H5Ldelete_hard_indirect); } if ((link_exists = H5Lexists(nested_grp_id, LINK_DELETE_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if first hard link '%s' exists\n", - LINK_DELETE_TEST_HARD_LINK_NAME); + printf(" couldn't determine if first hard link '%s' exists\n", + LINK_DELETE_TEST_HARD_LINK_NAME); PART_ERROR(H5Ldelete_hard_indirect); } if (!link_exists) { H5_FAILED(); - HDprintf(" first hard link did not exist\n"); + printf(" first hard link did not exist\n"); PART_ERROR(H5Ldelete_hard_indirect); } if (H5Ldelete(subgroup_id, LINK_DELETE_TEST_NESTED_HARD_LINK_NAME, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't delete hard link '%s' using H5Ldelete\n", - LINK_DELETE_TEST_NESTED_HARD_LINK_NAME); + printf(" couldn't delete hard link '%s' using H5Ldelete\n", + LINK_DELETE_TEST_NESTED_HARD_LINK_NAME); PART_ERROR(H5Ldelete_hard_indirect); } if ((link_exists = H5Lexists(nested_grp_id, LINK_DELETE_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if first hard link '%s' exists\n", - LINK_DELETE_TEST_HARD_LINK_NAME); + printf(" couldn't determine if first hard link '%s' exists\n", + LINK_DELETE_TEST_HARD_LINK_NAME); PART_ERROR(H5Ldelete_hard_indirect); } if (link_exists) { H5_FAILED(); - HDprintf(" first hard link exists!\n"); + printf(" first hard link exists!\n"); PART_ERROR(H5Ldelete_hard_indirect); } if (H5Gclose(nested_grp_id) < 0) { H5_FAILED(); - HDprintf(" failed to close group '%s'\n", LINK_DELETE_TEST_NESTED_GRP_NAME); + printf(" failed to close group '%s'\n", LINK_DELETE_TEST_NESTED_GRP_NAME); PART_ERROR(H5Ldelete_hard_indirect); } if (H5Gclose(subgroup_id) < 0) { H5_FAILED(); - HDprintf(" failed to close group '%s'\n", LINK_DELETE_TEST_SUBGROUP1_NAME); + printf(" failed to close group '%s'\n", LINK_DELETE_TEST_SUBGROUP1_NAME); PART_ERROR(H5Ldelete_hard_indirect); } @@ -3693,7 +3687,7 @@ test_delete_link(void) if ((subgroup_id = H5Gcreate2(group_id, LINK_DELETE_TEST_SUBGROUP2_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create subgroup '%s'\n", LINK_DELETE_TEST_SUBGROUP2_NAME); + printf(" couldn't create subgroup '%s'\n", LINK_DELETE_TEST_SUBGROUP2_NAME); PART_ERROR(H5Ldelete_soft); } @@ -3701,46 +3695,46 @@ test_delete_link(void) "/" LINK_DELETE_TEST_SUBGROUP2_NAME, subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create first soft link '%s'\n", LINK_DELETE_TEST_SOFT_LINK_NAME); + printf(" couldn't create first soft link '%s'\n", LINK_DELETE_TEST_SOFT_LINK_NAME); PART_ERROR(H5Ldelete_soft); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if first soft link '%s' exists\n", - LINK_DELETE_TEST_SOFT_LINK_NAME); + printf(" couldn't determine if first soft link '%s' exists\n", + LINK_DELETE_TEST_SOFT_LINK_NAME); PART_ERROR(H5Ldelete_soft); } if (!link_exists) { H5_FAILED(); - HDprintf(" first soft link did not exist\n"); + printf(" first soft link did not exist\n"); PART_ERROR(H5Ldelete_soft); } if (H5Ldelete(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't delete soft link '%s' using H5Ldelete\n", - LINK_DELETE_TEST_SOFT_LINK_NAME); + printf(" couldn't delete soft link '%s' using H5Ldelete\n", + LINK_DELETE_TEST_SOFT_LINK_NAME); PART_ERROR(H5Ldelete_soft); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if first soft link '%s' exists\n", - LINK_DELETE_TEST_SOFT_LINK_NAME); + printf(" couldn't determine if first soft link '%s' exists\n", + LINK_DELETE_TEST_SOFT_LINK_NAME); PART_ERROR(H5Ldelete_soft); } if (link_exists) { H5_FAILED(); - HDprintf(" first soft link exists!\n"); + printf(" first soft link exists!\n"); PART_ERROR(H5Ldelete_soft); } if (H5Gclose(subgroup_id) < 0) { H5_FAILED(); - HDprintf(" failed to close group '%s'\n", LINK_DELETE_TEST_SUBGROUP2_NAME); + printf(" failed to close group '%s'\n", LINK_DELETE_TEST_SUBGROUP2_NAME); PART_ERROR(H5Ldelete_soft); } @@ -3764,69 +3758,68 @@ test_delete_link(void) if ((ext_file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); + printf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); PART_ERROR(H5Ldelete_external); } if (H5Fclose(ext_file_id) < 0) { H5_FAILED(); - HDprintf(" couldn't close file '%s'\n", ext_link_filename); + printf(" couldn't close file '%s'\n", ext_link_filename); PART_ERROR(H5Ldelete_external); } if ((subgroup_id = H5Gcreate2(group_id, LINK_DELETE_TEST_SUBGROUP3_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create subgroup '%s'\n", LINK_DELETE_TEST_SUBGROUP3_NAME); + printf(" couldn't create subgroup '%s'\n", LINK_DELETE_TEST_SUBGROUP3_NAME); PART_ERROR(H5Ldelete_external); } if (H5Lcreate_external(ext_link_filename, "/", subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create first external link '%s'\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME); + printf(" couldn't create first external link '%s'\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME); PART_ERROR(H5Ldelete_external); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if first external link '%s' exists\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME); + printf(" couldn't determine if first external link '%s' exists\n", + LINK_DELETE_TEST_EXTERNAL_LINK_NAME); PART_ERROR(H5Ldelete_external); } if (!link_exists) { H5_FAILED(); - HDprintf(" first external link did not exist\n"); + printf(" first external link did not exist\n"); PART_ERROR(H5Ldelete_external); } if (H5Ldelete(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't delete external link '%s' using H5Ldelete\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME); + printf(" couldn't delete external link '%s' using H5Ldelete\n", + LINK_DELETE_TEST_EXTERNAL_LINK_NAME); PART_ERROR(H5Ldelete_external); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if first external link '%s' exists\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME); + printf(" couldn't determine if first external link '%s' exists\n", + LINK_DELETE_TEST_EXTERNAL_LINK_NAME); PART_ERROR(H5Ldelete_external); } if (link_exists) { H5_FAILED(); - HDprintf(" first external link exists!\n"); + printf(" first external link exists!\n"); PART_ERROR(H5Ldelete_external); } if (H5Gclose(subgroup_id) < 0) { H5_FAILED(); - HDprintf(" failed to close group '%s'\n", LINK_DELETE_TEST_SUBGROUP3_NAME); + printf(" failed to close group '%s'\n", LINK_DELETE_TEST_SUBGROUP3_NAME); PART_ERROR(H5Ldelete_external); } @@ -3867,14 +3860,14 @@ test_delete_link(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" creation order tracking isn't supported with this VOL connector\n"); + printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Ldelete_by_idx_hard_crt_order_increasing); } if ((subgroup_id = H5Gcreate2(group_id, LINK_DELETE_TEST_SUBGROUP5_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create subgroup '%s'\n", LINK_DELETE_TEST_SUBGROUP5_NAME); + printf(" couldn't create subgroup '%s'\n", LINK_DELETE_TEST_SUBGROUP5_NAME); PART_ERROR(H5Ldelete_by_idx_hard_crt_order_increasing); } @@ -3882,217 +3875,204 @@ test_delete_link(void) if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create hard link '%s'\n", LINK_DELETE_TEST_HARD_LINK_NAME); + printf(" couldn't create hard link '%s'\n", LINK_DELETE_TEST_HARD_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_hard_crt_order_increasing); } if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create hard link '%s'\n", LINK_DELETE_TEST_HARD_LINK_NAME2); + printf(" couldn't create hard link '%s'\n", LINK_DELETE_TEST_HARD_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_hard_crt_order_increasing); } if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create hard link '%s'\n", LINK_DELETE_TEST_HARD_LINK_NAME3); + printf(" couldn't create hard link '%s'\n", LINK_DELETE_TEST_HARD_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_hard_crt_order_increasing); } /* Verify the links have been created */ if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if hard link '%s' exists\n", - LINK_DELETE_TEST_HARD_LINK_NAME); + printf(" couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_hard_crt_order_increasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" hard link '%s' did not exist before deletion\n", - LINK_DELETE_TEST_HARD_LINK_NAME); + printf(" hard link '%s' did not exist before deletion\n", LINK_DELETE_TEST_HARD_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_hard_crt_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if hard link '%s' exists\n", - LINK_DELETE_TEST_HARD_LINK_NAME2); + printf(" couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_hard_crt_order_increasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" hard link '%s' did not exist before deletion\n", - LINK_DELETE_TEST_HARD_LINK_NAME2); + printf(" hard link '%s' did not exist before deletion\n", + LINK_DELETE_TEST_HARD_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_hard_crt_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME3, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if hard link '%s' exists\n", - LINK_DELETE_TEST_HARD_LINK_NAME3); + printf(" couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_hard_crt_order_increasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" hard link '%s' did not exist before deletion\n", - LINK_DELETE_TEST_HARD_LINK_NAME3); + printf(" hard link '%s' did not exist before deletion\n", + LINK_DELETE_TEST_HARD_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_hard_crt_order_increasing); } /* Delete a link */ if (H5Ldelete_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 0, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't delete hard link '%s' using H5Ldelete_by_idx by creation order in " - "increasing order\n", - LINK_DELETE_TEST_HARD_LINK_NAME); + printf(" couldn't delete hard link '%s' using H5Ldelete_by_idx by creation order in " + "increasing order\n", + LINK_DELETE_TEST_HARD_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_hard_crt_order_increasing); } /* Ensure that the link is gone and others remain */ if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if hard link '%s' exists\n", - LINK_DELETE_TEST_HARD_LINK_NAME); + printf(" couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_hard_crt_order_increasing); } if (link_exists) { H5_FAILED(); - HDprintf(" hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME); + printf(" hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_hard_crt_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if hard link '%s' exists\n", - LINK_DELETE_TEST_HARD_LINK_NAME2); + printf(" couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_hard_crt_order_increasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" hard link '%s' did not exist after deletion of a different link!\n", - LINK_DELETE_TEST_HARD_LINK_NAME2); + printf(" hard link '%s' did not exist after deletion of a different link!\n", + LINK_DELETE_TEST_HARD_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_hard_crt_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME3, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if hard link '%s' exists\n", - LINK_DELETE_TEST_HARD_LINK_NAME3); + printf(" couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_hard_crt_order_increasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" hard link '%s' did not exist after deletion of a different link!\n", - LINK_DELETE_TEST_HARD_LINK_NAME3); + printf(" hard link '%s' did not exist after deletion of a different link!\n", + LINK_DELETE_TEST_HARD_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_hard_crt_order_increasing); } /* Repeat until all links have been deleted */ if (H5Ldelete_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 0, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't delete hard link '%s' using H5Ldelete_by_idx by creation order in " - "increasing order\n", - LINK_DELETE_TEST_HARD_LINK_NAME2); + printf(" couldn't delete hard link '%s' using H5Ldelete_by_idx by creation order in " + "increasing order\n", + LINK_DELETE_TEST_HARD_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_hard_crt_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if hard link '%s' exists\n", - LINK_DELETE_TEST_HARD_LINK_NAME); + printf(" couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_hard_crt_order_increasing); } if (link_exists) { H5_FAILED(); - HDprintf(" hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME); + printf(" hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_hard_crt_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if hard link '%s' exists\n", - LINK_DELETE_TEST_HARD_LINK_NAME2); + printf(" couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_hard_crt_order_increasing); } if (link_exists) { H5_FAILED(); - HDprintf(" hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME2); + printf(" hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_hard_crt_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME3, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if hard link '%s' exists\n", - LINK_DELETE_TEST_HARD_LINK_NAME3); + printf(" couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_hard_crt_order_increasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" hard link '%s' did not exist after deletion of a different link!\n", - LINK_DELETE_TEST_HARD_LINK_NAME3); + printf(" hard link '%s' did not exist after deletion of a different link!\n", + LINK_DELETE_TEST_HARD_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_hard_crt_order_increasing); } if (H5Ldelete_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 0, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't delete hard link '%s' using H5Ldelete_by_idx by creation order in " - "increasing order\n", - LINK_DELETE_TEST_HARD_LINK_NAME3); + printf(" couldn't delete hard link '%s' using H5Ldelete_by_idx by creation order in " + "increasing order\n", + LINK_DELETE_TEST_HARD_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_hard_crt_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if hard link '%s' exists\n", - LINK_DELETE_TEST_HARD_LINK_NAME); + printf(" couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_hard_crt_order_increasing); } if (link_exists) { H5_FAILED(); - HDprintf(" hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME); + printf(" hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_hard_crt_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if hard link '%s' exists\n", - LINK_DELETE_TEST_HARD_LINK_NAME2); + printf(" couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_hard_crt_order_increasing); } if (link_exists) { H5_FAILED(); - HDprintf(" hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME2); + printf(" hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_hard_crt_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME3, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if hard link '%s' exists\n", - LINK_DELETE_TEST_HARD_LINK_NAME3); + printf(" couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_hard_crt_order_increasing); } if (link_exists) { H5_FAILED(); - HDprintf(" hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME3); + printf(" hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_hard_crt_order_increasing); } if (H5Gclose(subgroup_id) < 0) { H5_FAILED(); - HDprintf(" failed to close group '%s'\n", LINK_DELETE_TEST_SUBGROUP5_NAME); + printf(" failed to close group '%s'\n", LINK_DELETE_TEST_SUBGROUP5_NAME); PART_ERROR(H5Ldelete_by_idx_hard_crt_order_increasing); } @@ -4113,14 +4093,14 @@ test_delete_link(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" creation order tracking isn't supported with this VOL connector\n"); + printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Ldelete_by_idx_hard_crt_order_decreasing); } if ((subgroup_id = H5Gcreate2(group_id, LINK_DELETE_TEST_SUBGROUP6_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create subgroup '%s'\n", LINK_DELETE_TEST_SUBGROUP6_NAME); + printf(" couldn't create subgroup '%s'\n", LINK_DELETE_TEST_SUBGROUP6_NAME); PART_ERROR(H5Ldelete_by_idx_hard_crt_order_decreasing); } @@ -4128,217 +4108,204 @@ test_delete_link(void) if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create hard link '%s'\n", LINK_DELETE_TEST_HARD_LINK_NAME); + printf(" couldn't create hard link '%s'\n", LINK_DELETE_TEST_HARD_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_hard_crt_order_decreasing); } if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create hard link '%s'\n", LINK_DELETE_TEST_HARD_LINK_NAME2); + printf(" couldn't create hard link '%s'\n", LINK_DELETE_TEST_HARD_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_hard_crt_order_decreasing); } if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create hard link '%s'\n", LINK_DELETE_TEST_HARD_LINK_NAME3); + printf(" couldn't create hard link '%s'\n", LINK_DELETE_TEST_HARD_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_hard_crt_order_decreasing); } /* Verify the links have been created */ if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if hard link '%s' exists\n", - LINK_DELETE_TEST_HARD_LINK_NAME); + printf(" couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_hard_crt_order_decreasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" hard link '%s' did not exist before deletion\n", - LINK_DELETE_TEST_HARD_LINK_NAME); + printf(" hard link '%s' did not exist before deletion\n", LINK_DELETE_TEST_HARD_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_hard_crt_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if hard link '%s' exists\n", - LINK_DELETE_TEST_HARD_LINK_NAME2); + printf(" couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_hard_crt_order_decreasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" hard link '%s' did not exist before deletion\n", - LINK_DELETE_TEST_HARD_LINK_NAME2); + printf(" hard link '%s' did not exist before deletion\n", + LINK_DELETE_TEST_HARD_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_hard_crt_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME3, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if hard link '%s' exists\n", - LINK_DELETE_TEST_HARD_LINK_NAME3); + printf(" couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_hard_crt_order_decreasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" hard link '%s' did not exist before deletion\n", - LINK_DELETE_TEST_HARD_LINK_NAME3); + printf(" hard link '%s' did not exist before deletion\n", + LINK_DELETE_TEST_HARD_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_hard_crt_order_decreasing); } /* Delete a link */ if (H5Ldelete_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 2, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't delete hard link '%s' using H5Ldelete_by_idx by creation order in " - "decreasing order\n", - LINK_DELETE_TEST_HARD_LINK_NAME); + printf(" couldn't delete hard link '%s' using H5Ldelete_by_idx by creation order in " + "decreasing order\n", + LINK_DELETE_TEST_HARD_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_hard_crt_order_decreasing); } /* Ensure that the link is gone and others remain */ if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if hard link '%s' exists\n", - LINK_DELETE_TEST_HARD_LINK_NAME); + printf(" couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_hard_crt_order_decreasing); } if (link_exists) { H5_FAILED(); - HDprintf(" hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME); + printf(" hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_hard_crt_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if hard link '%s' exists\n", - LINK_DELETE_TEST_HARD_LINK_NAME2); + printf(" couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_hard_crt_order_decreasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" hard link '%s' did not exist after deletion of a different link!\n", - LINK_DELETE_TEST_HARD_LINK_NAME2); + printf(" hard link '%s' did not exist after deletion of a different link!\n", + LINK_DELETE_TEST_HARD_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_hard_crt_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME3, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if hard link '%s' exists\n", - LINK_DELETE_TEST_HARD_LINK_NAME3); + printf(" couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_hard_crt_order_decreasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" hard link '%s' did not exist after deletion of a different link!\n", - LINK_DELETE_TEST_HARD_LINK_NAME3); + printf(" hard link '%s' did not exist after deletion of a different link!\n", + LINK_DELETE_TEST_HARD_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_hard_crt_order_decreasing); } /* Repeat until all links have been deleted */ if (H5Ldelete_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 1, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't delete hard link '%s' using H5Ldelete_by_idx by creation order in " - "decreasing order\n", - LINK_DELETE_TEST_HARD_LINK_NAME2); + printf(" couldn't delete hard link '%s' using H5Ldelete_by_idx by creation order in " + "decreasing order\n", + LINK_DELETE_TEST_HARD_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_hard_crt_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if hard link '%s' exists\n", - LINK_DELETE_TEST_HARD_LINK_NAME); + printf(" couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_hard_crt_order_decreasing); } if (link_exists) { H5_FAILED(); - HDprintf(" hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME); + printf(" hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_hard_crt_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if hard link '%s' exists\n", - LINK_DELETE_TEST_HARD_LINK_NAME2); + printf(" couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_hard_crt_order_decreasing); } if (link_exists) { H5_FAILED(); - HDprintf(" hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME2); + printf(" hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_hard_crt_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME3, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if hard link '%s' exists\n", - LINK_DELETE_TEST_HARD_LINK_NAME3); + printf(" couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_hard_crt_order_decreasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" hard link '%s' did not exist after deletion of a different link!\n", - LINK_DELETE_TEST_HARD_LINK_NAME3); + printf(" hard link '%s' did not exist after deletion of a different link!\n", + LINK_DELETE_TEST_HARD_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_hard_crt_order_decreasing); } if (H5Ldelete_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 0, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't delete hard link '%s' using H5Ldelete_by_idx by creation order in " - "decreasing order\n", - LINK_DELETE_TEST_HARD_LINK_NAME3); + printf(" couldn't delete hard link '%s' using H5Ldelete_by_idx by creation order in " + "decreasing order\n", + LINK_DELETE_TEST_HARD_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_hard_crt_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if hard link '%s' exists\n", - LINK_DELETE_TEST_HARD_LINK_NAME); + printf(" couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_hard_crt_order_decreasing); } if (link_exists) { H5_FAILED(); - HDprintf(" hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME); + printf(" hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_hard_crt_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if hard link '%s' exists\n", - LINK_DELETE_TEST_HARD_LINK_NAME2); + printf(" couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_hard_crt_order_decreasing); } if (link_exists) { H5_FAILED(); - HDprintf(" hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME2); + printf(" hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_hard_crt_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME3, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if hard link '%s' exists\n", - LINK_DELETE_TEST_HARD_LINK_NAME3); + printf(" couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_hard_crt_order_decreasing); } if (link_exists) { H5_FAILED(); - HDprintf(" hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME3); + printf(" hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_hard_crt_order_decreasing); } if (H5Gclose(subgroup_id) < 0) { H5_FAILED(); - HDprintf(" failed to close group '%s'\n", LINK_DELETE_TEST_SUBGROUP6_NAME); + printf(" failed to close group '%s'\n", LINK_DELETE_TEST_SUBGROUP6_NAME); PART_ERROR(H5Ldelete_by_idx_hard_crt_order_decreasing); } @@ -4360,7 +4327,7 @@ test_delete_link(void) if ((subgroup_id = H5Gcreate2(group_id, LINK_DELETE_TEST_SUBGROUP7_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create subgroup '%s'\n", LINK_DELETE_TEST_SUBGROUP7_NAME); + printf(" couldn't create subgroup '%s'\n", LINK_DELETE_TEST_SUBGROUP7_NAME); PART_ERROR(H5Ldelete_by_idx_hard_name_order_increasing); } @@ -4368,217 +4335,204 @@ test_delete_link(void) if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create hard link '%s'\n", LINK_DELETE_TEST_HARD_LINK_NAME); + printf(" couldn't create hard link '%s'\n", LINK_DELETE_TEST_HARD_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_hard_name_order_increasing); } if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create hard link '%s'\n", LINK_DELETE_TEST_HARD_LINK_NAME2); + printf(" couldn't create hard link '%s'\n", LINK_DELETE_TEST_HARD_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_hard_name_order_increasing); } if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create hard link '%s'\n", LINK_DELETE_TEST_HARD_LINK_NAME3); + printf(" couldn't create hard link '%s'\n", LINK_DELETE_TEST_HARD_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_hard_name_order_increasing); } /* Verify the links have been created */ if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if hard link '%s' exists\n", - LINK_DELETE_TEST_HARD_LINK_NAME); + printf(" couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_hard_name_order_increasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" hard link '%s' did not exist before deletion\n", - LINK_DELETE_TEST_HARD_LINK_NAME); + printf(" hard link '%s' did not exist before deletion\n", LINK_DELETE_TEST_HARD_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_hard_name_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if hard link '%s' exists\n", - LINK_DELETE_TEST_HARD_LINK_NAME2); + printf(" couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_hard_name_order_increasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" hard link '%s' did not exist before deletion\n", - LINK_DELETE_TEST_HARD_LINK_NAME2); + printf(" hard link '%s' did not exist before deletion\n", + LINK_DELETE_TEST_HARD_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_hard_name_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME3, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if hard link '%s' exists\n", - LINK_DELETE_TEST_HARD_LINK_NAME3); + printf(" couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_hard_name_order_increasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" hard link '%s' did not exist before deletion\n", - LINK_DELETE_TEST_HARD_LINK_NAME3); + printf(" hard link '%s' did not exist before deletion\n", + LINK_DELETE_TEST_HARD_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_hard_name_order_increasing); } /* Delete a link */ if (H5Ldelete_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 0, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't delete hard link '%s' using H5Ldelete_by_idx by alphabetical order in " - "increasing order\n", - LINK_DELETE_TEST_HARD_LINK_NAME); + printf(" couldn't delete hard link '%s' using H5Ldelete_by_idx by alphabetical order in " + "increasing order\n", + LINK_DELETE_TEST_HARD_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_hard_name_order_increasing); } /* Ensure that the link is gone and others remain */ if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if hard link '%s' exists\n", - LINK_DELETE_TEST_HARD_LINK_NAME); + printf(" couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_hard_name_order_increasing); } if (link_exists) { H5_FAILED(); - HDprintf(" hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME); + printf(" hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_hard_name_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if hard link '%s' exists\n", - LINK_DELETE_TEST_HARD_LINK_NAME2); + printf(" couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_hard_name_order_increasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" hard link '%s' did not exist after deletion of a different link!\n", - LINK_DELETE_TEST_HARD_LINK_NAME2); + printf(" hard link '%s' did not exist after deletion of a different link!\n", + LINK_DELETE_TEST_HARD_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_hard_name_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME3, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if hard link '%s' exists\n", - LINK_DELETE_TEST_HARD_LINK_NAME3); + printf(" couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_hard_name_order_increasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" hard link '%s' did not exist after deletion of a different link!\n", - LINK_DELETE_TEST_HARD_LINK_NAME3); + printf(" hard link '%s' did not exist after deletion of a different link!\n", + LINK_DELETE_TEST_HARD_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_hard_name_order_increasing); } /* Repeat until all links have been deleted */ if (H5Ldelete_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 0, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't delete hard link '%s' using H5Ldelete_by_idx by alphabetical order in " - "increasing order\n", - LINK_DELETE_TEST_HARD_LINK_NAME2); + printf(" couldn't delete hard link '%s' using H5Ldelete_by_idx by alphabetical order in " + "increasing order\n", + LINK_DELETE_TEST_HARD_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_hard_name_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if hard link '%s' exists\n", - LINK_DELETE_TEST_HARD_LINK_NAME); + printf(" couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_hard_name_order_increasing); } if (link_exists) { H5_FAILED(); - HDprintf(" hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME); + printf(" hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_hard_name_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if hard link '%s' exists\n", - LINK_DELETE_TEST_HARD_LINK_NAME2); + printf(" couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_hard_name_order_increasing); } if (link_exists) { H5_FAILED(); - HDprintf(" hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME2); + printf(" hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_hard_name_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME3, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if hard link '%s' exists\n", - LINK_DELETE_TEST_HARD_LINK_NAME3); + printf(" couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_hard_name_order_increasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" hard link '%s' did not exist after deletion of a different link!\n", - LINK_DELETE_TEST_HARD_LINK_NAME3); + printf(" hard link '%s' did not exist after deletion of a different link!\n", + LINK_DELETE_TEST_HARD_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_hard_name_order_increasing); } if (H5Ldelete_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 0, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't delete hard link '%s' using H5Ldelete_by_idx by alphabetical order in " - "increasing order\n", - LINK_DELETE_TEST_HARD_LINK_NAME3); + printf(" couldn't delete hard link '%s' using H5Ldelete_by_idx by alphabetical order in " + "increasing order\n", + LINK_DELETE_TEST_HARD_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_hard_name_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if hard link '%s' exists\n", - LINK_DELETE_TEST_HARD_LINK_NAME); + printf(" couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_hard_name_order_increasing); } if (link_exists) { H5_FAILED(); - HDprintf(" hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME); + printf(" hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_hard_name_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if hard link '%s' exists\n", - LINK_DELETE_TEST_HARD_LINK_NAME2); + printf(" couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_hard_name_order_increasing); } if (link_exists) { H5_FAILED(); - HDprintf(" hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME2); + printf(" hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_hard_name_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME3, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if hard link '%s' exists\n", - LINK_DELETE_TEST_HARD_LINK_NAME3); + printf(" couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_hard_name_order_increasing); } if (link_exists) { H5_FAILED(); - HDprintf(" hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME3); + printf(" hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_hard_name_order_increasing); } if (H5Gclose(subgroup_id) < 0) { H5_FAILED(); - HDprintf(" failed to close group '%s'\n", LINK_DELETE_TEST_SUBGROUP7_NAME); + printf(" failed to close group '%s'\n", LINK_DELETE_TEST_SUBGROUP7_NAME); PART_ERROR(H5Ldelete_by_idx_hard_name_order_increasing); } @@ -4600,7 +4554,7 @@ test_delete_link(void) if ((subgroup_id = H5Gcreate2(group_id, LINK_DELETE_TEST_SUBGROUP8_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create subgroup '%s'\n", LINK_DELETE_TEST_SUBGROUP8_NAME); + printf(" couldn't create subgroup '%s'\n", LINK_DELETE_TEST_SUBGROUP8_NAME); PART_ERROR(H5Ldelete_by_idx_hard_name_order_decreasing); } @@ -4608,217 +4562,204 @@ test_delete_link(void) if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create hard link '%s'\n", LINK_DELETE_TEST_HARD_LINK_NAME); + printf(" couldn't create hard link '%s'\n", LINK_DELETE_TEST_HARD_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_hard_name_order_decreasing); } if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create hard link '%s'\n", LINK_DELETE_TEST_HARD_LINK_NAME2); + printf(" couldn't create hard link '%s'\n", LINK_DELETE_TEST_HARD_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_hard_name_order_decreasing); } if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create hard link '%s'\n", LINK_DELETE_TEST_HARD_LINK_NAME3); + printf(" couldn't create hard link '%s'\n", LINK_DELETE_TEST_HARD_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_hard_name_order_decreasing); } /* Verify the links have been created */ if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if hard link '%s' exists\n", - LINK_DELETE_TEST_HARD_LINK_NAME); + printf(" couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_hard_name_order_decreasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" hard link '%s' did not exist before deletion\n", - LINK_DELETE_TEST_HARD_LINK_NAME); + printf(" hard link '%s' did not exist before deletion\n", LINK_DELETE_TEST_HARD_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_hard_name_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if hard link '%s' exists\n", - LINK_DELETE_TEST_HARD_LINK_NAME2); + printf(" couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_hard_name_order_decreasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" hard link '%s' did not exist before deletion\n", - LINK_DELETE_TEST_HARD_LINK_NAME2); + printf(" hard link '%s' did not exist before deletion\n", + LINK_DELETE_TEST_HARD_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_hard_name_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME3, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if hard link '%s' exists\n", - LINK_DELETE_TEST_HARD_LINK_NAME3); + printf(" couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_hard_name_order_decreasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" hard link '%s' did not exist before deletion\n", - LINK_DELETE_TEST_HARD_LINK_NAME3); + printf(" hard link '%s' did not exist before deletion\n", + LINK_DELETE_TEST_HARD_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_hard_name_order_decreasing); } /* Delete a link */ if (H5Ldelete_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 2, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't delete hard link '%s' using H5Ldelete_by_idx by alphabetical order in " - "decreasing order\n", - LINK_DELETE_TEST_HARD_LINK_NAME); + printf(" couldn't delete hard link '%s' using H5Ldelete_by_idx by alphabetical order in " + "decreasing order\n", + LINK_DELETE_TEST_HARD_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_hard_name_order_decreasing); } /* Ensure that the link is gone and others remain */ if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if hard link '%s' exists\n", - LINK_DELETE_TEST_HARD_LINK_NAME); + printf(" couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_hard_name_order_decreasing); } if (link_exists) { H5_FAILED(); - HDprintf(" hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME); + printf(" hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_hard_name_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if hard link '%s' exists\n", - LINK_DELETE_TEST_HARD_LINK_NAME2); + printf(" couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_hard_name_order_decreasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" hard link '%s' did not exist after deletion of a different link!\n", - LINK_DELETE_TEST_HARD_LINK_NAME2); + printf(" hard link '%s' did not exist after deletion of a different link!\n", + LINK_DELETE_TEST_HARD_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_hard_name_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME3, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if hard link '%s' exists\n", - LINK_DELETE_TEST_HARD_LINK_NAME3); + printf(" couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_hard_name_order_decreasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" hard link '%s' did not exist after deletion of a different link!\n", - LINK_DELETE_TEST_HARD_LINK_NAME3); + printf(" hard link '%s' did not exist after deletion of a different link!\n", + LINK_DELETE_TEST_HARD_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_hard_name_order_decreasing); } /* Repeat until all links have been deleted */ if (H5Ldelete_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 1, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't delete hard link '%s' using H5Ldelete_by_idx by alphabetical order in " - "decreasing order\n", - LINK_DELETE_TEST_HARD_LINK_NAME2); + printf(" couldn't delete hard link '%s' using H5Ldelete_by_idx by alphabetical order in " + "decreasing order\n", + LINK_DELETE_TEST_HARD_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_hard_name_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if hard link '%s' exists\n", - LINK_DELETE_TEST_HARD_LINK_NAME); + printf(" couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_hard_name_order_decreasing); } if (link_exists) { H5_FAILED(); - HDprintf(" hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME); + printf(" hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_hard_name_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if hard link '%s' exists\n", - LINK_DELETE_TEST_HARD_LINK_NAME2); + printf(" couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_hard_name_order_decreasing); } if (link_exists) { H5_FAILED(); - HDprintf(" hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME2); + printf(" hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_hard_name_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME3, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if hard link '%s' exists\n", - LINK_DELETE_TEST_HARD_LINK_NAME3); + printf(" couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_hard_name_order_decreasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" hard link '%s' did not exist after deletion of a different link!\n", - LINK_DELETE_TEST_HARD_LINK_NAME3); + printf(" hard link '%s' did not exist after deletion of a different link!\n", + LINK_DELETE_TEST_HARD_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_hard_name_order_decreasing); } if (H5Ldelete_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 0, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't delete hard link '%s' using H5Ldelete_by_idx by alphabetical order in " - "decreasing order\n", - LINK_DELETE_TEST_HARD_LINK_NAME3); + printf(" couldn't delete hard link '%s' using H5Ldelete_by_idx by alphabetical order in " + "decreasing order\n", + LINK_DELETE_TEST_HARD_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_hard_name_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if hard link '%s' exists\n", - LINK_DELETE_TEST_HARD_LINK_NAME); + printf(" couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_hard_name_order_decreasing); } if (link_exists) { H5_FAILED(); - HDprintf(" hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME); + printf(" hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_hard_name_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if hard link '%s' exists\n", - LINK_DELETE_TEST_HARD_LINK_NAME2); + printf(" couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_hard_name_order_decreasing); } if (link_exists) { H5_FAILED(); - HDprintf(" hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME2); + printf(" hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_hard_name_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME3, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if hard link '%s' exists\n", - LINK_DELETE_TEST_HARD_LINK_NAME3); + printf(" couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_hard_name_order_decreasing); } if (link_exists) { H5_FAILED(); - HDprintf(" hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME3); + printf(" hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_hard_name_order_decreasing); } if (H5Gclose(subgroup_id) < 0) { H5_FAILED(); - HDprintf(" failed to close group '%s'\n", LINK_DELETE_TEST_SUBGROUP8_NAME); + printf(" failed to close group '%s'\n", LINK_DELETE_TEST_SUBGROUP8_NAME); PART_ERROR(H5Ldelete_by_idx_hard_name_order_decreasing); } @@ -4839,14 +4780,14 @@ test_delete_link(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" creation order tracking isn't supported with this VOL connector\n"); + printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Ldelete_by_idx_soft_crt_order_increasing); } if ((subgroup_id = H5Gcreate2(group_id, LINK_DELETE_TEST_SUBGROUP9_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create subgroup '%s'\n", LINK_DELETE_TEST_SUBGROUP9_NAME); + printf(" couldn't create subgroup '%s'\n", LINK_DELETE_TEST_SUBGROUP9_NAME); PART_ERROR(H5Ldelete_by_idx_soft_crt_order_increasing); } @@ -4855,7 +4796,7 @@ test_delete_link(void) "/" LINK_DELETE_TEST_SUBGROUP9_NAME, subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create soft link '%s'\n", LINK_DELETE_TEST_SOFT_LINK_NAME); + printf(" couldn't create soft link '%s'\n", LINK_DELETE_TEST_SOFT_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_soft_crt_order_increasing); } @@ -4863,7 +4804,7 @@ test_delete_link(void) "/" LINK_DELETE_TEST_SUBGROUP9_NAME, subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create soft link '%s'\n", LINK_DELETE_TEST_SOFT_LINK_NAME2); + printf(" couldn't create soft link '%s'\n", LINK_DELETE_TEST_SOFT_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_soft_crt_order_increasing); } @@ -4871,203 +4812,190 @@ test_delete_link(void) "/" LINK_DELETE_TEST_SUBGROUP9_NAME, subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create soft link '%s'\n", LINK_DELETE_TEST_SOFT_LINK_NAME3); + printf(" couldn't create soft link '%s'\n", LINK_DELETE_TEST_SOFT_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_soft_crt_order_increasing); } /* Verify the links have been created */ if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if soft link '%s' exists\n", - LINK_DELETE_TEST_SOFT_LINK_NAME); + printf(" couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_soft_crt_order_increasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" soft link '%s' did not exist before deletion\n", - LINK_DELETE_TEST_SOFT_LINK_NAME); + printf(" soft link '%s' did not exist before deletion\n", LINK_DELETE_TEST_SOFT_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_soft_crt_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if soft link '%s' exists\n", - LINK_DELETE_TEST_SOFT_LINK_NAME2); + printf(" couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_soft_crt_order_increasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" soft link '%s' did not exist before deletion\n", - LINK_DELETE_TEST_SOFT_LINK_NAME2); + printf(" soft link '%s' did not exist before deletion\n", + LINK_DELETE_TEST_SOFT_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_soft_crt_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME3, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if soft link '%s' exists\n", - LINK_DELETE_TEST_SOFT_LINK_NAME3); + printf(" couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_soft_crt_order_increasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" soft link '%s' did not exist before deletion\n", - LINK_DELETE_TEST_SOFT_LINK_NAME3); + printf(" soft link '%s' did not exist before deletion\n", + LINK_DELETE_TEST_SOFT_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_soft_crt_order_increasing); } /* Delete a link */ if (H5Ldelete_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 0, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't delete soft link '%s' using H5Ldelete_by_idx by creation order in " - "increasing order\n", - LINK_DELETE_TEST_SOFT_LINK_NAME); + printf(" couldn't delete soft link '%s' using H5Ldelete_by_idx by creation order in " + "increasing order\n", + LINK_DELETE_TEST_SOFT_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_soft_crt_order_increasing); } /* Ensure that the link is gone and others remain */ if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if soft link '%s' exists\n", - LINK_DELETE_TEST_SOFT_LINK_NAME); + printf(" couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_soft_crt_order_increasing); } if (link_exists) { H5_FAILED(); - HDprintf(" soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME); + printf(" soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_soft_crt_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if soft link '%s' exists\n", - LINK_DELETE_TEST_SOFT_LINK_NAME2); + printf(" couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_soft_crt_order_increasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" soft link '%s' did not exist after deletion of a different link!\n", - LINK_DELETE_TEST_SOFT_LINK_NAME2); + printf(" soft link '%s' did not exist after deletion of a different link!\n", + LINK_DELETE_TEST_SOFT_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_soft_crt_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME3, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if soft link '%s' exists\n", - LINK_DELETE_TEST_SOFT_LINK_NAME3); + printf(" couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_soft_crt_order_increasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" soft link '%s' did not exist after deletion of a different link!\n", - LINK_DELETE_TEST_SOFT_LINK_NAME3); + printf(" soft link '%s' did not exist after deletion of a different link!\n", + LINK_DELETE_TEST_SOFT_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_soft_crt_order_increasing); } /* Repeat until all links have been deleted */ if (H5Ldelete_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 0, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't delete soft link '%s' using H5Ldelete_by_idx by creation order in " - "increasing order\n", - LINK_DELETE_TEST_SOFT_LINK_NAME2); + printf(" couldn't delete soft link '%s' using H5Ldelete_by_idx by creation order in " + "increasing order\n", + LINK_DELETE_TEST_SOFT_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_soft_crt_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if soft link '%s' exists\n", - LINK_DELETE_TEST_SOFT_LINK_NAME); + printf(" couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_soft_crt_order_increasing); } if (link_exists) { H5_FAILED(); - HDprintf(" soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME); + printf(" soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_soft_crt_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if soft link '%s' exists\n", - LINK_DELETE_TEST_SOFT_LINK_NAME2); + printf(" couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_soft_crt_order_increasing); } if (link_exists) { H5_FAILED(); - HDprintf(" soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME2); + printf(" soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_soft_crt_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME3, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if soft link '%s' exists\n", - LINK_DELETE_TEST_SOFT_LINK_NAME3); + printf(" couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_soft_crt_order_increasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" soft link '%s' did not exist after deletion of a different link!\n", - LINK_DELETE_TEST_SOFT_LINK_NAME3); + printf(" soft link '%s' did not exist after deletion of a different link!\n", + LINK_DELETE_TEST_SOFT_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_soft_crt_order_increasing); } if (H5Ldelete_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 0, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't delete soft link '%s' using H5Ldelete_by_idx by creation order in " - "increasing order\n", - LINK_DELETE_TEST_SOFT_LINK_NAME3); + printf(" couldn't delete soft link '%s' using H5Ldelete_by_idx by creation order in " + "increasing order\n", + LINK_DELETE_TEST_SOFT_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_soft_crt_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if soft link '%s' exists\n", - LINK_DELETE_TEST_SOFT_LINK_NAME); + printf(" couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_soft_crt_order_increasing); } if (link_exists) { H5_FAILED(); - HDprintf(" soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME); + printf(" soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_soft_crt_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if soft link '%s' exists\n", - LINK_DELETE_TEST_SOFT_LINK_NAME2); + printf(" couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_soft_crt_order_increasing); } if (link_exists) { H5_FAILED(); - HDprintf(" soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME2); + printf(" soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_soft_crt_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME3, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if soft link '%s' exists\n", - LINK_DELETE_TEST_SOFT_LINK_NAME3); + printf(" couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_soft_crt_order_increasing); } if (link_exists) { H5_FAILED(); - HDprintf(" soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME3); + printf(" soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_soft_crt_order_increasing); } if (H5Gclose(subgroup_id) < 0) { H5_FAILED(); - HDprintf(" failed to close group '%s'\n", LINK_DELETE_TEST_SUBGROUP9_NAME); + printf(" failed to close group '%s'\n", LINK_DELETE_TEST_SUBGROUP9_NAME); PART_ERROR(H5Ldelete_by_idx_soft_crt_order_increasing); } @@ -5088,14 +5016,14 @@ test_delete_link(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" creation order tracking isn't supported with this VOL connector\n"); + printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Ldelete_by_idx_soft_crt_order_decreasing); } if ((subgroup_id = H5Gcreate2(group_id, LINK_DELETE_TEST_SUBGROUP10_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create subgroup '%s'\n", LINK_DELETE_TEST_SUBGROUP10_NAME); + printf(" couldn't create subgroup '%s'\n", LINK_DELETE_TEST_SUBGROUP10_NAME); PART_ERROR(H5Ldelete_by_idx_soft_crt_order_decreasing); } @@ -5104,7 +5032,7 @@ test_delete_link(void) "/" LINK_DELETE_TEST_SUBGROUP10_NAME, subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create soft link '%s'\n", LINK_DELETE_TEST_SOFT_LINK_NAME); + printf(" couldn't create soft link '%s'\n", LINK_DELETE_TEST_SOFT_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_soft_crt_order_decreasing); } @@ -5112,7 +5040,7 @@ test_delete_link(void) "/" LINK_DELETE_TEST_SUBGROUP10_NAME, subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create soft link '%s'\n", LINK_DELETE_TEST_SOFT_LINK_NAME2); + printf(" couldn't create soft link '%s'\n", LINK_DELETE_TEST_SOFT_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_soft_crt_order_decreasing); } @@ -5120,203 +5048,190 @@ test_delete_link(void) "/" LINK_DELETE_TEST_SUBGROUP10_NAME, subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create soft link '%s'\n", LINK_DELETE_TEST_SOFT_LINK_NAME3); + printf(" couldn't create soft link '%s'\n", LINK_DELETE_TEST_SOFT_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_soft_crt_order_decreasing); } /* Verify the links have been created */ if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if soft link '%s' exists\n", - LINK_DELETE_TEST_SOFT_LINK_NAME); + printf(" couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_soft_crt_order_decreasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" soft link '%s' did not exist before deletion\n", - LINK_DELETE_TEST_SOFT_LINK_NAME); + printf(" soft link '%s' did not exist before deletion\n", LINK_DELETE_TEST_SOFT_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_soft_crt_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if soft link '%s' exists\n", - LINK_DELETE_TEST_SOFT_LINK_NAME2); + printf(" couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_soft_crt_order_decreasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" soft link '%s' did not exist before deletion\n", - LINK_DELETE_TEST_SOFT_LINK_NAME2); + printf(" soft link '%s' did not exist before deletion\n", + LINK_DELETE_TEST_SOFT_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_soft_crt_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME3, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if soft link '%s' exists\n", - LINK_DELETE_TEST_SOFT_LINK_NAME3); + printf(" couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_soft_crt_order_decreasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" soft link '%s' did not exist before deletion\n", - LINK_DELETE_TEST_SOFT_LINK_NAME3); + printf(" soft link '%s' did not exist before deletion\n", + LINK_DELETE_TEST_SOFT_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_soft_crt_order_decreasing); } /* Delete a link */ if (H5Ldelete_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 2, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't delete soft link '%s' using H5Ldelete_by_idx by creation order in " - "decreasing order\n", - LINK_DELETE_TEST_SOFT_LINK_NAME); + printf(" couldn't delete soft link '%s' using H5Ldelete_by_idx by creation order in " + "decreasing order\n", + LINK_DELETE_TEST_SOFT_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_soft_crt_order_decreasing); } /* Ensure that the link is gone and others remain */ if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if soft link '%s' exists\n", - LINK_DELETE_TEST_SOFT_LINK_NAME); + printf(" couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_soft_crt_order_decreasing); } if (link_exists) { H5_FAILED(); - HDprintf(" soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME); + printf(" soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_soft_crt_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if soft link '%s' exists\n", - LINK_DELETE_TEST_SOFT_LINK_NAME2); + printf(" couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_soft_crt_order_decreasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" soft link '%s' did not exist after deletion of a different link!\n", - LINK_DELETE_TEST_SOFT_LINK_NAME2); + printf(" soft link '%s' did not exist after deletion of a different link!\n", + LINK_DELETE_TEST_SOFT_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_soft_crt_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME3, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if soft link '%s' exists\n", - LINK_DELETE_TEST_SOFT_LINK_NAME3); + printf(" couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_soft_crt_order_decreasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" soft link '%s' did not exist after deletion of a different link!\n", - LINK_DELETE_TEST_SOFT_LINK_NAME3); + printf(" soft link '%s' did not exist after deletion of a different link!\n", + LINK_DELETE_TEST_SOFT_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_soft_crt_order_decreasing); } /* Repeat until all links have been deleted */ if (H5Ldelete_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 1, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't delete soft link '%s' using H5Ldelete_by_idx by creation order in " - "decreasing order\n", - LINK_DELETE_TEST_SOFT_LINK_NAME2); + printf(" couldn't delete soft link '%s' using H5Ldelete_by_idx by creation order in " + "decreasing order\n", + LINK_DELETE_TEST_SOFT_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_soft_crt_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if soft link '%s' exists\n", - LINK_DELETE_TEST_SOFT_LINK_NAME); + printf(" couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_soft_crt_order_decreasing); } if (link_exists) { H5_FAILED(); - HDprintf(" soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME); + printf(" soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_soft_crt_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if soft link '%s' exists\n", - LINK_DELETE_TEST_SOFT_LINK_NAME2); + printf(" couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_soft_crt_order_decreasing); } if (link_exists) { H5_FAILED(); - HDprintf(" soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME2); + printf(" soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_soft_crt_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME3, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if soft link '%s' exists\n", - LINK_DELETE_TEST_SOFT_LINK_NAME3); + printf(" couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_soft_crt_order_decreasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" soft link '%s' did not exist after deletion of a different link!\n", - LINK_DELETE_TEST_SOFT_LINK_NAME3); + printf(" soft link '%s' did not exist after deletion of a different link!\n", + LINK_DELETE_TEST_SOFT_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_soft_crt_order_decreasing); } if (H5Ldelete_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 0, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't delete soft link '%s' using H5Ldelete_by_idx by creation order in " - "decreasing order\n", - LINK_DELETE_TEST_SOFT_LINK_NAME3); + printf(" couldn't delete soft link '%s' using H5Ldelete_by_idx by creation order in " + "decreasing order\n", + LINK_DELETE_TEST_SOFT_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_soft_crt_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if soft link '%s' exists\n", - LINK_DELETE_TEST_SOFT_LINK_NAME); + printf(" couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_soft_crt_order_decreasing); } if (link_exists) { H5_FAILED(); - HDprintf(" soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME); + printf(" soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_soft_crt_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if soft link '%s' exists\n", - LINK_DELETE_TEST_SOFT_LINK_NAME2); + printf(" couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_soft_crt_order_decreasing); } if (link_exists) { H5_FAILED(); - HDprintf(" soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME2); + printf(" soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_soft_crt_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME3, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if soft link '%s' exists\n", - LINK_DELETE_TEST_SOFT_LINK_NAME3); + printf(" couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_soft_crt_order_decreasing); } if (link_exists) { H5_FAILED(); - HDprintf(" soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME3); + printf(" soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_soft_crt_order_decreasing); } if (H5Gclose(subgroup_id) < 0) { H5_FAILED(); - HDprintf(" failed to close group '%s'\n", LINK_DELETE_TEST_SUBGROUP10_NAME); + printf(" failed to close group '%s'\n", LINK_DELETE_TEST_SUBGROUP10_NAME); PART_ERROR(H5Ldelete_by_idx_soft_crt_order_decreasing); } @@ -5338,7 +5253,7 @@ test_delete_link(void) if ((subgroup_id = H5Gcreate2(group_id, LINK_DELETE_TEST_SUBGROUP11_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create subgroup '%s'\n", LINK_DELETE_TEST_SUBGROUP11_NAME); + printf(" couldn't create subgroup '%s'\n", LINK_DELETE_TEST_SUBGROUP11_NAME); PART_ERROR(H5Ldelete_by_idx_soft_name_order_increasing); } @@ -5347,7 +5262,7 @@ test_delete_link(void) "/" LINK_DELETE_TEST_SUBGROUP11_NAME, subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create soft link '%s'\n", LINK_DELETE_TEST_SOFT_LINK_NAME); + printf(" couldn't create soft link '%s'\n", LINK_DELETE_TEST_SOFT_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_soft_name_order_increasing); } @@ -5355,7 +5270,7 @@ test_delete_link(void) "/" LINK_DELETE_TEST_SUBGROUP11_NAME, subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create soft link '%s'\n", LINK_DELETE_TEST_SOFT_LINK_NAME2); + printf(" couldn't create soft link '%s'\n", LINK_DELETE_TEST_SOFT_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_soft_name_order_increasing); } @@ -5363,203 +5278,190 @@ test_delete_link(void) "/" LINK_DELETE_TEST_SUBGROUP11_NAME, subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create soft link '%s'\n", LINK_DELETE_TEST_SOFT_LINK_NAME3); + printf(" couldn't create soft link '%s'\n", LINK_DELETE_TEST_SOFT_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_soft_name_order_increasing); } /* Verify the links have been created */ if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if soft link '%s' exists\n", - LINK_DELETE_TEST_SOFT_LINK_NAME); + printf(" couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_soft_name_order_increasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" soft link '%s' did not exist before deletion\n", - LINK_DELETE_TEST_SOFT_LINK_NAME); + printf(" soft link '%s' did not exist before deletion\n", LINK_DELETE_TEST_SOFT_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_soft_name_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if soft link '%s' exists\n", - LINK_DELETE_TEST_SOFT_LINK_NAME2); + printf(" couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_soft_name_order_increasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" soft link '%s' did not exist before deletion\n", - LINK_DELETE_TEST_SOFT_LINK_NAME2); + printf(" soft link '%s' did not exist before deletion\n", + LINK_DELETE_TEST_SOFT_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_soft_name_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME3, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if soft link '%s' exists\n", - LINK_DELETE_TEST_SOFT_LINK_NAME3); + printf(" couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_soft_name_order_increasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" soft link '%s' did not exist before deletion\n", - LINK_DELETE_TEST_SOFT_LINK_NAME3); + printf(" soft link '%s' did not exist before deletion\n", + LINK_DELETE_TEST_SOFT_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_soft_name_order_increasing); } /* Delete a link */ if (H5Ldelete_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 0, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't delete soft link '%s' using H5Ldelete_by_idx by alphabetical order in " - "increasing order\n", - LINK_DELETE_TEST_SOFT_LINK_NAME); + printf(" couldn't delete soft link '%s' using H5Ldelete_by_idx by alphabetical order in " + "increasing order\n", + LINK_DELETE_TEST_SOFT_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_soft_name_order_increasing); } /* Ensure that the link is gone and others remain */ if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if soft link '%s' exists\n", - LINK_DELETE_TEST_SOFT_LINK_NAME); + printf(" couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_soft_name_order_increasing); } if (link_exists) { H5_FAILED(); - HDprintf(" soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME); + printf(" soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_soft_name_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if soft link '%s' exists\n", - LINK_DELETE_TEST_SOFT_LINK_NAME2); + printf(" couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_soft_name_order_increasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" soft link '%s' did not exist after deletion of a different link!\n", - LINK_DELETE_TEST_SOFT_LINK_NAME2); + printf(" soft link '%s' did not exist after deletion of a different link!\n", + LINK_DELETE_TEST_SOFT_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_soft_name_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME3, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if soft link '%s' exists\n", - LINK_DELETE_TEST_SOFT_LINK_NAME3); + printf(" couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_soft_name_order_increasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" soft link '%s' did not exist after deletion of a different link!\n", - LINK_DELETE_TEST_SOFT_LINK_NAME3); + printf(" soft link '%s' did not exist after deletion of a different link!\n", + LINK_DELETE_TEST_SOFT_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_soft_name_order_increasing); } /* Repeat until all links have been deleted */ if (H5Ldelete_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 0, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't delete soft link '%s' using H5Ldelete_by_idx by alphabetical order in " - "increasing order\n", - LINK_DELETE_TEST_SOFT_LINK_NAME2); + printf(" couldn't delete soft link '%s' using H5Ldelete_by_idx by alphabetical order in " + "increasing order\n", + LINK_DELETE_TEST_SOFT_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_soft_name_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if soft link '%s' exists\n", - LINK_DELETE_TEST_SOFT_LINK_NAME); + printf(" couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_soft_name_order_increasing); } if (link_exists) { H5_FAILED(); - HDprintf(" soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME); + printf(" soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_soft_name_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if soft link '%s' exists\n", - LINK_DELETE_TEST_SOFT_LINK_NAME2); + printf(" couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_soft_name_order_increasing); } if (link_exists) { H5_FAILED(); - HDprintf(" soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME2); + printf(" soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_soft_name_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME3, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if soft link '%s' exists\n", - LINK_DELETE_TEST_SOFT_LINK_NAME3); + printf(" couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_soft_name_order_increasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" soft link '%s' did not exist after deletion of a different link!\n", - LINK_DELETE_TEST_SOFT_LINK_NAME3); + printf(" soft link '%s' did not exist after deletion of a different link!\n", + LINK_DELETE_TEST_SOFT_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_soft_name_order_increasing); } if (H5Ldelete_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 0, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't delete soft link '%s' using H5Ldelete_by_idx by alphabetical order in " - "increasing order\n", - LINK_DELETE_TEST_SOFT_LINK_NAME3); + printf(" couldn't delete soft link '%s' using H5Ldelete_by_idx by alphabetical order in " + "increasing order\n", + LINK_DELETE_TEST_SOFT_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_soft_name_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if soft link '%s' exists\n", - LINK_DELETE_TEST_SOFT_LINK_NAME); + printf(" couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_soft_name_order_increasing); } if (link_exists) { H5_FAILED(); - HDprintf(" soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME); + printf(" soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_soft_name_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if soft link '%s' exists\n", - LINK_DELETE_TEST_SOFT_LINK_NAME2); + printf(" couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_soft_name_order_increasing); } if (link_exists) { H5_FAILED(); - HDprintf(" soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME2); + printf(" soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_soft_name_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME3, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if soft link '%s' exists\n", - LINK_DELETE_TEST_SOFT_LINK_NAME3); + printf(" couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_soft_name_order_increasing); } if (link_exists) { H5_FAILED(); - HDprintf(" soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME3); + printf(" soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_soft_name_order_increasing); } if (H5Gclose(subgroup_id) < 0) { H5_FAILED(); - HDprintf(" failed to close group '%s'\n", LINK_DELETE_TEST_SUBGROUP11_NAME); + printf(" failed to close group '%s'\n", LINK_DELETE_TEST_SUBGROUP11_NAME); PART_ERROR(H5Ldelete_by_idx_soft_name_order_increasing); } @@ -5581,7 +5483,7 @@ test_delete_link(void) if ((subgroup_id = H5Gcreate2(group_id, LINK_DELETE_TEST_SUBGROUP12_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create subgroup '%s'\n", LINK_DELETE_TEST_SUBGROUP12_NAME); + printf(" couldn't create subgroup '%s'\n", LINK_DELETE_TEST_SUBGROUP12_NAME); PART_ERROR(H5Ldelete_by_idx_soft_name_order_decreasing); } @@ -5590,7 +5492,7 @@ test_delete_link(void) "/" LINK_DELETE_TEST_SUBGROUP12_NAME, subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create soft link '%s'\n", LINK_DELETE_TEST_SOFT_LINK_NAME); + printf(" couldn't create soft link '%s'\n", LINK_DELETE_TEST_SOFT_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_soft_name_order_decreasing); } @@ -5598,7 +5500,7 @@ test_delete_link(void) "/" LINK_DELETE_TEST_SUBGROUP12_NAME, subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create soft link '%s'\n", LINK_DELETE_TEST_SOFT_LINK_NAME2); + printf(" couldn't create soft link '%s'\n", LINK_DELETE_TEST_SOFT_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_soft_name_order_decreasing); } @@ -5606,203 +5508,190 @@ test_delete_link(void) "/" LINK_DELETE_TEST_SUBGROUP12_NAME, subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create soft link '%s'\n", LINK_DELETE_TEST_SOFT_LINK_NAME3); + printf(" couldn't create soft link '%s'\n", LINK_DELETE_TEST_SOFT_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_soft_name_order_decreasing); } /* Verify the links have been created */ if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if soft link '%s' exists\n", - LINK_DELETE_TEST_SOFT_LINK_NAME); + printf(" couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_soft_name_order_decreasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" soft link '%s' did not exist before deletion\n", - LINK_DELETE_TEST_SOFT_LINK_NAME); + printf(" soft link '%s' did not exist before deletion\n", LINK_DELETE_TEST_SOFT_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_soft_name_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if soft link '%s' exists\n", - LINK_DELETE_TEST_SOFT_LINK_NAME2); + printf(" couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_soft_name_order_decreasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" soft link '%s' did not exist before deletion\n", - LINK_DELETE_TEST_SOFT_LINK_NAME2); + printf(" soft link '%s' did not exist before deletion\n", + LINK_DELETE_TEST_SOFT_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_soft_name_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME3, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if soft link '%s' exists\n", - LINK_DELETE_TEST_SOFT_LINK_NAME3); + printf(" couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_soft_name_order_decreasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" soft link '%s' did not exist before deletion\n", - LINK_DELETE_TEST_SOFT_LINK_NAME3); + printf(" soft link '%s' did not exist before deletion\n", + LINK_DELETE_TEST_SOFT_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_soft_name_order_decreasing); } /* Delete a link */ if (H5Ldelete_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 2, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't delete soft link '%s' using H5Ldelete_by_idx by alphabetical order in " - "decreasing order\n", - LINK_DELETE_TEST_SOFT_LINK_NAME); + printf(" couldn't delete soft link '%s' using H5Ldelete_by_idx by alphabetical order in " + "decreasing order\n", + LINK_DELETE_TEST_SOFT_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_soft_name_order_decreasing); } /* Ensure that the link is gone and others remain */ if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if soft link '%s' exists\n", - LINK_DELETE_TEST_SOFT_LINK_NAME); + printf(" couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_soft_name_order_decreasing); } if (link_exists) { H5_FAILED(); - HDprintf(" soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME); + printf(" soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_soft_name_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if soft link '%s' exists\n", - LINK_DELETE_TEST_SOFT_LINK_NAME2); + printf(" couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_soft_name_order_decreasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" soft link '%s' did not exist after deletion of a different link!\n", - LINK_DELETE_TEST_SOFT_LINK_NAME2); + printf(" soft link '%s' did not exist after deletion of a different link!\n", + LINK_DELETE_TEST_SOFT_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_soft_name_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME3, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if soft link '%s' exists\n", - LINK_DELETE_TEST_SOFT_LINK_NAME3); + printf(" couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_soft_name_order_decreasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" soft link '%s' did not exist after deletion of a different link!\n", - LINK_DELETE_TEST_SOFT_LINK_NAME3); + printf(" soft link '%s' did not exist after deletion of a different link!\n", + LINK_DELETE_TEST_SOFT_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_soft_name_order_decreasing); } /* Repeat until all links have been deleted */ if (H5Ldelete_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 1, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't delete soft link '%s' using H5Ldelete_by_idx by alphabetical order in " - "decreasing order\n", - LINK_DELETE_TEST_SOFT_LINK_NAME2); + printf(" couldn't delete soft link '%s' using H5Ldelete_by_idx by alphabetical order in " + "decreasing order\n", + LINK_DELETE_TEST_SOFT_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_soft_name_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if soft link '%s' exists\n", - LINK_DELETE_TEST_SOFT_LINK_NAME); + printf(" couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_soft_name_order_decreasing); } if (link_exists) { H5_FAILED(); - HDprintf(" soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME); + printf(" soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_soft_name_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if soft link '%s' exists\n", - LINK_DELETE_TEST_SOFT_LINK_NAME2); + printf(" couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_soft_name_order_decreasing); } if (link_exists) { H5_FAILED(); - HDprintf(" soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME2); + printf(" soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_soft_name_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME3, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if soft link '%s' exists\n", - LINK_DELETE_TEST_SOFT_LINK_NAME3); + printf(" couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_soft_name_order_decreasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" soft link '%s' did not exist after deletion of a different link!\n", - LINK_DELETE_TEST_SOFT_LINK_NAME3); + printf(" soft link '%s' did not exist after deletion of a different link!\n", + LINK_DELETE_TEST_SOFT_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_soft_name_order_decreasing); } if (H5Ldelete_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 0, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't delete soft link '%s' using H5Ldelete_by_idx by alphabetical order in " - "decreasing order\n", - LINK_DELETE_TEST_SOFT_LINK_NAME3); + printf(" couldn't delete soft link '%s' using H5Ldelete_by_idx by alphabetical order in " + "decreasing order\n", + LINK_DELETE_TEST_SOFT_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_soft_name_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if soft link '%s' exists\n", - LINK_DELETE_TEST_SOFT_LINK_NAME); + printf(" couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_soft_name_order_decreasing); } if (link_exists) { H5_FAILED(); - HDprintf(" soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME); + printf(" soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_soft_name_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if soft link '%s' exists\n", - LINK_DELETE_TEST_SOFT_LINK_NAME2); + printf(" couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_soft_name_order_decreasing); } if (link_exists) { H5_FAILED(); - HDprintf(" soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME2); + printf(" soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_soft_name_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME3, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if soft link '%s' exists\n", - LINK_DELETE_TEST_SOFT_LINK_NAME3); + printf(" couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_soft_name_order_decreasing); } if (link_exists) { H5_FAILED(); - HDprintf(" soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME3); + printf(" soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_soft_name_order_decreasing); } if (H5Gclose(subgroup_id) < 0) { H5_FAILED(); - HDprintf(" failed to close group '%s'\n", LINK_DELETE_TEST_SUBGROUP12_NAME); + printf(" failed to close group '%s'\n", LINK_DELETE_TEST_SUBGROUP12_NAME); PART_ERROR(H5Ldelete_by_idx_soft_name_order_decreasing); } @@ -5823,7 +5712,7 @@ test_delete_link(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" creation order tracking isn't supported with this VOL connector\n"); + printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Ldelete_by_idx_external_crt_order_increasing); } @@ -5833,20 +5722,20 @@ test_delete_link(void) if ((ext_file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); + printf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); PART_ERROR(H5Ldelete_by_idx_external_crt_order_increasing); } if (H5Fclose(ext_file_id) < 0) { H5_FAILED(); - HDprintf(" couldn't close file '%s'\n", ext_link_filename); + printf(" couldn't close file '%s'\n", ext_link_filename); PART_ERROR(H5Ldelete_by_idx_external_crt_order_increasing); } if ((subgroup_id = H5Gcreate2(group_id, LINK_DELETE_TEST_SUBGROUP13_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create subgroup '%s'\n", LINK_DELETE_TEST_SUBGROUP13_NAME); + printf(" couldn't create subgroup '%s'\n", LINK_DELETE_TEST_SUBGROUP13_NAME); PART_ERROR(H5Ldelete_by_idx_external_crt_order_increasing); } @@ -5854,21 +5743,21 @@ test_delete_link(void) if (H5Lcreate_external(ext_link_filename, "/", subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create external link '%s'\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME); + printf(" couldn't create external link '%s'\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_external_crt_order_increasing); } if (H5Lcreate_external(ext_link_filename, "/", subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create external link '%s'\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); + printf(" couldn't create external link '%s'\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_external_crt_order_increasing); } if (H5Lcreate_external(ext_link_filename, "/", subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create external link '%s'\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); + printf(" couldn't create external link '%s'\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_external_crt_order_increasing); } @@ -5876,54 +5765,54 @@ test_delete_link(void) if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if external link '%s' exists\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME); + printf(" couldn't determine if external link '%s' exists\n", + LINK_DELETE_TEST_EXTERNAL_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_external_crt_order_increasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" external link '%s' did not exist before deletion\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME); + printf(" external link '%s' did not exist before deletion\n", + LINK_DELETE_TEST_EXTERNAL_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_external_crt_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if external link '%s' exists\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); + printf(" couldn't determine if external link '%s' exists\n", + LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_external_crt_order_increasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" external link '%s' did not exist before deletion\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); + printf(" external link '%s' did not exist before deletion\n", + LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_external_crt_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME3, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if external link '%s' exists\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); + printf(" couldn't determine if external link '%s' exists\n", + LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_external_crt_order_increasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" external link '%s' did not exist before deletion\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); + printf(" external link '%s' did not exist before deletion\n", + LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_external_crt_order_increasing); } /* Delete a link */ if (H5Ldelete_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 0, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't delete external link '%s' using H5Ldelete_by_idx by creation order in " - "increasing order\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME); + printf(" couldn't delete external link '%s' using H5Ldelete_by_idx by creation order in " + "increasing order\n", + LINK_DELETE_TEST_EXTERNAL_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_external_crt_order_increasing); } @@ -5931,158 +5820,158 @@ test_delete_link(void) if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if external link '%s' exists\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME); + printf(" couldn't determine if external link '%s' exists\n", + LINK_DELETE_TEST_EXTERNAL_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_external_crt_order_increasing); } if (link_exists) { H5_FAILED(); - HDprintf(" external link '%s' exists after deletion!\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME); + printf(" external link '%s' exists after deletion!\n", + LINK_DELETE_TEST_EXTERNAL_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_external_crt_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if external link '%s' exists\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); + printf(" couldn't determine if external link '%s' exists\n", + LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_external_crt_order_increasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" external link '%s' did not exist after deletion of a different link!\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); + printf(" external link '%s' did not exist after deletion of a different link!\n", + LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_external_crt_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME3, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if external link '%s' exists\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); + printf(" couldn't determine if external link '%s' exists\n", + LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_external_crt_order_increasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" external link '%s' did not exist after deletion of a different link!\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); + printf(" external link '%s' did not exist after deletion of a different link!\n", + LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_external_crt_order_increasing); } /* Repeat until all links have been deleted */ if (H5Ldelete_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 0, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't delete external link '%s' using H5Ldelete_by_idx by creation order in " - "increasing order\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); + printf(" couldn't delete external link '%s' using H5Ldelete_by_idx by creation order in " + "increasing order\n", + LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_external_crt_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if external link '%s' exists\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME); + printf(" couldn't determine if external link '%s' exists\n", + LINK_DELETE_TEST_EXTERNAL_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_external_crt_order_increasing); } if (link_exists) { H5_FAILED(); - HDprintf(" external link '%s' exists after deletion!\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME); + printf(" external link '%s' exists after deletion!\n", + LINK_DELETE_TEST_EXTERNAL_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_external_crt_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if external link '%s' exists\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); + printf(" couldn't determine if external link '%s' exists\n", + LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_external_crt_order_increasing); } if (link_exists) { H5_FAILED(); - HDprintf(" external link '%s' exists after deletion!\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); + printf(" external link '%s' exists after deletion!\n", + LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_external_crt_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME3, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if external link '%s' exists\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); + printf(" couldn't determine if external link '%s' exists\n", + LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_external_crt_order_increasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" external link '%s' did not exist after deletion of a different link!\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); + printf(" external link '%s' did not exist after deletion of a different link!\n", + LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_external_crt_order_increasing); } if (H5Ldelete_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 0, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't delete external link '%s' using H5Ldelete_by_idx by creation order in " - "increasing order\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); + printf(" couldn't delete external link '%s' using H5Ldelete_by_idx by creation order in " + "increasing order\n", + LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_external_crt_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if external link '%s' exists\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME); + printf(" couldn't determine if external link '%s' exists\n", + LINK_DELETE_TEST_EXTERNAL_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_external_crt_order_increasing); } if (link_exists) { H5_FAILED(); - HDprintf(" external link '%s' exists after deletion!\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME); + printf(" external link '%s' exists after deletion!\n", + LINK_DELETE_TEST_EXTERNAL_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_external_crt_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if external link '%s' exists\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); + printf(" couldn't determine if external link '%s' exists\n", + LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_external_crt_order_increasing); } if (link_exists) { H5_FAILED(); - HDprintf(" external link '%s' exists after deletion!\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); + printf(" external link '%s' exists after deletion!\n", + LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_external_crt_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME3, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if external link '%s' exists\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); + printf(" couldn't determine if external link '%s' exists\n", + LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_external_crt_order_increasing); } if (link_exists) { H5_FAILED(); - HDprintf(" external link '%s' exists after deletion!\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); + printf(" external link '%s' exists after deletion!\n", + LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_external_crt_order_increasing); } if (H5Gclose(subgroup_id) < 0) { H5_FAILED(); - HDprintf(" failed to close group '%s'\n", LINK_DELETE_TEST_SUBGROUP13_NAME); + printf(" failed to close group '%s'\n", LINK_DELETE_TEST_SUBGROUP13_NAME); PART_ERROR(H5Ldelete_by_idx_external_crt_order_increasing); } @@ -6105,7 +5994,7 @@ test_delete_link(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" creation order tracking isn't supported with this VOL connector\n"); + printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Ldelete_by_idx_external_crt_order_decreasing); } @@ -6115,20 +6004,20 @@ test_delete_link(void) if ((ext_file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); + printf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); PART_ERROR(H5Ldelete_by_idx_external_crt_order_decreasing); } if (H5Fclose(ext_file_id) < 0) { H5_FAILED(); - HDprintf(" couldn't close file '%s'\n", ext_link_filename); + printf(" couldn't close file '%s'\n", ext_link_filename); PART_ERROR(H5Ldelete_by_idx_external_crt_order_decreasing); } if ((subgroup_id = H5Gcreate2(group_id, LINK_DELETE_TEST_SUBGROUP14_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create subgroup '%s'\n", LINK_DELETE_TEST_SUBGROUP14_NAME); + printf(" couldn't create subgroup '%s'\n", LINK_DELETE_TEST_SUBGROUP14_NAME); PART_ERROR(H5Ldelete_by_idx_external_crt_order_decreasing); } @@ -6136,21 +6025,21 @@ test_delete_link(void) if (H5Lcreate_external(ext_link_filename, "/", subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create external link '%s'\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME); + printf(" couldn't create external link '%s'\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_external_crt_order_decreasing); } if (H5Lcreate_external(ext_link_filename, "/", subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create external link '%s'\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); + printf(" couldn't create external link '%s'\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_external_crt_order_decreasing); } if (H5Lcreate_external(ext_link_filename, "/", subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create external link '%s'\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); + printf(" couldn't create external link '%s'\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_external_crt_order_decreasing); } @@ -6158,54 +6047,54 @@ test_delete_link(void) if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if external link '%s' exists\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME); + printf(" couldn't determine if external link '%s' exists\n", + LINK_DELETE_TEST_EXTERNAL_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_external_crt_order_decreasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" external link '%s' did not exist before deletion\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME); + printf(" external link '%s' did not exist before deletion\n", + LINK_DELETE_TEST_EXTERNAL_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_external_crt_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if external link '%s' exists\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); + printf(" couldn't determine if external link '%s' exists\n", + LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_external_crt_order_decreasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" external link '%s' did not exist before deletion\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); + printf(" external link '%s' did not exist before deletion\n", + LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_external_crt_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME3, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if external link '%s' exists\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); + printf(" couldn't determine if external link '%s' exists\n", + LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_external_crt_order_decreasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" external link '%s' did not exist before deletion\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); + printf(" external link '%s' did not exist before deletion\n", + LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_external_crt_order_decreasing); } /* Delete a link */ if (H5Ldelete_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 2, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't delete external link '%s' using H5Ldelete_by_idx by creation order in " - "decreasing order\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME); + printf(" couldn't delete external link '%s' using H5Ldelete_by_idx by creation order in " + "decreasing order\n", + LINK_DELETE_TEST_EXTERNAL_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_external_crt_order_decreasing); } @@ -6213,158 +6102,158 @@ test_delete_link(void) if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if external link '%s' exists\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME); + printf(" couldn't determine if external link '%s' exists\n", + LINK_DELETE_TEST_EXTERNAL_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_external_crt_order_decreasing); } if (link_exists) { H5_FAILED(); - HDprintf(" external link '%s' exists after deletion!\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME); + printf(" external link '%s' exists after deletion!\n", + LINK_DELETE_TEST_EXTERNAL_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_external_crt_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if external link '%s' exists\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); + printf(" couldn't determine if external link '%s' exists\n", + LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_external_crt_order_decreasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" external link '%s' did not exist after deletion of a different link!\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); + printf(" external link '%s' did not exist after deletion of a different link!\n", + LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_external_crt_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME3, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if external link '%s' exists\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); + printf(" couldn't determine if external link '%s' exists\n", + LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_external_crt_order_decreasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" external link '%s' did not exist after deletion of a different link!\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); + printf(" external link '%s' did not exist after deletion of a different link!\n", + LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_external_crt_order_decreasing); } /* Repeat until all links have been deleted */ if (H5Ldelete_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 1, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't delete external link '%s' using H5Ldelete_by_idx by creation order in " - "decreasing order\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); + printf(" couldn't delete external link '%s' using H5Ldelete_by_idx by creation order in " + "decreasing order\n", + LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_external_crt_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if external link '%s' exists\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME); + printf(" couldn't determine if external link '%s' exists\n", + LINK_DELETE_TEST_EXTERNAL_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_external_crt_order_decreasing); } if (link_exists) { H5_FAILED(); - HDprintf(" external link '%s' exists after deletion!\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME); + printf(" external link '%s' exists after deletion!\n", + LINK_DELETE_TEST_EXTERNAL_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_external_crt_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if external link '%s' exists\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); + printf(" couldn't determine if external link '%s' exists\n", + LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_external_crt_order_decreasing); } if (link_exists) { H5_FAILED(); - HDprintf(" external link '%s' exists after deletion!\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); + printf(" external link '%s' exists after deletion!\n", + LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_external_crt_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME3, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if external link '%s' exists\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); + printf(" couldn't determine if external link '%s' exists\n", + LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_external_crt_order_decreasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" external link '%s' did not exist after deletion of a different link!\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); + printf(" external link '%s' did not exist after deletion of a different link!\n", + LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_external_crt_order_decreasing); } if (H5Ldelete_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 0, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't delete external link '%s' using H5Ldelete_by_idx by creation order in " - "decreasing order\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); + printf(" couldn't delete external link '%s' using H5Ldelete_by_idx by creation order in " + "decreasing order\n", + LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_external_crt_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if external link '%s' exists\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME); + printf(" couldn't determine if external link '%s' exists\n", + LINK_DELETE_TEST_EXTERNAL_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_external_crt_order_decreasing); } if (link_exists) { H5_FAILED(); - HDprintf(" external link '%s' exists after deletion!\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME); + printf(" external link '%s' exists after deletion!\n", + LINK_DELETE_TEST_EXTERNAL_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_external_crt_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if external link '%s' exists\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); + printf(" couldn't determine if external link '%s' exists\n", + LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_external_crt_order_decreasing); } if (link_exists) { H5_FAILED(); - HDprintf(" external link '%s' exists after deletion!\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); + printf(" external link '%s' exists after deletion!\n", + LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_external_crt_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME3, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if external link '%s' exists\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); + printf(" couldn't determine if external link '%s' exists\n", + LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_external_crt_order_decreasing); } if (link_exists) { H5_FAILED(); - HDprintf(" external link '%s' exists after deletion!\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); + printf(" external link '%s' exists after deletion!\n", + LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_external_crt_order_decreasing); } if (H5Gclose(subgroup_id) < 0) { H5_FAILED(); - HDprintf(" failed to close group '%s'\n", LINK_DELETE_TEST_SUBGROUP14_NAME); + printf(" failed to close group '%s'\n", LINK_DELETE_TEST_SUBGROUP14_NAME); PART_ERROR(H5Ldelete_by_idx_external_crt_order_decreasing); } @@ -6391,20 +6280,20 @@ test_delete_link(void) if ((ext_file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); + printf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); PART_ERROR(H5Ldelete_by_idx_external_name_order_increasing); } if (H5Fclose(ext_file_id) < 0) { H5_FAILED(); - HDprintf(" couldn't close file '%s'\n", ext_link_filename); + printf(" couldn't close file '%s'\n", ext_link_filename); PART_ERROR(H5Ldelete_by_idx_external_name_order_increasing); } if ((subgroup_id = H5Gcreate2(group_id, LINK_DELETE_TEST_SUBGROUP15_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create subgroup '%s'\n", LINK_DELETE_TEST_SUBGROUP15_NAME); + printf(" couldn't create subgroup '%s'\n", LINK_DELETE_TEST_SUBGROUP15_NAME); PART_ERROR(H5Ldelete_by_idx_external_name_order_increasing); } @@ -6412,21 +6301,21 @@ test_delete_link(void) if (H5Lcreate_external(ext_link_filename, "/", subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create external link '%s'\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME); + printf(" couldn't create external link '%s'\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_external_name_order_increasing); } if (H5Lcreate_external(ext_link_filename, "/", subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create external link '%s'\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); + printf(" couldn't create external link '%s'\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_external_name_order_increasing); } if (H5Lcreate_external(ext_link_filename, "/", subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create external link '%s'\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); + printf(" couldn't create external link '%s'\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_external_name_order_increasing); } @@ -6434,54 +6323,54 @@ test_delete_link(void) if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if external link '%s' exists\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME); + printf(" couldn't determine if external link '%s' exists\n", + LINK_DELETE_TEST_EXTERNAL_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_external_name_order_increasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" external link '%s' did not exist before deletion\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME); + printf(" external link '%s' did not exist before deletion\n", + LINK_DELETE_TEST_EXTERNAL_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_external_name_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if external link '%s' exists\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); + printf(" couldn't determine if external link '%s' exists\n", + LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_external_name_order_increasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" external link '%s' did not exist before deletion\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); + printf(" external link '%s' did not exist before deletion\n", + LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_external_name_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME3, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if external link '%s' exists\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); + printf(" couldn't determine if external link '%s' exists\n", + LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_external_name_order_increasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" external link '%s' did not exist before deletion\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); + printf(" external link '%s' did not exist before deletion\n", + LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_external_name_order_increasing); } /* Delete a link */ if (H5Ldelete_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 0, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't delete external link '%s' using H5Ldelete_by_idx by alphabetical " - "order in increasing order\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME); + printf(" couldn't delete external link '%s' using H5Ldelete_by_idx by alphabetical " + "order in increasing order\n", + LINK_DELETE_TEST_EXTERNAL_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_external_name_order_increasing); } @@ -6489,158 +6378,158 @@ test_delete_link(void) if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if external link '%s' exists\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME); + printf(" couldn't determine if external link '%s' exists\n", + LINK_DELETE_TEST_EXTERNAL_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_external_name_order_increasing); } if (link_exists) { H5_FAILED(); - HDprintf(" external link '%s' exists after deletion!\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME); + printf(" external link '%s' exists after deletion!\n", + LINK_DELETE_TEST_EXTERNAL_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_external_name_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if external link '%s' exists\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); + printf(" couldn't determine if external link '%s' exists\n", + LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_external_name_order_increasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" external link '%s' did not exist after deletion of a different link!\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); + printf(" external link '%s' did not exist after deletion of a different link!\n", + LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_external_name_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME3, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if external link '%s' exists\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); + printf(" couldn't determine if external link '%s' exists\n", + LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_external_name_order_increasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" external link '%s' did not exist after deletion of a different link!\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); + printf(" external link '%s' did not exist after deletion of a different link!\n", + LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_external_name_order_increasing); } /* Repeat until all links have been deleted */ if (H5Ldelete_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 0, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't delete external link '%s' using H5Ldelete_by_idx by alphabetical " - "order in increasing order\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); + printf(" couldn't delete external link '%s' using H5Ldelete_by_idx by alphabetical " + "order in increasing order\n", + LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_external_name_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if external link '%s' exists\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME); + printf(" couldn't determine if external link '%s' exists\n", + LINK_DELETE_TEST_EXTERNAL_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_external_name_order_increasing); } if (link_exists) { H5_FAILED(); - HDprintf(" external link '%s' exists after deletion!\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME); + printf(" external link '%s' exists after deletion!\n", + LINK_DELETE_TEST_EXTERNAL_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_external_name_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if external link '%s' exists\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); + printf(" couldn't determine if external link '%s' exists\n", + LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_external_name_order_increasing); } if (link_exists) { H5_FAILED(); - HDprintf(" external link '%s' exists after deletion!\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); + printf(" external link '%s' exists after deletion!\n", + LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_external_name_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME3, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if external link '%s' exists\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); + printf(" couldn't determine if external link '%s' exists\n", + LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_external_name_order_increasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" external link '%s' did not exist after deletion of a different link!\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); + printf(" external link '%s' did not exist after deletion of a different link!\n", + LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_external_name_order_increasing); } if (H5Ldelete_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 0, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't delete external link '%s' using H5Ldelete_by_idx by alphabetical " - "order in increasing order\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); + printf(" couldn't delete external link '%s' using H5Ldelete_by_idx by alphabetical " + "order in increasing order\n", + LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_external_name_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if external link '%s' exists\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME); + printf(" couldn't determine if external link '%s' exists\n", + LINK_DELETE_TEST_EXTERNAL_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_external_name_order_increasing); } if (link_exists) { H5_FAILED(); - HDprintf(" external link '%s' exists after deletion!\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME); + printf(" external link '%s' exists after deletion!\n", + LINK_DELETE_TEST_EXTERNAL_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_external_name_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if external link '%s' exists\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); + printf(" couldn't determine if external link '%s' exists\n", + LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_external_name_order_increasing); } if (link_exists) { H5_FAILED(); - HDprintf(" external link '%s' exists after deletion!\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); + printf(" external link '%s' exists after deletion!\n", + LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_external_name_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME3, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if external link '%s' exists\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); + printf(" couldn't determine if external link '%s' exists\n", + LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_external_name_order_increasing); } if (link_exists) { H5_FAILED(); - HDprintf(" external link '%s' exists after deletion!\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); + printf(" external link '%s' exists after deletion!\n", + LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_external_name_order_increasing); } if (H5Gclose(subgroup_id) < 0) { H5_FAILED(); - HDprintf(" failed to close group '%s'\n", LINK_DELETE_TEST_SUBGROUP15_NAME); + printf(" failed to close group '%s'\n", LINK_DELETE_TEST_SUBGROUP15_NAME); PART_ERROR(H5Ldelete_by_idx_external_name_order_increasing); } @@ -6667,20 +6556,20 @@ test_delete_link(void) if ((ext_file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); + printf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); PART_ERROR(H5Ldelete_by_idx_external_name_order_decreasing); } if (H5Fclose(ext_file_id) < 0) { H5_FAILED(); - HDprintf(" couldn't close file '%s'\n", ext_link_filename); + printf(" couldn't close file '%s'\n", ext_link_filename); PART_ERROR(H5Ldelete_by_idx_external_name_order_decreasing); } if ((subgroup_id = H5Gcreate2(group_id, LINK_DELETE_TEST_SUBGROUP16_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create subgroup '%s'\n", LINK_DELETE_TEST_SUBGROUP16_NAME); + printf(" couldn't create subgroup '%s'\n", LINK_DELETE_TEST_SUBGROUP16_NAME); PART_ERROR(H5Ldelete_by_idx_external_name_order_decreasing); } @@ -6688,21 +6577,21 @@ test_delete_link(void) if (H5Lcreate_external(ext_link_filename, "/", subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create external link '%s'\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME); + printf(" couldn't create external link '%s'\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_external_name_order_decreasing); } if (H5Lcreate_external(ext_link_filename, "/", subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create external link '%s'\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); + printf(" couldn't create external link '%s'\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_external_name_order_decreasing); } if (H5Lcreate_external(ext_link_filename, "/", subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create external link '%s'\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); + printf(" couldn't create external link '%s'\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_external_name_order_decreasing); } @@ -6710,54 +6599,54 @@ test_delete_link(void) if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if external link '%s' exists\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME); + printf(" couldn't determine if external link '%s' exists\n", + LINK_DELETE_TEST_EXTERNAL_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_external_name_order_decreasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" external link '%s' did not exist before deletion\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME); + printf(" external link '%s' did not exist before deletion\n", + LINK_DELETE_TEST_EXTERNAL_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_external_name_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if external link '%s' exists\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); + printf(" couldn't determine if external link '%s' exists\n", + LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_external_name_order_decreasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" external link '%s' did not exist before deletion\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); + printf(" external link '%s' did not exist before deletion\n", + LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_external_name_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME3, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if external link '%s' exists\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); + printf(" couldn't determine if external link '%s' exists\n", + LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_external_name_order_decreasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" external link '%s' did not exist before deletion\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); + printf(" external link '%s' did not exist before deletion\n", + LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_external_name_order_decreasing); } /* Delete a link */ if (H5Ldelete_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 2, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't delete external link '%s' using H5Ldelete_by_idx by alphabetical " - "order in decreasing order\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME); + printf(" couldn't delete external link '%s' using H5Ldelete_by_idx by alphabetical " + "order in decreasing order\n", + LINK_DELETE_TEST_EXTERNAL_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_external_name_order_decreasing); } @@ -6765,158 +6654,158 @@ test_delete_link(void) if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if external link '%s' exists\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME); + printf(" couldn't determine if external link '%s' exists\n", + LINK_DELETE_TEST_EXTERNAL_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_external_name_order_decreasing); } if (link_exists) { H5_FAILED(); - HDprintf(" external link '%s' exists after deletion!\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME); + printf(" external link '%s' exists after deletion!\n", + LINK_DELETE_TEST_EXTERNAL_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_external_name_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if external link '%s' exists\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); + printf(" couldn't determine if external link '%s' exists\n", + LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_external_name_order_decreasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" external link '%s' did not exist after deletion of a different link!\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); + printf(" external link '%s' did not exist after deletion of a different link!\n", + LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_external_name_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME3, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if external link '%s' exists\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); + printf(" couldn't determine if external link '%s' exists\n", + LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_external_name_order_decreasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" external link '%s' did not exist after deletion of a different link!\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); + printf(" external link '%s' did not exist after deletion of a different link!\n", + LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_external_name_order_decreasing); } /* Repeat until all links have been deleted */ if (H5Ldelete_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 1, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't delete external link '%s' using H5Ldelete_by_idx by alphabetical " - "order in decreasing order\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); + printf(" couldn't delete external link '%s' using H5Ldelete_by_idx by alphabetical " + "order in decreasing order\n", + LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_external_name_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if external link '%s' exists\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME); + printf(" couldn't determine if external link '%s' exists\n", + LINK_DELETE_TEST_EXTERNAL_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_external_name_order_decreasing); } if (link_exists) { H5_FAILED(); - HDprintf(" external link '%s' exists after deletion!\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME); + printf(" external link '%s' exists after deletion!\n", + LINK_DELETE_TEST_EXTERNAL_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_external_name_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if external link '%s' exists\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); + printf(" couldn't determine if external link '%s' exists\n", + LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_external_name_order_decreasing); } if (link_exists) { H5_FAILED(); - HDprintf(" external link '%s' exists after deletion!\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); + printf(" external link '%s' exists after deletion!\n", + LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_external_name_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME3, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if external link '%s' exists\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); + printf(" couldn't determine if external link '%s' exists\n", + LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_external_name_order_decreasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" external link '%s' did not exist after deletion of a different link!\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); + printf(" external link '%s' did not exist after deletion of a different link!\n", + LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_external_name_order_decreasing); } if (H5Ldelete_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 0, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't delete external link '%s' using H5Ldelete_by_idx by alphabetical " - "order in decreasing order\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); + printf(" couldn't delete external link '%s' using H5Ldelete_by_idx by alphabetical " + "order in decreasing order\n", + LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_external_name_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if external link '%s' exists\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME); + printf(" couldn't determine if external link '%s' exists\n", + LINK_DELETE_TEST_EXTERNAL_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_external_name_order_decreasing); } if (link_exists) { H5_FAILED(); - HDprintf(" external link '%s' exists after deletion!\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME); + printf(" external link '%s' exists after deletion!\n", + LINK_DELETE_TEST_EXTERNAL_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_external_name_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if external link '%s' exists\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); + printf(" couldn't determine if external link '%s' exists\n", + LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_external_name_order_decreasing); } if (link_exists) { H5_FAILED(); - HDprintf(" external link '%s' exists after deletion!\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); + printf(" external link '%s' exists after deletion!\n", + LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); PART_ERROR(H5Ldelete_by_idx_external_name_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME3, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if external link '%s' exists\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); + printf(" couldn't determine if external link '%s' exists\n", + LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_external_name_order_decreasing); } if (link_exists) { H5_FAILED(); - HDprintf(" external link '%s' exists after deletion!\n", - LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); + printf(" external link '%s' exists after deletion!\n", + LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); PART_ERROR(H5Ldelete_by_idx_external_name_order_decreasing); } if (H5Gclose(subgroup_id) < 0) { H5_FAILED(); - HDprintf(" failed to close group '%s'\n", LINK_DELETE_TEST_SUBGROUP16_NAME); + printf(" failed to close group '%s'\n", LINK_DELETE_TEST_SUBGROUP16_NAME); PART_ERROR(H5Ldelete_by_idx_external_name_order_decreasing); } @@ -7060,8 +6949,8 @@ test_delete_link_reset_grp_max_crt_order(void) !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_MORE) || !(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" API functions for basic file, group, link, or creation order " - "aren't supported with this connector\n"); + printf(" API functions for basic file, group, link, or creation order " + "aren't supported with this connector\n"); return 0; } @@ -7069,33 +6958,33 @@ test_delete_link_reset_grp_max_crt_order(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); goto error; } if ((gcpl_id = H5Pcreate(H5P_GROUP_CREATE)) < 0) { H5_FAILED(); - HDprintf(" couldn't create GCPL for link creation order tracking\n"); + printf(" couldn't create GCPL for link creation order tracking\n"); goto error; } if (H5Pset_link_creation_order(gcpl_id, H5P_CRT_ORDER_TRACKED) < 0) { H5_FAILED(); - HDprintf(" couldn't set link creation order tracking\n"); + printf(" couldn't set link creation order tracking\n"); goto error; } if ((group_id = H5Gcreate2(container_group, LINK_DELETE_RESET_MAX_CRT_ORDER_TEST_SUBGROUP_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container sub-group '%s'\n", - LINK_DELETE_RESET_MAX_CRT_ORDER_TEST_SUBGROUP_NAME); + printf(" couldn't create container sub-group '%s'\n", + LINK_DELETE_RESET_MAX_CRT_ORDER_TEST_SUBGROUP_NAME); goto error; } @@ -7110,8 +6999,8 @@ test_delete_link_reset_grp_max_crt_order(void) if ((subgroup_id = H5Gcreate2(group_id, LINK_DELETE_RESET_MAX_CRT_ORDER_TEST_SUBGROUP1_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create subgroup '%s'\n", - LINK_DELETE_RESET_MAX_CRT_ORDER_TEST_SUBGROUP1_NAME); + printf(" couldn't create subgroup '%s'\n", + LINK_DELETE_RESET_MAX_CRT_ORDER_TEST_SUBGROUP1_NAME); PART_ERROR(H5Ldelete_links_bottom_up); } @@ -7121,7 +7010,7 @@ test_delete_link_reset_grp_max_crt_order(void) if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, link_name, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create hard link '%s'\n", link_name); + printf(" couldn't create hard link '%s'\n", link_name); PART_ERROR(H5Ldelete_links_bottom_up); } } @@ -7132,15 +7021,15 @@ test_delete_link_reset_grp_max_crt_order(void) if (H5Gget_info(subgroup_id, &grp_info) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve group's info\n"); + printf(" failed to retrieve group's info\n"); PART_ERROR(H5Ldelete_links_bottom_up); } if (grp_info.max_corder != LINK_DELETE_RESET_MAX_CRT_ORDER_TEST_NUM_LINKS) { H5_FAILED(); - HDprintf(" group's maximum creation order value got adjusted to %lld during link " - "deletion; value should have remained at %d\n", - (long long)grp_info.max_corder, LINK_DELETE_RESET_MAX_CRT_ORDER_TEST_NUM_LINKS); + printf(" group's maximum creation order value got adjusted to %lld during link " + "deletion; value should have remained at %d\n", + (long long)grp_info.max_corder, LINK_DELETE_RESET_MAX_CRT_ORDER_TEST_NUM_LINKS); PART_ERROR(H5Ldelete_links_bottom_up); } @@ -7148,7 +7037,7 @@ test_delete_link_reset_grp_max_crt_order(void) if (H5Ldelete(subgroup_id, link_name, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to delete link '%s'\n", link_name); + printf(" failed to delete link '%s'\n", link_name); PART_ERROR(H5Ldelete_links_bottom_up); } } @@ -7159,15 +7048,15 @@ test_delete_link_reset_grp_max_crt_order(void) if (H5Gget_info(subgroup_id, &grp_info) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve group's info\n"); + printf(" failed to retrieve group's info\n"); PART_ERROR(H5Ldelete_links_bottom_up); } if (grp_info.max_corder != 0) { H5_FAILED(); - HDprintf(" group's maximum creation order value didn't reset to 0 after deleting all " - "links from group; value is still %lld\n", - (long long)grp_info.max_corder); + printf(" group's maximum creation order value didn't reset to 0 after deleting all " + "links from group; value is still %lld\n", + (long long)grp_info.max_corder); PART_ERROR(H5Ldelete_links_bottom_up); } @@ -7189,8 +7078,8 @@ test_delete_link_reset_grp_max_crt_order(void) if ((subgroup_id = H5Gcreate2(group_id, LINK_DELETE_RESET_MAX_CRT_ORDER_TEST_SUBGROUP2_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create subgroup '%s'\n", - LINK_DELETE_RESET_MAX_CRT_ORDER_TEST_SUBGROUP2_NAME); + printf(" couldn't create subgroup '%s'\n", + LINK_DELETE_RESET_MAX_CRT_ORDER_TEST_SUBGROUP2_NAME); PART_ERROR(H5Ldelete_links_top_down); } @@ -7200,7 +7089,7 @@ test_delete_link_reset_grp_max_crt_order(void) if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, link_name, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create hard link '%s'\n", link_name); + printf(" couldn't create hard link '%s'\n", link_name); PART_ERROR(H5Ldelete_links_top_down); } } @@ -7211,15 +7100,15 @@ test_delete_link_reset_grp_max_crt_order(void) if (H5Gget_info(subgroup_id, &grp_info) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve group's info\n"); + printf(" failed to retrieve group's info\n"); PART_ERROR(H5Ldelete_links_top_down); } if (grp_info.max_corder != LINK_DELETE_RESET_MAX_CRT_ORDER_TEST_NUM_LINKS) { H5_FAILED(); - HDprintf(" group's maximum creation order value got adjusted to %lld during link " - "deletion; value should have remained at %d\n", - (long long)grp_info.max_corder, LINK_DELETE_RESET_MAX_CRT_ORDER_TEST_NUM_LINKS); + printf(" group's maximum creation order value got adjusted to %lld during link " + "deletion; value should have remained at %d\n", + (long long)grp_info.max_corder, LINK_DELETE_RESET_MAX_CRT_ORDER_TEST_NUM_LINKS); PART_ERROR(H5Ldelete_links_top_down); } @@ -7228,7 +7117,7 @@ test_delete_link_reset_grp_max_crt_order(void) if (H5Ldelete(subgroup_id, link_name, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to delete link '%s'\n", link_name); + printf(" failed to delete link '%s'\n", link_name); PART_ERROR(H5Ldelete_links_top_down); } } @@ -7239,15 +7128,15 @@ test_delete_link_reset_grp_max_crt_order(void) if (H5Gget_info(subgroup_id, &grp_info) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve group's info\n"); + printf(" failed to retrieve group's info\n"); PART_ERROR(H5Ldelete_links_top_down); } if (grp_info.max_corder != 0) { H5_FAILED(); - HDprintf(" group's maximum creation order value didn't reset to 0 after deleting all " - "links from group; value is still %lld\n", - (long long)grp_info.max_corder); + printf(" group's maximum creation order value didn't reset to 0 after deleting all " + "links from group; value is still %lld\n", + (long long)grp_info.max_corder); PART_ERROR(H5Ldelete_links_top_down); } @@ -7308,8 +7197,8 @@ test_delete_link_invalid_params(void) !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_BY_IDX) || !(vol_cap_flags_g & H5VL_CAP_FLAG_HARD_LINKS)) { SKIPPED(); - HDprintf(" API functions for basic file, group, link, flag by index, or hard link aren't " - "supported with this connector\n"); + printf(" API functions for basic file, group, link, flag by index, or hard link aren't " + "supported with this connector\n"); return 0; } @@ -7317,27 +7206,27 @@ test_delete_link_invalid_params(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, LINK_DELETE_INVALID_PARAMS_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container subgroup '%s'\n", LINK_DELETE_INVALID_PARAMS_TEST_GROUP_NAME); + printf(" couldn't create container subgroup '%s'\n", LINK_DELETE_INVALID_PARAMS_TEST_GROUP_NAME); goto error; } if (H5Lcreate_hard(group_id, ".", group_id, LINK_DELETE_INVALID_PARAMS_TEST_HARD_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create hard link '%s'\n", LINK_DELETE_INVALID_PARAMS_TEST_HARD_LINK_NAME); + printf(" couldn't create hard link '%s'\n", LINK_DELETE_INVALID_PARAMS_TEST_HARD_LINK_NAME); goto error; } @@ -7345,14 +7234,14 @@ test_delete_link_invalid_params(void) if ((link_exists = H5Lexists(group_id, LINK_DELETE_INVALID_PARAMS_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if first hard link '%s' exists\n", - LINK_DELETE_INVALID_PARAMS_TEST_HARD_LINK_NAME); + printf(" couldn't determine if first hard link '%s' exists\n", + LINK_DELETE_INVALID_PARAMS_TEST_HARD_LINK_NAME); goto error; } if (!link_exists) { H5_FAILED(); - HDprintf(" first hard link did not exist\n"); + printf(" first hard link did not exist\n"); goto error; } @@ -7373,7 +7262,7 @@ test_delete_link_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Ldelete succeeded with an invalid location ID!\n"); + printf(" H5Ldelete succeeded with an invalid location ID!\n"); PART_ERROR(H5Ldelete_invalid_loc_id); } @@ -7393,7 +7282,7 @@ test_delete_link_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Ldelete succeeded with a NULL link name!\n"); + printf(" H5Ldelete succeeded with a NULL link name!\n"); PART_ERROR(H5Ldelete_invalid_link_name); } @@ -7405,7 +7294,7 @@ test_delete_link_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Ldelete succeeded with an invalid link name of ''!\n"); + printf(" H5Ldelete succeeded with an invalid link name of ''!\n"); PART_ERROR(H5Ldelete_invalid_link_name); } @@ -7426,7 +7315,7 @@ test_delete_link_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Ldelete succeeded with an invalid LAPL!\n"); + printf(" H5Ldelete succeeded with an invalid LAPL!\n"); PART_ERROR(H5Ldelete_invalid_lapl); } @@ -7446,7 +7335,7 @@ test_delete_link_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Ldelete_by_idx succeeded with an invalid location ID!\n"); + printf(" H5Ldelete_by_idx succeeded with an invalid location ID!\n"); PART_ERROR(H5Ldelete_by_idx_invalid_loc_id); } @@ -7466,7 +7355,7 @@ test_delete_link_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Ldelete_by_idx succeeded with a NULL group name!\n"); + printf(" H5Ldelete_by_idx succeeded with a NULL group name!\n"); PART_ERROR(H5Ldelete_by_idx_invalid_grp_name); } @@ -7478,7 +7367,7 @@ test_delete_link_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Ldelete_by_idx succeeded with an invalid group name of ''!\n"); + printf(" H5Ldelete_by_idx succeeded with an invalid group name of ''!\n"); PART_ERROR(H5Ldelete_by_idx_invalid_grp_name); } @@ -7498,7 +7387,7 @@ test_delete_link_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Ldelete_by_idx succeeded with invalid index type H5_INDEX_UNKNOWN!\n"); + printf(" H5Ldelete_by_idx succeeded with invalid index type H5_INDEX_UNKNOWN!\n"); PART_ERROR(H5Ldelete_by_idx_invalid_index_type); } @@ -7510,7 +7399,7 @@ test_delete_link_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Ldelete_by_idx succeeded with invalid index type H5_INDEX_N!\n"); + printf(" H5Ldelete_by_idx succeeded with invalid index type H5_INDEX_N!\n"); PART_ERROR(H5Ldelete_by_idx_invalid_index_type); } @@ -7530,7 +7419,7 @@ test_delete_link_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Ldelete_by_idx succeeded with invalid iteration ordering H5_ITER_UNKNOWN!\n"); + printf(" H5Ldelete_by_idx succeeded with invalid iteration ordering H5_ITER_UNKNOWN!\n"); PART_ERROR(H5Ldelete_by_idx_invalid_index_order); } @@ -7542,7 +7431,7 @@ test_delete_link_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Ldelete_by_idx succeeded with invalid iteration ordering H5_ITER_N!\n"); + printf(" H5Ldelete_by_idx succeeded with invalid iteration ordering H5_ITER_N!\n"); PART_ERROR(H5Ldelete_by_idx_invalid_index_order); } @@ -7562,7 +7451,7 @@ test_delete_link_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Ldelete_by_idx succeeded with an invalid LAPL!\n"); + printf(" H5Ldelete_by_idx succeeded with an invalid LAPL!\n"); PART_ERROR(H5Ldelete_by_idx_invalid_lapl); } @@ -7578,14 +7467,14 @@ test_delete_link_invalid_params(void) if ((link_exists = H5Lexists(group_id, LINK_DELETE_INVALID_PARAMS_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if hard link '%s' exists\n", - LINK_DELETE_INVALID_PARAMS_TEST_HARD_LINK_NAME); + printf(" couldn't determine if hard link '%s' exists\n", + LINK_DELETE_INVALID_PARAMS_TEST_HARD_LINK_NAME); PART_ERROR(H5Ldelete_by_idx_link_existence); } if (!link_exists) { H5_FAILED(); - HDprintf(" hard link didn't exist!\n"); + printf(" hard link didn't exist!\n"); PART_ERROR(H5Ldelete_by_idx_link_existence); } @@ -7640,9 +7529,8 @@ test_copy_link(void) !(vol_cap_flags_g & H5VL_CAP_FLAG_HARD_LINKS) || !(vol_cap_flags_g & H5VL_CAP_FLAG_EXTERNAL_LINKS) || !(vol_cap_flags_g & H5VL_CAP_FLAG_SOFT_LINKS)) { SKIPPED(); - HDprintf( - " API functions for basic file, group, link, hard link, soft link, or external link aren't " - "supported with this connector\n"); + printf(" API functions for basic file, group, link, hard link, soft link, or external link aren't " + "supported with this connector\n"); return 0; } @@ -7650,34 +7538,34 @@ test_copy_link(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s\n", H5_api_test_filename); + printf(" couldn't open file '%s\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't opewn container group '%s'\n", LINK_TEST_GROUP_NAME); + printf(" couldn't opewn container group '%s'\n", LINK_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, COPY_LINK_TEST_SUBGROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create group '%s'\n", COPY_LINK_TEST_SUBGROUP_NAME); + printf(" couldn't create group '%s'\n", COPY_LINK_TEST_SUBGROUP_NAME); goto error; } if ((src_grp_id = H5Gcreate2(group_id, COPY_LINK_TEST_SRC_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create group '%s'\n", COPY_LINK_TEST_SRC_GROUP_NAME); + printf(" couldn't create group '%s'\n", COPY_LINK_TEST_SRC_GROUP_NAME); goto error; } if ((dst_grp_id = H5Gcreate2(group_id, COPY_LINK_TEST_DST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create group '%s'\n", COPY_LINK_TEST_DST_GROUP_NAME); + printf(" couldn't create group '%s'\n", COPY_LINK_TEST_DST_GROUP_NAME); goto error; } @@ -7693,33 +7581,33 @@ test_copy_link(void) if (H5Lcreate_hard(group_id, ".", src_grp_id, COPY_LINK_TEST_HARD_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create hard link '%s'\n", COPY_LINK_TEST_HARD_LINK_NAME); + printf(" couldn't create hard link '%s'\n", COPY_LINK_TEST_HARD_LINK_NAME); PART_ERROR(H5Lcopy_hard_no_check); } /* Verify the link has been created */ if ((link_exists = H5Lexists(src_grp_id, COPY_LINK_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if hard link '%s' exists\n", COPY_LINK_TEST_HARD_LINK_NAME); + printf(" couldn't determine if hard link '%s' exists\n", COPY_LINK_TEST_HARD_LINK_NAME); PART_ERROR(H5Lcopy_hard_no_check); } if (!link_exists) { H5_FAILED(); - HDprintf(" hard link did not exist\n"); + printf(" hard link did not exist\n"); PART_ERROR(H5Lcopy_hard_no_check); } /* Verify the link doesn't currently exist in the target group */ if ((link_exists = H5Lexists(dst_grp_id, COPY_LINK_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if hard link '%s' exists\n", COPY_LINK_TEST_HARD_LINK_NAME); + printf(" couldn't determine if hard link '%s' exists\n", COPY_LINK_TEST_HARD_LINK_NAME); PART_ERROR(H5Lcopy_hard_no_check); } if (link_exists) { H5_FAILED(); - HDprintf(" hard link existed in target group before copy!\n"); + printf(" hard link existed in target group before copy!\n"); PART_ERROR(H5Lcopy_hard_no_check); } @@ -7727,34 +7615,34 @@ test_copy_link(void) if (H5Lcopy(src_grp_id, COPY_LINK_TEST_HARD_LINK_NAME, dst_grp_id, COPY_LINK_TEST_HARD_LINK_COPY_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to copy hard link '%s'\n", COPY_LINK_TEST_HARD_LINK_NAME); + printf(" failed to copy hard link '%s'\n", COPY_LINK_TEST_HARD_LINK_NAME); PART_ERROR(H5Lcopy_hard_no_check); } /* Verify the link has been copied and still exists in the source group */ if ((link_exists = H5Lexists(dst_grp_id, COPY_LINK_TEST_HARD_LINK_COPY_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if hard link copy '%s' exists\n", - COPY_LINK_TEST_HARD_LINK_COPY_NAME); + printf(" couldn't determine if hard link copy '%s' exists\n", + COPY_LINK_TEST_HARD_LINK_COPY_NAME); PART_ERROR(H5Lcopy_hard_no_check); } if (!link_exists) { H5_FAILED(); - HDprintf(" hard link copy did not exist\n"); + printf(" hard link copy did not exist\n"); PART_ERROR(H5Lcopy_hard_no_check); } if ((link_exists = H5Lexists(src_grp_id, COPY_LINK_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if original hard link '%s' exists\n", - COPY_LINK_TEST_HARD_LINK_NAME); + printf(" couldn't determine if original hard link '%s' exists\n", + COPY_LINK_TEST_HARD_LINK_NAME); PART_ERROR(H5Lcopy_hard_no_check); } if (!link_exists) { H5_FAILED(); - HDprintf(" original hard link did not exist\n"); + printf(" original hard link did not exist\n"); PART_ERROR(H5Lcopy_hard_no_check); } @@ -7773,40 +7661,40 @@ test_copy_link(void) if (H5Lcreate_hard(group_id, ".", src_grp_id, COPY_LINK_TEST_HARD_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create hard link '%s'\n", COPY_LINK_TEST_HARD_LINK_NAME2); + printf(" couldn't create hard link '%s'\n", COPY_LINK_TEST_HARD_LINK_NAME2); PART_ERROR(H5Lcopy_hard_check); } /* Verify the link has been created */ if ((link_exists = H5Lexists(src_grp_id, COPY_LINK_TEST_HARD_LINK_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if hard link '%s' exists\n", COPY_LINK_TEST_HARD_LINK_NAME2); + printf(" couldn't determine if hard link '%s' exists\n", COPY_LINK_TEST_HARD_LINK_NAME2); PART_ERROR(H5Lcopy_hard_check); } if (!link_exists) { H5_FAILED(); - HDprintf(" hard link did not exist\n"); + printf(" hard link did not exist\n"); PART_ERROR(H5Lcopy_hard_check); } /* Retrieve the link's info */ if (H5Lget_info2(src_grp_id, COPY_LINK_TEST_HARD_LINK_NAME2, &orig_info, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't retrieve info for link '%s'\n", COPY_LINK_TEST_HARD_LINK_NAME2); + printf(" couldn't retrieve info for link '%s'\n", COPY_LINK_TEST_HARD_LINK_NAME2); PART_ERROR(H5Lcopy_hard_check); } /* Verify the link doesn't currently exist in the target group */ if ((link_exists = H5Lexists(dst_grp_id, COPY_LINK_TEST_HARD_LINK_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if hard link '%s' exists\n", COPY_LINK_TEST_HARD_LINK_NAME2); + printf(" couldn't determine if hard link '%s' exists\n", COPY_LINK_TEST_HARD_LINK_NAME2); PART_ERROR(H5Lcopy_hard_check); } if (link_exists) { H5_FAILED(); - HDprintf(" hard link existed in target group before copy!\n"); + printf(" hard link existed in target group before copy!\n"); PART_ERROR(H5Lcopy_hard_check); } @@ -7814,83 +7702,83 @@ test_copy_link(void) if (H5Lcopy(src_grp_id, COPY_LINK_TEST_HARD_LINK_NAME2, dst_grp_id, COPY_LINK_TEST_HARD_LINK_COPY_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to copy hard link '%s'\n", COPY_LINK_TEST_HARD_LINK_NAME2); + printf(" failed to copy hard link '%s'\n", COPY_LINK_TEST_HARD_LINK_NAME2); PART_ERROR(H5Lcopy_hard_check); } /* Verify the link has been copied and still exists in the source group */ if ((link_exists = H5Lexists(dst_grp_id, COPY_LINK_TEST_HARD_LINK_COPY_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if hard link copy '%s' exists\n", - COPY_LINK_TEST_HARD_LINK_COPY_NAME2); + printf(" couldn't determine if hard link copy '%s' exists\n", + COPY_LINK_TEST_HARD_LINK_COPY_NAME2); PART_ERROR(H5Lcopy_hard_check); } if (!link_exists) { H5_FAILED(); - HDprintf(" hard link copy did not exist\n"); + printf(" hard link copy did not exist\n"); PART_ERROR(H5Lcopy_hard_check); } if ((link_exists = H5Lexists(src_grp_id, COPY_LINK_TEST_HARD_LINK_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if original hard link '%s' exists\n", - COPY_LINK_TEST_HARD_LINK_NAME2); + printf(" couldn't determine if original hard link '%s' exists\n", + COPY_LINK_TEST_HARD_LINK_NAME2); PART_ERROR(H5Lcopy_hard_check); } if (!link_exists) { H5_FAILED(); - HDprintf(" original hard link did not exist\n"); + printf(" original hard link did not exist\n"); PART_ERROR(H5Lcopy_hard_check); } /* Retrieve the new link's info */ if (H5Lget_info2(dst_grp_id, COPY_LINK_TEST_HARD_LINK_COPY_NAME2, &new_info, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't retrieve info for link '%s'\n", COPY_LINK_TEST_HARD_LINK_COPY_NAME2); + printf(" couldn't retrieve info for link '%s'\n", COPY_LINK_TEST_HARD_LINK_COPY_NAME2); PART_ERROR(H5Lcopy_hard_check); } if (new_info.type != orig_info.type) { H5_FAILED(); - HDprintf(" copied link's link type doesn't match original link's type\n"); + printf(" copied link's link type doesn't match original link's type\n"); PART_ERROR(H5Lcopy_hard_check); } if (H5Otoken_cmp(dst_grp_id, &new_info.u.token, &orig_info.u.token, &cmp_value) < 0) { H5_FAILED(); - HDprintf(" failed to compare link target tokens\n"); + printf(" failed to compare link target tokens\n"); PART_ERROR(H5Lcopy_hard_check); } if (cmp_value != 0) { H5_FAILED(); - HDprintf(" copied hard link's object token doesn't match original link's object token\n"); + printf(" copied hard link's object token doesn't match original link's object token\n"); PART_ERROR(H5Lcopy_hard_check); } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (new_info.corder_valid != orig_info.corder_valid) { H5_FAILED(); - HDprintf(" copied link's 'corder_valid' field doesn't match original link's " - "'corder_valid' field\n"); + printf(" copied link's 'corder_valid' field doesn't match original link's " + "'corder_valid' field\n"); PART_ERROR(H5Lcopy_hard_check); } if (new_info.corder_valid && orig_info.corder_valid && (new_info.corder != orig_info.corder)) { H5_FAILED(); - HDprintf(" copied link's creation order value %" PRId64 - " doesn't match original link's creation order value %" PRId64 "\n", - new_info.corder, orig_info.corder); + printf(" copied link's creation order value %" PRId64 + " doesn't match original link's creation order value %" PRId64 "\n", + new_info.corder, orig_info.corder); PART_ERROR(H5Lcopy_hard_check); } } if (new_info.cset != orig_info.cset) { H5_FAILED(); - HDprintf(" copied link's character set doesn't match original link's character set\n"); + printf(" copied link's character set doesn't match original link's character set\n"); PART_ERROR(H5Lcopy_hard_check); } @@ -7906,20 +7794,20 @@ test_copy_link(void) if (H5Lcreate_hard(group_id, ".", src_grp_id, COPY_LINK_TEST_HARD_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create hard link '%s'\n", COPY_LINK_TEST_HARD_LINK_NAME3); + printf(" couldn't create hard link '%s'\n", COPY_LINK_TEST_HARD_LINK_NAME3); PART_ERROR(H5Lcopy_hard_same_loc); } /* Verify the link has been created */ if ((link_exists = H5Lexists(src_grp_id, COPY_LINK_TEST_HARD_LINK_NAME3, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if hard link '%s' exists\n", COPY_LINK_TEST_HARD_LINK_NAME3); + printf(" couldn't determine if hard link '%s' exists\n", COPY_LINK_TEST_HARD_LINK_NAME3); PART_ERROR(H5Lcopy_hard_same_loc); } if (!link_exists) { H5_FAILED(); - HDprintf(" hard link did not exist\n"); + printf(" hard link did not exist\n"); PART_ERROR(H5Lcopy_hard_same_loc); } @@ -7927,28 +7815,28 @@ test_copy_link(void) if ((link_exists = H5Lexists(src_grp_id, COPY_LINK_TEST_HARD_LINK_SAME_LOC_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if hard link '%s' exists\n", - COPY_LINK_TEST_HARD_LINK_SAME_LOC_NAME); + printf(" couldn't determine if hard link '%s' exists\n", + COPY_LINK_TEST_HARD_LINK_SAME_LOC_NAME); PART_ERROR(H5Lcopy_hard_same_loc); } if (link_exists) { H5_FAILED(); - HDprintf(" hard link existed in target group before copy!\n"); + printf(" hard link existed in target group before copy!\n"); PART_ERROR(H5Lcopy_hard_same_loc); } if ((link_exists = H5Lexists(src_grp_id, COPY_LINK_TEST_HARD_LINK_SAME_LOC_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if hard link '%s' exists\n", - COPY_LINK_TEST_HARD_LINK_SAME_LOC_NAME2); + printf(" couldn't determine if hard link '%s' exists\n", + COPY_LINK_TEST_HARD_LINK_SAME_LOC_NAME2); PART_ERROR(H5Lcopy_hard_same_loc); } if (link_exists) { H5_FAILED(); - HDprintf(" hard link existed in target group before copy!\n"); + printf(" hard link existed in target group before copy!\n"); PART_ERROR(H5Lcopy_hard_same_loc); } @@ -7956,9 +7844,8 @@ test_copy_link(void) if (H5Lcopy(H5L_SAME_LOC, COPY_LINK_TEST_HARD_LINK_NAME3, src_grp_id, COPY_LINK_TEST_HARD_LINK_SAME_LOC_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf( - " failed to copy hard link '%s' using H5L_SAME_LOC as first parameter to H5Lcopy\n", - COPY_LINK_TEST_HARD_LINK_NAME3); + printf(" failed to copy hard link '%s' using H5L_SAME_LOC as first parameter to H5Lcopy\n", + COPY_LINK_TEST_HARD_LINK_NAME3); PART_ERROR(H5Lcopy_hard_same_loc); } @@ -7966,9 +7853,8 @@ test_copy_link(void) if (H5Lcopy(src_grp_id, COPY_LINK_TEST_HARD_LINK_NAME3, H5L_SAME_LOC, COPY_LINK_TEST_HARD_LINK_SAME_LOC_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf( - " failed to copy hard link '%s' using H5L_SAME_LOC as third parameter to H5Lcopy\n", - COPY_LINK_TEST_HARD_LINK_NAME3); + printf(" failed to copy hard link '%s' using H5L_SAME_LOC as third parameter to H5Lcopy\n", + COPY_LINK_TEST_HARD_LINK_NAME3); PART_ERROR(H5Lcopy_hard_same_loc); } @@ -7976,41 +7862,41 @@ test_copy_link(void) if ((link_exists = H5Lexists(src_grp_id, COPY_LINK_TEST_HARD_LINK_SAME_LOC_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if hard link copy '%s' exists\n", - COPY_LINK_TEST_HARD_LINK_SAME_LOC_NAME); + printf(" couldn't determine if hard link copy '%s' exists\n", + COPY_LINK_TEST_HARD_LINK_SAME_LOC_NAME); PART_ERROR(H5Lcopy_hard_same_loc); } if (!link_exists) { H5_FAILED(); - HDprintf(" hard link copy did not exist\n"); + printf(" hard link copy did not exist\n"); PART_ERROR(H5Lcopy_hard_same_loc); } if ((link_exists = H5Lexists(src_grp_id, COPY_LINK_TEST_HARD_LINK_SAME_LOC_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if hard link copy '%s' exists\n", - COPY_LINK_TEST_HARD_LINK_SAME_LOC_NAME2); + printf(" couldn't determine if hard link copy '%s' exists\n", + COPY_LINK_TEST_HARD_LINK_SAME_LOC_NAME2); PART_ERROR(H5Lcopy_hard_same_loc); } if (!link_exists) { H5_FAILED(); - HDprintf(" hard link copy did not exist\n"); + printf(" hard link copy did not exist\n"); PART_ERROR(H5Lcopy_hard_same_loc); } if ((link_exists = H5Lexists(src_grp_id, COPY_LINK_TEST_HARD_LINK_NAME3, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if original hard link '%s' exists\n", - COPY_LINK_TEST_HARD_LINK_NAME3); + printf(" couldn't determine if original hard link '%s' exists\n", + COPY_LINK_TEST_HARD_LINK_NAME3); PART_ERROR(H5Lcopy_hard_same_loc); } if (!link_exists) { H5_FAILED(); - HDprintf(" original hard link did not exist\n"); + printf(" original hard link did not exist\n"); PART_ERROR(H5Lcopy_hard_same_loc); } @@ -8026,33 +7912,33 @@ test_copy_link(void) if (H5Lcreate_soft(COPY_LINK_TEST_SOFT_LINK_TARGET_PATH, src_grp_id, COPY_LINK_TEST_SOFT_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create soft link '%s'\n", COPY_LINK_TEST_SOFT_LINK_NAME); + printf(" couldn't create soft link '%s'\n", COPY_LINK_TEST_SOFT_LINK_NAME); PART_ERROR(H5Lcopy_soft_no_check); } /* Verify the link has been created */ if ((link_exists = H5Lexists(src_grp_id, COPY_LINK_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if soft link '%s' exists\n", COPY_LINK_TEST_SOFT_LINK_NAME); + printf(" couldn't determine if soft link '%s' exists\n", COPY_LINK_TEST_SOFT_LINK_NAME); PART_ERROR(H5Lcopy_soft_no_check); } if (!link_exists) { H5_FAILED(); - HDprintf(" soft link did not exist\n"); + printf(" soft link did not exist\n"); PART_ERROR(H5Lcopy_soft_no_check); } /* Verify the link doesn't currently exist in the target group */ if ((link_exists = H5Lexists(dst_grp_id, COPY_LINK_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if soft link '%s' exists\n", COPY_LINK_TEST_SOFT_LINK_NAME); + printf(" couldn't determine if soft link '%s' exists\n", COPY_LINK_TEST_SOFT_LINK_NAME); PART_ERROR(H5Lcopy_soft_no_check); } if (link_exists) { H5_FAILED(); - HDprintf(" soft link existed in target group before copy!\n"); + printf(" soft link existed in target group before copy!\n"); PART_ERROR(H5Lcopy_soft_no_check); } @@ -8060,34 +7946,34 @@ test_copy_link(void) if (H5Lcopy(src_grp_id, COPY_LINK_TEST_SOFT_LINK_NAME, dst_grp_id, COPY_LINK_TEST_SOFT_LINK_COPY_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to copy soft link '%s'\n", COPY_LINK_TEST_SOFT_LINK_NAME); + printf(" failed to copy soft link '%s'\n", COPY_LINK_TEST_SOFT_LINK_NAME); PART_ERROR(H5Lcopy_soft_no_check); } /* Verify the link has been copied and still exists in the source group */ if ((link_exists = H5Lexists(dst_grp_id, COPY_LINK_TEST_SOFT_LINK_COPY_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if soft link '%s' copy exists\n", - COPY_LINK_TEST_SOFT_LINK_COPY_NAME); + printf(" couldn't determine if soft link '%s' copy exists\n", + COPY_LINK_TEST_SOFT_LINK_COPY_NAME); PART_ERROR(H5Lcopy_soft_no_check); } if (!link_exists) { H5_FAILED(); - HDprintf(" soft link copy did not exist\n"); + printf(" soft link copy did not exist\n"); PART_ERROR(H5Lcopy_soft_no_check); } if ((link_exists = H5Lexists(src_grp_id, COPY_LINK_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if original soft link '%s' exists\n", - COPY_LINK_TEST_SOFT_LINK_NAME); + printf(" couldn't determine if original soft link '%s' exists\n", + COPY_LINK_TEST_SOFT_LINK_NAME); PART_ERROR(H5Lcopy_soft_no_check); } if (!link_exists) { H5_FAILED(); - HDprintf(" original soft link did not exist\n"); + printf(" original soft link did not exist\n"); PART_ERROR(H5Lcopy_soft_no_check); } @@ -8107,27 +7993,27 @@ test_copy_link(void) if (H5Lcreate_soft(COPY_LINK_TEST_SOFT_LINK_TARGET_PATH, src_grp_id, COPY_LINK_TEST_SOFT_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create soft link '%s'\n", COPY_LINK_TEST_SOFT_LINK_NAME2); + printf(" couldn't create soft link '%s'\n", COPY_LINK_TEST_SOFT_LINK_NAME2); PART_ERROR(H5Lcopy_soft_check); } /* Verify the link has been created */ if ((link_exists = H5Lexists(src_grp_id, COPY_LINK_TEST_SOFT_LINK_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if soft link '%s' exists\n", COPY_LINK_TEST_SOFT_LINK_NAME2); + printf(" couldn't determine if soft link '%s' exists\n", COPY_LINK_TEST_SOFT_LINK_NAME2); PART_ERROR(H5Lcopy_soft_check); } if (!link_exists) { H5_FAILED(); - HDprintf(" soft link did not exist\n"); + printf(" soft link did not exist\n"); PART_ERROR(H5Lcopy_soft_check); } /* Retrieve the link's info */ if (H5Lget_info2(src_grp_id, COPY_LINK_TEST_SOFT_LINK_NAME2, &orig_info, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't retrieve info for link '%s'\n", COPY_LINK_TEST_SOFT_LINK_NAME2); + printf(" couldn't retrieve info for link '%s'\n", COPY_LINK_TEST_SOFT_LINK_NAME2); PART_ERROR(H5Lcopy_soft_check); } @@ -8135,20 +8021,20 @@ test_copy_link(void) if (H5Lget_val(src_grp_id, COPY_LINK_TEST_SOFT_LINK_NAME2, orig_link_val, COPY_LINK_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't retrieve value for soft link '%s'\n", COPY_LINK_TEST_SOFT_LINK_NAME2); + printf(" couldn't retrieve value for soft link '%s'\n", COPY_LINK_TEST_SOFT_LINK_NAME2); PART_ERROR(H5Lcopy_soft_check); } /* Verify the link doesn't currently exist in the target group */ if ((link_exists = H5Lexists(dst_grp_id, COPY_LINK_TEST_SOFT_LINK_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if soft link '%s' exists\n", COPY_LINK_TEST_SOFT_LINK_NAME2); + printf(" couldn't determine if soft link '%s' exists\n", COPY_LINK_TEST_SOFT_LINK_NAME2); PART_ERROR(H5Lcopy_soft_check); } if (link_exists) { H5_FAILED(); - HDprintf(" soft link existed in target group before copy!\n"); + printf(" soft link existed in target group before copy!\n"); PART_ERROR(H5Lcopy_soft_check); } @@ -8156,79 +8042,79 @@ test_copy_link(void) if (H5Lcopy(src_grp_id, COPY_LINK_TEST_SOFT_LINK_NAME2, dst_grp_id, COPY_LINK_TEST_SOFT_LINK_COPY_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to copy soft link '%s'\n", COPY_LINK_TEST_SOFT_LINK_NAME2); + printf(" failed to copy soft link '%s'\n", COPY_LINK_TEST_SOFT_LINK_NAME2); PART_ERROR(H5Lcopy_soft_check); } /* Verify the link has been copied and still exists in the source group */ if ((link_exists = H5Lexists(dst_grp_id, COPY_LINK_TEST_SOFT_LINK_COPY_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if soft link '%s' copy exists\n", - COPY_LINK_TEST_SOFT_LINK_COPY_NAME2); + printf(" couldn't determine if soft link '%s' copy exists\n", + COPY_LINK_TEST_SOFT_LINK_COPY_NAME2); PART_ERROR(H5Lcopy_soft_check); } if (!link_exists) { H5_FAILED(); - HDprintf(" soft link copy did not exist\n"); + printf(" soft link copy did not exist\n"); PART_ERROR(H5Lcopy_soft_check); } if ((link_exists = H5Lexists(src_grp_id, COPY_LINK_TEST_SOFT_LINK_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if original soft link '%s' exists\n", - COPY_LINK_TEST_SOFT_LINK_NAME2); + printf(" couldn't determine if original soft link '%s' exists\n", + COPY_LINK_TEST_SOFT_LINK_NAME2); PART_ERROR(H5Lcopy_soft_check); } if (!link_exists) { H5_FAILED(); - HDprintf(" original soft link did not exist\n"); + printf(" original soft link did not exist\n"); PART_ERROR(H5Lcopy_soft_check); } /* Retrieve the new link's info */ if (H5Lget_info2(dst_grp_id, COPY_LINK_TEST_SOFT_LINK_COPY_NAME2, &new_info, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't retrieve info for link '%s'\n", COPY_LINK_TEST_SOFT_LINK_COPY_NAME2); + printf(" couldn't retrieve info for link '%s'\n", COPY_LINK_TEST_SOFT_LINK_COPY_NAME2); PART_ERROR(H5Lcopy_soft_check); } if (new_info.type != orig_info.type) { H5_FAILED(); - HDprintf(" copied link's link type doesn't match original link's type\n"); + printf(" copied link's link type doesn't match original link's type\n"); PART_ERROR(H5Lcopy_soft_check); } if (new_info.u.val_size != orig_info.u.val_size) { H5_FAILED(); - HDprintf(" copied soft link's value size of %llu doesn't match original link's value size " - "of %llu\n", - (unsigned long long)new_info.u.val_size, (unsigned long long)orig_info.u.val_size); + printf(" copied soft link's value size of %llu doesn't match original link's value size " + "of %llu\n", + (unsigned long long)new_info.u.val_size, (unsigned long long)orig_info.u.val_size); PART_ERROR(H5Lcopy_soft_check); } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (new_info.corder_valid != orig_info.corder_valid) { H5_FAILED(); - HDprintf(" copied link's 'corder_valid' field doesn't match original link's " - "'corder_valid' field\n"); + printf(" copied link's 'corder_valid' field doesn't match original link's " + "'corder_valid' field\n"); PART_ERROR(H5Lcopy_soft_check); } if (new_info.corder_valid && orig_info.corder_valid && (new_info.corder != orig_info.corder)) { H5_FAILED(); - HDprintf(" copied link's creation order value %" PRId64 - " doesn't match original link's creation order value %" PRId64 "\n", - new_info.corder, orig_info.corder); + printf(" copied link's creation order value %" PRId64 + " doesn't match original link's creation order value %" PRId64 "\n", + new_info.corder, orig_info.corder); PART_ERROR(H5Lcopy_soft_check); } } if (new_info.cset != orig_info.cset) { H5_FAILED(); - HDprintf(" copied link's character set doesn't match original link's character set\n"); + printf(" copied link's character set doesn't match original link's character set\n"); PART_ERROR(H5Lcopy_soft_check); } @@ -8236,15 +8122,15 @@ test_copy_link(void) if (H5Lget_val(dst_grp_id, COPY_LINK_TEST_SOFT_LINK_COPY_NAME2, new_link_val, COPY_LINK_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't retrieve value for soft link '%s'\n", - COPY_LINK_TEST_SOFT_LINK_COPY_NAME2); + printf(" couldn't retrieve value for soft link '%s'\n", + COPY_LINK_TEST_SOFT_LINK_COPY_NAME2); PART_ERROR(H5Lcopy_soft_check); } if (HDstrncmp(orig_link_val, new_link_val, COPY_LINK_TEST_LINK_VAL_BUF_SIZE)) { H5_FAILED(); - HDprintf(" copied soft link's value '%s' doesn't match original link's value '%s'\n", - new_link_val, orig_link_val); + printf(" copied soft link's value '%s' doesn't match original link's value '%s'\n", + new_link_val, orig_link_val); PART_ERROR(H5Lcopy_soft_check); } @@ -8260,20 +8146,20 @@ test_copy_link(void) if (H5Lcreate_soft(COPY_LINK_TEST_SOFT_LINK_TARGET_PATH, src_grp_id, COPY_LINK_TEST_SOFT_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create soft link '%s'\n", COPY_LINK_TEST_SOFT_LINK_NAME3); + printf(" couldn't create soft link '%s'\n", COPY_LINK_TEST_SOFT_LINK_NAME3); PART_ERROR(H5Lcopy_soft_same_loc); } /* Verify the link has been created */ if ((link_exists = H5Lexists(src_grp_id, COPY_LINK_TEST_SOFT_LINK_NAME3, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if soft link '%s' exists\n", COPY_LINK_TEST_SOFT_LINK_NAME3); + printf(" couldn't determine if soft link '%s' exists\n", COPY_LINK_TEST_SOFT_LINK_NAME3); PART_ERROR(H5Lcopy_soft_same_loc); } if (!link_exists) { H5_FAILED(); - HDprintf(" soft link did not exist\n"); + printf(" soft link did not exist\n"); PART_ERROR(H5Lcopy_soft_same_loc); } @@ -8281,28 +8167,28 @@ test_copy_link(void) if ((link_exists = H5Lexists(src_grp_id, COPY_LINK_TEST_SOFT_LINK_SAME_LOC_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if soft link '%s' exists\n", - COPY_LINK_TEST_SOFT_LINK_SAME_LOC_NAME); + printf(" couldn't determine if soft link '%s' exists\n", + COPY_LINK_TEST_SOFT_LINK_SAME_LOC_NAME); PART_ERROR(H5Lcopy_soft_same_loc); } if (link_exists) { H5_FAILED(); - HDprintf(" soft link existed in target group before copy!\n"); + printf(" soft link existed in target group before copy!\n"); PART_ERROR(H5Lcopy_soft_same_loc); } if ((link_exists = H5Lexists(src_grp_id, COPY_LINK_TEST_SOFT_LINK_SAME_LOC_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if soft link '%s' exists\n", - COPY_LINK_TEST_SOFT_LINK_SAME_LOC_NAME2); + printf(" couldn't determine if soft link '%s' exists\n", + COPY_LINK_TEST_SOFT_LINK_SAME_LOC_NAME2); PART_ERROR(H5Lcopy_soft_same_loc); } if (link_exists) { H5_FAILED(); - HDprintf(" soft link existed in target group before copy!\n"); + printf(" soft link existed in target group before copy!\n"); PART_ERROR(H5Lcopy_soft_same_loc); } @@ -8310,9 +8196,8 @@ test_copy_link(void) if (H5Lcopy(H5L_SAME_LOC, COPY_LINK_TEST_SOFT_LINK_NAME3, src_grp_id, COPY_LINK_TEST_SOFT_LINK_SAME_LOC_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf( - " failed to copy soft link '%s' using H5L_SAME_LOC as first parameter to H5Lcopy\n", - COPY_LINK_TEST_SOFT_LINK_NAME3); + printf(" failed to copy soft link '%s' using H5L_SAME_LOC as first parameter to H5Lcopy\n", + COPY_LINK_TEST_SOFT_LINK_NAME3); PART_ERROR(H5Lcopy_soft_same_loc); } @@ -8320,9 +8205,8 @@ test_copy_link(void) if (H5Lcopy(src_grp_id, COPY_LINK_TEST_SOFT_LINK_NAME3, H5L_SAME_LOC, COPY_LINK_TEST_SOFT_LINK_SAME_LOC_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf( - " failed to copy soft link '%s' using H5L_SAME_LOC as third parameter to H5Lcopy\n", - COPY_LINK_TEST_SOFT_LINK_NAME3); + printf(" failed to copy soft link '%s' using H5L_SAME_LOC as third parameter to H5Lcopy\n", + COPY_LINK_TEST_SOFT_LINK_NAME3); PART_ERROR(H5Lcopy_soft_same_loc); } @@ -8330,41 +8214,41 @@ test_copy_link(void) if ((link_exists = H5Lexists(src_grp_id, COPY_LINK_TEST_SOFT_LINK_SAME_LOC_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if soft link '%s' copy exists\n", - COPY_LINK_TEST_SOFT_LINK_SAME_LOC_NAME); + printf(" couldn't determine if soft link '%s' copy exists\n", + COPY_LINK_TEST_SOFT_LINK_SAME_LOC_NAME); PART_ERROR(H5Lcopy_soft_same_loc); } if (!link_exists) { H5_FAILED(); - HDprintf(" soft link copy did not exist\n"); + printf(" soft link copy did not exist\n"); PART_ERROR(H5Lcopy_soft_same_loc); } if ((link_exists = H5Lexists(src_grp_id, COPY_LINK_TEST_SOFT_LINK_SAME_LOC_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if soft link '%s' copy exists\n", - COPY_LINK_TEST_SOFT_LINK_SAME_LOC_NAME2); + printf(" couldn't determine if soft link '%s' copy exists\n", + COPY_LINK_TEST_SOFT_LINK_SAME_LOC_NAME2); PART_ERROR(H5Lcopy_soft_same_loc); } if (!link_exists) { H5_FAILED(); - HDprintf(" soft link copy did not exist\n"); + printf(" soft link copy did not exist\n"); PART_ERROR(H5Lcopy_soft_same_loc); } if ((link_exists = H5Lexists(src_grp_id, COPY_LINK_TEST_SOFT_LINK_NAME3, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if original soft link '%s' exists\n", - COPY_LINK_TEST_SOFT_LINK_NAME3); + printf(" couldn't determine if original soft link '%s' exists\n", + COPY_LINK_TEST_SOFT_LINK_NAME3); PART_ERROR(H5Lcopy_soft_same_loc); } if (!link_exists) { H5_FAILED(); - HDprintf(" original soft link did not exist\n"); + printf(" original soft link did not exist\n"); PART_ERROR(H5Lcopy_soft_same_loc); } @@ -8381,13 +8265,13 @@ test_copy_link(void) if ((ext_file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); + printf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); PART_ERROR(H5Lcopy_external_no_check); } if (H5Fclose(ext_file_id) < 0) { H5_FAILED(); - HDprintf(" couldn't close file '%s'\n", ext_link_filename); + printf(" couldn't close file '%s'\n", ext_link_filename); PART_ERROR(H5Lcopy_external_no_check); } @@ -8395,35 +8279,35 @@ test_copy_link(void) if (H5Lcreate_external(ext_link_filename, "/", src_grp_id, COPY_LINK_TEST_EXTERNAL_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create external link '%s'\n", COPY_LINK_TEST_EXTERNAL_LINK_NAME); + printf(" couldn't create external link '%s'\n", COPY_LINK_TEST_EXTERNAL_LINK_NAME); PART_ERROR(H5Lcopy_external_no_check); } /* Verify the link has been created */ if ((link_exists = H5Lexists(src_grp_id, COPY_LINK_TEST_EXTERNAL_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if external link '%s' exists\n", - COPY_LINK_TEST_EXTERNAL_LINK_NAME); + printf(" couldn't determine if external link '%s' exists\n", + COPY_LINK_TEST_EXTERNAL_LINK_NAME); PART_ERROR(H5Lcopy_external_no_check); } if (!link_exists) { H5_FAILED(); - HDprintf(" external link did not exist\n"); + printf(" external link did not exist\n"); PART_ERROR(H5Lcopy_external_no_check); } /* Verify the link doesn't currently exist in the target group */ if ((link_exists = H5Lexists(dst_grp_id, COPY_LINK_TEST_EXTERNAL_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if external link '%s' exists\n", - COPY_LINK_TEST_EXTERNAL_LINK_NAME); + printf(" couldn't determine if external link '%s' exists\n", + COPY_LINK_TEST_EXTERNAL_LINK_NAME); PART_ERROR(H5Lcopy_external_no_check); } if (link_exists) { H5_FAILED(); - HDprintf(" external link existed in target group before copy!\n"); + printf(" external link existed in target group before copy!\n"); PART_ERROR(H5Lcopy_external_no_check); } @@ -8431,7 +8315,7 @@ test_copy_link(void) if (H5Lcopy(src_grp_id, COPY_LINK_TEST_EXTERNAL_LINK_NAME, dst_grp_id, COPY_LINK_TEST_EXTERNAL_LINK_COPY_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to copy external link '%s'\n", COPY_LINK_TEST_EXTERNAL_LINK_NAME); + printf(" failed to copy external link '%s'\n", COPY_LINK_TEST_EXTERNAL_LINK_NAME); PART_ERROR(H5Lcopy_external_no_check); } @@ -8439,27 +8323,27 @@ test_copy_link(void) if ((link_exists = H5Lexists(dst_grp_id, COPY_LINK_TEST_EXTERNAL_LINK_COPY_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if external link copy '%s' exists\n", - COPY_LINK_TEST_EXTERNAL_LINK_COPY_NAME); + printf(" couldn't determine if external link copy '%s' exists\n", + COPY_LINK_TEST_EXTERNAL_LINK_COPY_NAME); PART_ERROR(H5Lcopy_external_no_check); } if (!link_exists) { H5_FAILED(); - HDprintf(" external link copy did not exist\n"); + printf(" external link copy did not exist\n"); PART_ERROR(H5Lcopy_external_no_check); } if ((link_exists = H5Lexists(src_grp_id, COPY_LINK_TEST_EXTERNAL_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if original external link '%s' exists\n", - COPY_LINK_TEST_EXTERNAL_LINK_NAME); + printf(" couldn't determine if original external link '%s' exists\n", + COPY_LINK_TEST_EXTERNAL_LINK_NAME); PART_ERROR(H5Lcopy_external_no_check); } if (!link_exists) { H5_FAILED(); - HDprintf(" original external link did not exist\n"); + printf(" original external link did not exist\n"); PART_ERROR(H5Lcopy_external_no_check); } @@ -8490,13 +8374,13 @@ test_copy_link(void) if ((ext_file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); + printf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); PART_ERROR(H5Lcopy_external_check); } if (H5Fclose(ext_file_id) < 0) { H5_FAILED(); - HDprintf(" couldn't close file '%s'\n", ext_link_filename); + printf(" couldn't close file '%s'\n", ext_link_filename); PART_ERROR(H5Lcopy_external_check); } @@ -8504,28 +8388,28 @@ test_copy_link(void) if (H5Lcreate_external(ext_link_filename, "/", src_grp_id, COPY_LINK_TEST_EXTERNAL_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create external link '%s'\n", COPY_LINK_TEST_EXTERNAL_LINK_NAME2); + printf(" couldn't create external link '%s'\n", COPY_LINK_TEST_EXTERNAL_LINK_NAME2); PART_ERROR(H5Lcopy_external_check); } /* Verify the link has been created */ if ((link_exists = H5Lexists(src_grp_id, COPY_LINK_TEST_EXTERNAL_LINK_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if external link '%s' exists\n", - COPY_LINK_TEST_EXTERNAL_LINK_NAME2); + printf(" couldn't determine if external link '%s' exists\n", + COPY_LINK_TEST_EXTERNAL_LINK_NAME2); PART_ERROR(H5Lcopy_external_check); } if (!link_exists) { H5_FAILED(); - HDprintf(" external link did not exist\n"); + printf(" external link did not exist\n"); PART_ERROR(H5Lcopy_external_check); } /* Retrieve the link's info */ if (H5Lget_info2(src_grp_id, COPY_LINK_TEST_EXTERNAL_LINK_NAME2, &orig_info, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't retrieve info for link '%s'\n", COPY_LINK_TEST_EXTERNAL_LINK_NAME2); + printf(" couldn't retrieve info for link '%s'\n", COPY_LINK_TEST_EXTERNAL_LINK_NAME2); PART_ERROR(H5Lcopy_external_check); } @@ -8533,29 +8417,29 @@ test_copy_link(void) if (H5Lget_val(src_grp_id, COPY_LINK_TEST_EXTERNAL_LINK_NAME2, orig_link_val, COPY_LINK_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't retrieve value for external link '%s'\n", - COPY_LINK_TEST_EXTERNAL_LINK_NAME2); + printf(" couldn't retrieve value for external link '%s'\n", + COPY_LINK_TEST_EXTERNAL_LINK_NAME2); PART_ERROR(H5Lcopy_external_check); } if (H5Lunpack_elink_val(orig_link_val, orig_info.u.val_size, &unpack_flags, &orig_filename, &orig_objname) < 0) { H5_FAILED(); - HDprintf(" couldn't unpack original external link's value buffer\n"); + printf(" couldn't unpack original external link's value buffer\n"); PART_ERROR(H5Lcopy_external_check); } /* Verify the link doesn't currently exist in the target group */ if ((link_exists = H5Lexists(dst_grp_id, COPY_LINK_TEST_EXTERNAL_LINK_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if external link '%s' exists\n", - COPY_LINK_TEST_EXTERNAL_LINK_NAME2); + printf(" couldn't determine if external link '%s' exists\n", + COPY_LINK_TEST_EXTERNAL_LINK_NAME2); PART_ERROR(H5Lcopy_external_check); } if (link_exists) { H5_FAILED(); - HDprintf(" external link existed in target group before copy!\n"); + printf(" external link existed in target group before copy!\n"); PART_ERROR(H5Lcopy_external_check); } @@ -8563,7 +8447,7 @@ test_copy_link(void) if (H5Lcopy(src_grp_id, COPY_LINK_TEST_EXTERNAL_LINK_NAME2, dst_grp_id, COPY_LINK_TEST_EXTERNAL_LINK_COPY_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to copy external link '%s'\n", COPY_LINK_TEST_EXTERNAL_LINK_NAME2); + printf(" failed to copy external link '%s'\n", COPY_LINK_TEST_EXTERNAL_LINK_NAME2); PART_ERROR(H5Lcopy_external_check); } @@ -8571,27 +8455,27 @@ test_copy_link(void) if ((link_exists = H5Lexists(dst_grp_id, COPY_LINK_TEST_EXTERNAL_LINK_COPY_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if external link copy '%s' exists\n", - COPY_LINK_TEST_EXTERNAL_LINK_COPY_NAME2); + printf(" couldn't determine if external link copy '%s' exists\n", + COPY_LINK_TEST_EXTERNAL_LINK_COPY_NAME2); PART_ERROR(H5Lcopy_external_check); } if (!link_exists) { H5_FAILED(); - HDprintf(" external link copy did not exist\n"); + printf(" external link copy did not exist\n"); PART_ERROR(H5Lcopy_external_check); } if ((link_exists = H5Lexists(src_grp_id, COPY_LINK_TEST_EXTERNAL_LINK_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if original external link '%s' exists\n", - COPY_LINK_TEST_EXTERNAL_LINK_NAME2); + printf(" couldn't determine if original external link '%s' exists\n", + COPY_LINK_TEST_EXTERNAL_LINK_NAME2); PART_ERROR(H5Lcopy_external_check); } if (!link_exists) { H5_FAILED(); - HDprintf(" original external link did not exist\n"); + printf(" original external link did not exist\n"); PART_ERROR(H5Lcopy_external_check); } @@ -8599,47 +8483,46 @@ test_copy_link(void) if (H5Lget_info2(dst_grp_id, COPY_LINK_TEST_EXTERNAL_LINK_COPY_NAME2, &new_info, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't retrieve info for link '%s'\n", - COPY_LINK_TEST_EXTERNAL_LINK_COPY_NAME2); + printf(" couldn't retrieve info for link '%s'\n", COPY_LINK_TEST_EXTERNAL_LINK_COPY_NAME2); PART_ERROR(H5Lcopy_external_check); } if (new_info.type != orig_info.type) { H5_FAILED(); - HDprintf(" copied link's link type doesn't match original link's type\n"); + printf(" copied link's link type doesn't match original link's type\n"); PART_ERROR(H5Lcopy_external_check); } if (new_info.u.val_size != orig_info.u.val_size) { H5_FAILED(); - HDprintf(" copied external link's value size of %llu doesn't match original link's value " - "size of %llu\n", - (unsigned long long)new_info.u.val_size, (unsigned long long)orig_info.u.val_size); + printf(" copied external link's value size of %llu doesn't match original link's value " + "size of %llu\n", + (unsigned long long)new_info.u.val_size, (unsigned long long)orig_info.u.val_size); PART_ERROR(H5Lcopy_external_check); } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (new_info.corder_valid != orig_info.corder_valid) { H5_FAILED(); - HDprintf(" copied link's 'corder_valid' field doesn't match original link's " - "'corder_valid' field\n"); + printf(" copied link's 'corder_valid' field doesn't match original link's " + "'corder_valid' field\n"); PART_ERROR(H5Lcopy_external_check); } if (new_info.corder_valid && orig_info.corder_valid && (new_info.corder != orig_info.corder)) { H5_FAILED(); - HDprintf(" copied link's creation order value %" PRId64 - " doesn't match original link's creation " - "order value %" PRId64 "\n", - new_info.corder, orig_info.corder); + printf(" copied link's creation order value %" PRId64 + " doesn't match original link's creation " + "order value %" PRId64 "\n", + new_info.corder, orig_info.corder); PART_ERROR(H5Lcopy_external_check); } } if (new_info.cset != orig_info.cset) { H5_FAILED(); - HDprintf(" copied link's character set doesn't match original link's character set\n"); + printf(" copied link's character set doesn't match original link's character set\n"); PART_ERROR(H5Lcopy_external_check); } @@ -8647,31 +8530,31 @@ test_copy_link(void) if (H5Lget_val(dst_grp_id, COPY_LINK_TEST_EXTERNAL_LINK_COPY_NAME2, new_link_val, COPY_LINK_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't retrieve value for external link '%s'\n", - COPY_LINK_TEST_EXTERNAL_LINK_COPY_NAME2); + printf(" couldn't retrieve value for external link '%s'\n", + COPY_LINK_TEST_EXTERNAL_LINK_COPY_NAME2); PART_ERROR(H5Lcopy_external_check); } if (H5Lunpack_elink_val(new_link_val, new_info.u.val_size, &unpack_flags, &new_filename, &new_objname) < 0) { H5_FAILED(); - HDprintf(" couldn't unpack copied external link's value buffer\n"); + printf(" couldn't unpack copied external link's value buffer\n"); PART_ERROR(H5Lcopy_external_check); } if (HDstrncmp(new_filename, orig_filename, strlen(orig_filename)) < 0) { H5_FAILED(); - HDprintf(" copied external link's filename '%s' doesn't match original external link's " - "filename '%s'\n", - new_filename, orig_filename); + printf(" copied external link's filename '%s' doesn't match original external link's " + "filename '%s'\n", + new_filename, orig_filename); PART_ERROR(H5Lcopy_external_check); } if (HDstrncmp(new_objname, orig_objname, strlen(orig_objname)) < 0) { H5_FAILED(); - HDprintf(" copied external link's object name '%s' doesn't match original external link's " - "object name '%s'\n", - new_objname, orig_objname); + printf(" copied external link's object name '%s' doesn't match original external link's " + "object name '%s'\n", + new_objname, orig_objname); PART_ERROR(H5Lcopy_external_check); } @@ -8695,13 +8578,13 @@ test_copy_link(void) if ((ext_file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); + printf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); PART_ERROR(H5Lcopy_external_same_loc); } if (H5Fclose(ext_file_id) < 0) { H5_FAILED(); - HDprintf(" couldn't close file '%s'\n", ext_link_filename); + printf(" couldn't close file '%s'\n", ext_link_filename); PART_ERROR(H5Lcopy_external_same_loc); } @@ -8709,21 +8592,21 @@ test_copy_link(void) if (H5Lcreate_external(ext_link_filename, "/", src_grp_id, COPY_LINK_TEST_EXTERNAL_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create external link '%s'\n", COPY_LINK_TEST_EXTERNAL_LINK_NAME3); + printf(" couldn't create external link '%s'\n", COPY_LINK_TEST_EXTERNAL_LINK_NAME3); PART_ERROR(H5Lcopy_external_same_loc); } /* Verify the link has been created */ if ((link_exists = H5Lexists(src_grp_id, COPY_LINK_TEST_EXTERNAL_LINK_NAME3, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if external link '%s' exists\n", - COPY_LINK_TEST_EXTERNAL_LINK_NAME3); + printf(" couldn't determine if external link '%s' exists\n", + COPY_LINK_TEST_EXTERNAL_LINK_NAME3); PART_ERROR(H5Lcopy_external_same_loc); } if (!link_exists) { H5_FAILED(); - HDprintf(" external link did not exist\n"); + printf(" external link did not exist\n"); PART_ERROR(H5Lcopy_external_same_loc); } @@ -8731,28 +8614,28 @@ test_copy_link(void) if ((link_exists = H5Lexists(src_grp_id, COPY_LINK_TEST_EXTERNAL_LINK_SAME_LOC_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if external link '%s' exists\n", - COPY_LINK_TEST_EXTERNAL_LINK_SAME_LOC_NAME); + printf(" couldn't determine if external link '%s' exists\n", + COPY_LINK_TEST_EXTERNAL_LINK_SAME_LOC_NAME); PART_ERROR(H5Lcopy_external_same_loc); } if (link_exists) { H5_FAILED(); - HDprintf(" external link existed in target group before copy!\n"); + printf(" external link existed in target group before copy!\n"); PART_ERROR(H5Lcopy_external_same_loc); } if ((link_exists = H5Lexists(src_grp_id, COPY_LINK_TEST_EXTERNAL_LINK_SAME_LOC_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if external link '%s' exists\n", - COPY_LINK_TEST_EXTERNAL_LINK_SAME_LOC_NAME2); + printf(" couldn't determine if external link '%s' exists\n", + COPY_LINK_TEST_EXTERNAL_LINK_SAME_LOC_NAME2); PART_ERROR(H5Lcopy_external_same_loc); } if (link_exists) { H5_FAILED(); - HDprintf(" external link existed in target group before copy!\n"); + printf(" external link existed in target group before copy!\n"); PART_ERROR(H5Lcopy_external_same_loc); } @@ -8760,9 +8643,9 @@ test_copy_link(void) if (H5Lcopy(H5L_SAME_LOC, COPY_LINK_TEST_EXTERNAL_LINK_NAME3, src_grp_id, COPY_LINK_TEST_EXTERNAL_LINK_SAME_LOC_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to copy external link '%s' using H5L_SAME_LOC as first parameter to " - "H5Lcopy\n", - COPY_LINK_TEST_EXTERNAL_LINK_NAME3); + printf(" failed to copy external link '%s' using H5L_SAME_LOC as first parameter to " + "H5Lcopy\n", + COPY_LINK_TEST_EXTERNAL_LINK_NAME3); PART_ERROR(H5Lcopy_external_same_loc); } @@ -8770,9 +8653,9 @@ test_copy_link(void) if (H5Lcopy(src_grp_id, COPY_LINK_TEST_EXTERNAL_LINK_NAME3, H5L_SAME_LOC, COPY_LINK_TEST_EXTERNAL_LINK_SAME_LOC_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to copy external link '%s' using H5L_SAME_LOC as third parameter to " - "H5Lcopy\n", - COPY_LINK_TEST_EXTERNAL_LINK_NAME3); + printf(" failed to copy external link '%s' using H5L_SAME_LOC as third parameter to " + "H5Lcopy\n", + COPY_LINK_TEST_EXTERNAL_LINK_NAME3); PART_ERROR(H5Lcopy_external_same_loc); } @@ -8780,41 +8663,41 @@ test_copy_link(void) if ((link_exists = H5Lexists(src_grp_id, COPY_LINK_TEST_EXTERNAL_LINK_SAME_LOC_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if external link copy '%s' exists\n", - COPY_LINK_TEST_EXTERNAL_LINK_SAME_LOC_NAME); + printf(" couldn't determine if external link copy '%s' exists\n", + COPY_LINK_TEST_EXTERNAL_LINK_SAME_LOC_NAME); PART_ERROR(H5Lcopy_external_same_loc); } if (!link_exists) { H5_FAILED(); - HDprintf(" external link copy did not exist\n"); + printf(" external link copy did not exist\n"); PART_ERROR(H5Lcopy_external_same_loc); } if ((link_exists = H5Lexists(src_grp_id, COPY_LINK_TEST_EXTERNAL_LINK_SAME_LOC_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if external link copy '%s' exists\n", - COPY_LINK_TEST_EXTERNAL_LINK_SAME_LOC_NAME2); + printf(" couldn't determine if external link copy '%s' exists\n", + COPY_LINK_TEST_EXTERNAL_LINK_SAME_LOC_NAME2); PART_ERROR(H5Lcopy_external_same_loc); } if (!link_exists) { H5_FAILED(); - HDprintf(" external link copy did not exist\n"); + printf(" external link copy did not exist\n"); PART_ERROR(H5Lcopy_external_same_loc); } if ((link_exists = H5Lexists(src_grp_id, COPY_LINK_TEST_EXTERNAL_LINK_NAME3, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if original external link '%s' exists\n", - COPY_LINK_TEST_EXTERNAL_LINK_NAME3); + printf(" couldn't determine if original external link '%s' exists\n", + COPY_LINK_TEST_EXTERNAL_LINK_NAME3); PART_ERROR(H5Lcopy_external_same_loc); } if (!link_exists) { H5_FAILED(); - HDprintf(" original external link did not exist\n"); + printf(" original external link did not exist\n"); PART_ERROR(H5Lcopy_external_same_loc); } @@ -8958,8 +8841,8 @@ test_copy_link_invalid_params(void) !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_MORE) || !(vol_cap_flags_g & H5VL_CAP_FLAG_HARD_LINKS)) { SKIPPED(); - HDprintf(" API functions for basic file, group, link, or hard links aren't supported with this " - "connector\n"); + printf(" API functions for basic file, group, link, or hard links aren't supported with this " + "connector\n"); return 0; } @@ -8967,41 +8850,41 @@ test_copy_link_invalid_params(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s\n", H5_api_test_filename); + printf(" couldn't open file '%s\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, COPY_LINK_INVALID_PARAMS_TEST_SUBGROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create group '%s'\n", COPY_LINK_INVALID_PARAMS_TEST_SUBGROUP_NAME); + printf(" couldn't create group '%s'\n", COPY_LINK_INVALID_PARAMS_TEST_SUBGROUP_NAME); goto error; } if ((src_grp_id = H5Gcreate2(group_id, COPY_LINK_INVALID_PARAMS_TEST_SRC_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create group '%s'\n", COPY_LINK_INVALID_PARAMS_TEST_SRC_GROUP_NAME); + printf(" couldn't create group '%s'\n", COPY_LINK_INVALID_PARAMS_TEST_SRC_GROUP_NAME); goto error; } if ((dst_grp_id = H5Gcreate2(group_id, COPY_LINK_INVALID_PARAMS_TEST_DST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create group '%s'\n", COPY_LINK_INVALID_PARAMS_TEST_DST_GROUP_NAME); + printf(" couldn't create group '%s'\n", COPY_LINK_INVALID_PARAMS_TEST_DST_GROUP_NAME); goto error; } if (H5Lcreate_hard(group_id, ".", src_grp_id, COPY_LINK_INVALID_PARAMS_TEST_HARD_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create hard link '%s'\n", COPY_LINK_INVALID_PARAMS_TEST_HARD_LINK_NAME); + printf(" couldn't create hard link '%s'\n", COPY_LINK_INVALID_PARAMS_TEST_HARD_LINK_NAME); goto error; } @@ -9009,14 +8892,14 @@ test_copy_link_invalid_params(void) if ((link_exists = H5Lexists(src_grp_id, COPY_LINK_INVALID_PARAMS_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if hard link '%s' exists\n", - COPY_LINK_INVALID_PARAMS_TEST_HARD_LINK_NAME); + printf(" couldn't determine if hard link '%s' exists\n", + COPY_LINK_INVALID_PARAMS_TEST_HARD_LINK_NAME); goto error; } if (!link_exists) { H5_FAILED(); - HDprintf(" hard link did not exist\n"); + printf(" hard link did not exist\n"); goto error; } @@ -9038,7 +8921,7 @@ test_copy_link_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Lcopy succeeded with an invalid source location ID\n"); + printf(" H5Lcopy succeeded with an invalid source location ID\n"); PART_ERROR(H5Lcopy_invalid_src_loc_id); } @@ -9060,7 +8943,7 @@ test_copy_link_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Lcopy succeeded with a NULL source name\n"); + printf(" H5Lcopy succeeded with a NULL source name\n"); PART_ERROR(H5Lcopy_invalid_src_name); } @@ -9074,7 +8957,7 @@ test_copy_link_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Lcopy succeeded with an invalid source name of ''\n"); + printf(" H5Lcopy succeeded with an invalid source name of ''\n"); PART_ERROR(H5Lcopy_invalid_src_name); } @@ -9096,7 +8979,7 @@ test_copy_link_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Lcopy succeeded with an invalid destination location ID\n"); + printf(" H5Lcopy succeeded with an invalid destination location ID\n"); PART_ERROR(H5Lcopy_invalid_dst_loc_id); } @@ -9117,7 +9000,7 @@ test_copy_link_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Lcopy succeeded with a NULL destination name\n"); + printf(" H5Lcopy succeeded with a NULL destination name\n"); PART_ERROR(H5Lcopy_invalid_dst_name); } @@ -9130,7 +9013,7 @@ test_copy_link_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Lcopy succeeded with an invalid destination name of ''\n"); + printf(" H5Lcopy succeeded with an invalid destination name of ''\n"); PART_ERROR(H5Lcopy_invalid_dst_name); } @@ -9152,7 +9035,7 @@ test_copy_link_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Lcopy succeeded with an invalid LCPL\n"); + printf(" H5Lcopy succeeded with an invalid LCPL\n"); PART_ERROR(H5Lcopy_invalid_lcpl); } @@ -9174,7 +9057,7 @@ test_copy_link_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Lcopy succeeded with an invalid LAPL\n"); + printf(" H5Lcopy succeeded with an invalid LAPL\n"); PART_ERROR(H5Lcopy_invalid_lapl); } @@ -9196,7 +9079,7 @@ test_copy_link_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Lcopy succeeded with an invalid same location\n"); + printf(" H5Lcopy succeeded with an invalid same location\n"); PART_ERROR(H5Lcopy_invalid_same_location); } @@ -9213,7 +9096,7 @@ test_copy_link_invalid_params(void) if ((ext_file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); + printf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); PART_ERROR(H5Lcopy_invalid_across_files); } @@ -9227,13 +9110,13 @@ test_copy_link_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Lcopy succeeded in copying a hard link across files!\n"); + printf(" H5Lcopy succeeded in copying a hard link across files!\n"); PART_ERROR(H5Lcopy_invalid_across_files); } if (H5Fclose(ext_file_id) < 0) { H5_FAILED(); - HDprintf(" couldn't close file '%s'\n", ext_link_filename); + printf(" couldn't close file '%s'\n", ext_link_filename); PART_ERROR(H5Lcopy_invalid_across_files); } @@ -9296,9 +9179,8 @@ test_move_link(void) !(vol_cap_flags_g & H5VL_CAP_FLAG_HARD_LINKS) || !(vol_cap_flags_g & H5VL_CAP_FLAG_EXTERNAL_LINKS) || !(vol_cap_flags_g & H5VL_CAP_FLAG_SOFT_LINKS)) { SKIPPED(); - HDprintf( - " API functions for basic file, group, link, hard link, soft link, or external link aren't " - "supported with this connector\n"); + printf(" API functions for basic file, group, link, hard link, soft link, or external link aren't " + "supported with this connector\n"); return 0; } @@ -9308,34 +9190,34 @@ test_move_link(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, MOVE_LINK_TEST_SUBGROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create group '%s'\n", MOVE_LINK_TEST_SUBGROUP_NAME); + printf(" couldn't create group '%s'\n", MOVE_LINK_TEST_SUBGROUP_NAME); goto error; } if ((src_grp_id = H5Gcreate2(group_id, MOVE_LINK_TEST_SRC_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create group '%s'\n", MOVE_LINK_TEST_SRC_GROUP_NAME); + printf(" couldn't create group '%s'\n", MOVE_LINK_TEST_SRC_GROUP_NAME); goto error; } if ((dst_grp_id = H5Gcreate2(group_id, MOVE_LINK_TEST_DST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create group '%s'\n", MOVE_LINK_TEST_DST_GROUP_NAME); + printf(" couldn't create group '%s'\n", MOVE_LINK_TEST_DST_GROUP_NAME); goto error; } @@ -9351,33 +9233,33 @@ test_move_link(void) if (H5Lcreate_hard(group_id, ".", src_grp_id, MOVE_LINK_TEST_HARD_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create hard link '%s'\n", MOVE_LINK_TEST_HARD_LINK_NAME); + printf(" couldn't create hard link '%s'\n", MOVE_LINK_TEST_HARD_LINK_NAME); PART_ERROR(H5Lmove_hard_no_check); } /* Verify the link has been created */ if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if hard link '%s' exists\n", MOVE_LINK_TEST_HARD_LINK_NAME); + printf(" couldn't determine if hard link '%s' exists\n", MOVE_LINK_TEST_HARD_LINK_NAME); PART_ERROR(H5Lmove_hard_no_check); } if (!link_exists) { H5_FAILED(); - HDprintf(" hard link did not exist\n"); + printf(" hard link did not exist\n"); PART_ERROR(H5Lmove_hard_no_check); } /* Verify the link doesn't currently exist in the target group */ if ((link_exists = H5Lexists(dst_grp_id, MOVE_LINK_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if hard link '%s' exists\n", MOVE_LINK_TEST_HARD_LINK_NAME); + printf(" couldn't determine if hard link '%s' exists\n", MOVE_LINK_TEST_HARD_LINK_NAME); PART_ERROR(H5Lmove_hard_no_check); } if (link_exists) { H5_FAILED(); - HDprintf(" hard link existed in target group before move!\n"); + printf(" hard link existed in target group before move!\n"); PART_ERROR(H5Lmove_hard_no_check); } @@ -9385,34 +9267,34 @@ test_move_link(void) if (H5Lmove(src_grp_id, MOVE_LINK_TEST_HARD_LINK_NAME, dst_grp_id, MOVE_LINK_TEST_HARD_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to move link '%s'\n", MOVE_LINK_TEST_HARD_LINK_NAME); + printf(" failed to move link '%s'\n", MOVE_LINK_TEST_HARD_LINK_NAME); PART_ERROR(H5Lmove_hard_no_check); } /* Verify the link has been moved */ if ((link_exists = H5Lexists(dst_grp_id, MOVE_LINK_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if hard link '%s' exists\n", MOVE_LINK_TEST_HARD_LINK_NAME); + printf(" couldn't determine if hard link '%s' exists\n", MOVE_LINK_TEST_HARD_LINK_NAME); PART_ERROR(H5Lmove_hard_no_check); } if (!link_exists) { H5_FAILED(); - HDprintf(" hard link did not exist\n"); + printf(" hard link did not exist\n"); PART_ERROR(H5Lmove_hard_no_check); } /* Verify the old link is gone */ if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if old hard link '%s' exists\n", - MOVE_LINK_TEST_HARD_LINK_NAME); + printf(" couldn't determine if old hard link '%s' exists\n", + MOVE_LINK_TEST_HARD_LINK_NAME); PART_ERROR(H5Lmove_hard_no_check); } if (link_exists) { H5_FAILED(); - HDprintf(" old hard link exists\n"); + printf(" old hard link exists\n"); PART_ERROR(H5Lmove_hard_no_check); } @@ -9431,40 +9313,40 @@ test_move_link(void) if (H5Lcreate_hard(group_id, ".", src_grp_id, MOVE_LINK_TEST_HARD_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create hard link '%s'\n", MOVE_LINK_TEST_HARD_LINK_NAME2); + printf(" couldn't create hard link '%s'\n", MOVE_LINK_TEST_HARD_LINK_NAME2); PART_ERROR(H5Lmove_hard_check); } /* Verify the link has been created */ if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_HARD_LINK_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if hard link '%s' exists\n", MOVE_LINK_TEST_HARD_LINK_NAME2); + printf(" couldn't determine if hard link '%s' exists\n", MOVE_LINK_TEST_HARD_LINK_NAME2); PART_ERROR(H5Lmove_hard_check); } if (!link_exists) { H5_FAILED(); - HDprintf(" hard link did not exist\n"); + printf(" hard link did not exist\n"); PART_ERROR(H5Lmove_hard_check); } /* Retrieve the link's info */ if (H5Lget_info2(src_grp_id, MOVE_LINK_TEST_HARD_LINK_NAME2, &orig_info, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't retrieve info for link '%s'\n", MOVE_LINK_TEST_HARD_LINK_NAME2); + printf(" couldn't retrieve info for link '%s'\n", MOVE_LINK_TEST_HARD_LINK_NAME2); PART_ERROR(H5Lmove_hard_check); } /* Verify the link doesn't currently exist in the target group */ if ((link_exists = H5Lexists(dst_grp_id, MOVE_LINK_TEST_HARD_LINK_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if hard link '%s' exists\n", MOVE_LINK_TEST_HARD_LINK_NAME2); + printf(" couldn't determine if hard link '%s' exists\n", MOVE_LINK_TEST_HARD_LINK_NAME2); PART_ERROR(H5Lmove_hard_check); } if (link_exists) { H5_FAILED(); - HDprintf(" hard link existed in target group before move!\n"); + printf(" hard link existed in target group before move!\n"); PART_ERROR(H5Lmove_hard_check); } @@ -9472,66 +9354,66 @@ test_move_link(void) if (H5Lmove(src_grp_id, MOVE_LINK_TEST_HARD_LINK_NAME2, dst_grp_id, MOVE_LINK_TEST_HARD_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to move link '%s'\n", MOVE_LINK_TEST_HARD_LINK_NAME2); + printf(" failed to move link '%s'\n", MOVE_LINK_TEST_HARD_LINK_NAME2); PART_ERROR(H5Lmove_hard_check); } /* Verify the link has been moved */ if ((link_exists = H5Lexists(dst_grp_id, MOVE_LINK_TEST_HARD_LINK_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if hard link '%s' exists\n", MOVE_LINK_TEST_HARD_LINK_NAME2); + printf(" couldn't determine if hard link '%s' exists\n", MOVE_LINK_TEST_HARD_LINK_NAME2); PART_ERROR(H5Lmove_hard_check); } if (!link_exists) { H5_FAILED(); - HDprintf(" hard link did not exist\n"); + printf(" hard link did not exist\n"); PART_ERROR(H5Lmove_hard_check); } /* Verify the old link is gone */ if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_HARD_LINK_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if old hard link '%s' exists\n", - MOVE_LINK_TEST_HARD_LINK_NAME2); + printf(" couldn't determine if old hard link '%s' exists\n", + MOVE_LINK_TEST_HARD_LINK_NAME2); PART_ERROR(H5Lmove_hard_check); } if (link_exists) { H5_FAILED(); - HDprintf(" old hard link exists\n"); + printf(" old hard link exists\n"); PART_ERROR(H5Lmove_hard_check); } /* Retrieve the moved link's info */ if (H5Lget_info2(dst_grp_id, MOVE_LINK_TEST_HARD_LINK_NAME2, &new_info, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't retrieve info for link '%s'\n", MOVE_LINK_TEST_HARD_LINK_NAME2); + printf(" couldn't retrieve info for link '%s'\n", MOVE_LINK_TEST_HARD_LINK_NAME2); PART_ERROR(H5Lmove_hard_check); } if (new_info.type != orig_info.type) { H5_FAILED(); - HDprintf(" moved link's link type doesn't match original link's type\n"); + printf(" moved link's link type doesn't match original link's type\n"); PART_ERROR(H5Lmove_hard_check); } if (H5Otoken_cmp(dst_grp_id, &new_info.u.token, &orig_info.u.token, &cmp_value) < 0) { H5_FAILED(); - HDprintf(" failed to compare link target tokens\n"); + printf(" failed to compare link target tokens\n"); PART_ERROR(H5Lmove_hard_check); } if (cmp_value != 0) { H5_FAILED(); - HDprintf(" moved hard link's object token doesn't match original link's object token\n"); + printf(" moved hard link's object token doesn't match original link's object token\n"); PART_ERROR(H5Lmove_hard_check); } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (new_info.corder_valid != orig_info.corder_valid) { H5_FAILED(); - HDprintf( + printf( " moved link's 'corder_valid' field doesn't match original link's 'corder_valid' " "field\n"); PART_ERROR(H5Lmove_hard_check); @@ -9540,16 +9422,16 @@ test_move_link(void) if (new_info.corder_valid && orig_info.corder_valid && (new_info.corder != orig_info.corder)) { H5_FAILED(); - HDprintf(" moved link's creation order value %" PRId64 - " doesn't match original link's creation order value %" PRId64 "\n", - new_info.corder, orig_info.corder); + printf(" moved link's creation order value %" PRId64 + " doesn't match original link's creation order value %" PRId64 "\n", + new_info.corder, orig_info.corder); PART_ERROR(H5Lmove_hard_check); } } if (new_info.cset != orig_info.cset) { H5_FAILED(); - HDprintf(" moved link's character set doesn't match original link's character set\n"); + printf(" moved link's character set doesn't match original link's character set\n"); PART_ERROR(H5Lmove_hard_check); } @@ -9565,20 +9447,20 @@ test_move_link(void) if (H5Lcreate_hard(group_id, ".", src_grp_id, MOVE_LINK_TEST_HARD_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create hard link '%s'\n", MOVE_LINK_TEST_HARD_LINK_NAME3); + printf(" couldn't create hard link '%s'\n", MOVE_LINK_TEST_HARD_LINK_NAME3); PART_ERROR(H5Lmove_hard_same_loc); } /* Verify the link has been created */ if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_HARD_LINK_NAME3, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if hard link '%s' exists\n", MOVE_LINK_TEST_HARD_LINK_NAME3); + printf(" couldn't determine if hard link '%s' exists\n", MOVE_LINK_TEST_HARD_LINK_NAME3); PART_ERROR(H5Lmove_hard_same_loc); } if (!link_exists) { H5_FAILED(); - HDprintf(" hard link did not exist\n"); + printf(" hard link did not exist\n"); PART_ERROR(H5Lmove_hard_same_loc); } @@ -9586,14 +9468,14 @@ test_move_link(void) if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_HARD_LINK_SAME_LOC_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if hard link '%s' exists\n", - MOVE_LINK_TEST_HARD_LINK_SAME_LOC_NAME); + printf(" couldn't determine if hard link '%s' exists\n", + MOVE_LINK_TEST_HARD_LINK_SAME_LOC_NAME); PART_ERROR(H5Lmove_hard_same_loc); } if (link_exists) { H5_FAILED(); - HDprintf(" hard link existed in target group before move!\n"); + printf(" hard link existed in target group before move!\n"); PART_ERROR(H5Lmove_hard_same_loc); } @@ -9601,35 +9483,35 @@ test_move_link(void) if (H5Lmove(H5L_SAME_LOC, MOVE_LINK_TEST_HARD_LINK_NAME3, src_grp_id, MOVE_LINK_TEST_HARD_LINK_SAME_LOC_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to move link '%s' using H5L_SAME_LOC as first parameter to H5Lmove\n", - MOVE_LINK_TEST_HARD_LINK_NAME3); + printf(" failed to move link '%s' using H5L_SAME_LOC as first parameter to H5Lmove\n", + MOVE_LINK_TEST_HARD_LINK_NAME3); PART_ERROR(H5Lmove_hard_same_loc); } /* Ensure the link has been renamed */ if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_HARD_LINK_NAME3, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if hard link '%s' exists\n", MOVE_LINK_TEST_HARD_LINK_NAME3); + printf(" couldn't determine if hard link '%s' exists\n", MOVE_LINK_TEST_HARD_LINK_NAME3); PART_ERROR(H5Lmove_hard_same_loc); } if (link_exists) { H5_FAILED(); - HDprintf(" original hard link existed in target group after move!\n"); + printf(" original hard link existed in target group after move!\n"); PART_ERROR(H5Lmove_hard_same_loc); } if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_HARD_LINK_SAME_LOC_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if hard link '%s' exists\n", - MOVE_LINK_TEST_HARD_LINK_SAME_LOC_NAME); + printf(" couldn't determine if hard link '%s' exists\n", + MOVE_LINK_TEST_HARD_LINK_SAME_LOC_NAME); PART_ERROR(H5Lmove_hard_same_loc); } if (!link_exists) { H5_FAILED(); - HDprintf(" hard link did not exist after move!\n"); + printf(" hard link did not exist after move!\n"); PART_ERROR(H5Lmove_hard_same_loc); } @@ -9637,35 +9519,35 @@ test_move_link(void) if (H5Lmove(src_grp_id, MOVE_LINK_TEST_HARD_LINK_SAME_LOC_NAME, H5L_SAME_LOC, MOVE_LINK_TEST_HARD_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to move link '%s' using H5L_SAME_LOC as third parameter to H5Lmove\n", - MOVE_LINK_TEST_HARD_LINK_SAME_LOC_NAME); + printf(" failed to move link '%s' using H5L_SAME_LOC as third parameter to H5Lmove\n", + MOVE_LINK_TEST_HARD_LINK_SAME_LOC_NAME); PART_ERROR(H5Lmove_hard_same_loc); } /* Verify the link has been renamed back */ if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_HARD_LINK_NAME3, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if hard link '%s' exists\n", MOVE_LINK_TEST_HARD_LINK_NAME3); + printf(" couldn't determine if hard link '%s' exists\n", MOVE_LINK_TEST_HARD_LINK_NAME3); PART_ERROR(H5Lmove_hard_same_loc); } if (!link_exists) { H5_FAILED(); - HDprintf(" original hard link did not exist after moving the link back!\n"); + printf(" original hard link did not exist after moving the link back!\n"); PART_ERROR(H5Lmove_hard_same_loc); } if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_HARD_LINK_SAME_LOC_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if old hard link '%s' exists\n", - MOVE_LINK_TEST_HARD_LINK_SAME_LOC_NAME); + printf(" couldn't determine if old hard link '%s' exists\n", + MOVE_LINK_TEST_HARD_LINK_SAME_LOC_NAME); PART_ERROR(H5Lmove_hard_same_loc); } if (link_exists) { H5_FAILED(); - HDprintf(" renamed hard link exists after moving the link back!\n"); + printf(" renamed hard link exists after moving the link back!\n"); PART_ERROR(H5Lmove_hard_same_loc); } @@ -9681,34 +9563,34 @@ test_move_link(void) if (H5Lcreate_hard(group_id, ".", src_grp_id, MOVE_LINK_TEST_HARD_LINK_NAME4, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create hard link '%s'\n", MOVE_LINK_TEST_HARD_LINK_NAME4); + printf(" couldn't create hard link '%s'\n", MOVE_LINK_TEST_HARD_LINK_NAME4); PART_ERROR(H5Lmove_hard_rename); } /* Verify the link has been created */ if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_HARD_LINK_NAME4, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if hard link '%s' exists\n", MOVE_LINK_TEST_HARD_LINK_NAME4); + printf(" couldn't determine if hard link '%s' exists\n", MOVE_LINK_TEST_HARD_LINK_NAME4); PART_ERROR(H5Lmove_hard_rename); } if (!link_exists) { H5_FAILED(); - HDprintf(" hard link did not exist\n"); + printf(" hard link did not exist\n"); PART_ERROR(H5Lmove_hard_rename); } /* Verify the renamed link doesn't currently exist in the source group */ if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_HARD_LINK_NEW_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if renamed hard link '%s' exists\n", - MOVE_LINK_TEST_HARD_LINK_NEW_NAME); + printf(" couldn't determine if renamed hard link '%s' exists\n", + MOVE_LINK_TEST_HARD_LINK_NEW_NAME); PART_ERROR(H5Lmove_hard_rename); } if (link_exists) { H5_FAILED(); - HDprintf(" renamed hard link existed in source group before move!\n"); + printf(" renamed hard link existed in source group before move!\n"); PART_ERROR(H5Lmove_hard_rename); } @@ -9716,35 +9598,35 @@ test_move_link(void) if (H5Lmove(src_grp_id, MOVE_LINK_TEST_HARD_LINK_NAME4, src_grp_id, MOVE_LINK_TEST_HARD_LINK_NEW_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to rename link '%s'\n", MOVE_LINK_TEST_HARD_LINK_NAME4); + printf(" failed to rename link '%s'\n", MOVE_LINK_TEST_HARD_LINK_NAME4); PART_ERROR(H5Lmove_hard_rename); } /* Verify the link has been renamed */ if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_HARD_LINK_NEW_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if renamed hard link '%s' exists\n", - MOVE_LINK_TEST_HARD_LINK_NEW_NAME); + printf(" couldn't determine if renamed hard link '%s' exists\n", + MOVE_LINK_TEST_HARD_LINK_NEW_NAME); PART_ERROR(H5Lmove_hard_rename); } if (!link_exists) { H5_FAILED(); - HDprintf(" renamed hard link did not exist\n"); + printf(" renamed hard link did not exist\n"); PART_ERROR(H5Lmove_hard_rename); } /* Verify the old link is gone */ if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_HARD_LINK_NAME4, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if old hard link '%s' exists\n", - MOVE_LINK_TEST_HARD_LINK_NAME4); + printf(" couldn't determine if old hard link '%s' exists\n", + MOVE_LINK_TEST_HARD_LINK_NAME4); PART_ERROR(H5Lmove_hard_rename); } if (link_exists) { H5_FAILED(); - HDprintf(" old hard link exists\n"); + printf(" old hard link exists\n"); PART_ERROR(H5Lmove_hard_rename); } @@ -9760,33 +9642,33 @@ test_move_link(void) if (H5Lcreate_soft(MOVE_LINK_TEST_SOFT_LINK_TARGET_PATH, src_grp_id, MOVE_LINK_TEST_SOFT_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create soft link '%s'\n", MOVE_LINK_TEST_SOFT_LINK_NAME); + printf(" couldn't create soft link '%s'\n", MOVE_LINK_TEST_SOFT_LINK_NAME); PART_ERROR(H5Lmove_soft_no_check); } /* Verify the link has been created */ if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if soft link '%s' exists\n", MOVE_LINK_TEST_SOFT_LINK_NAME); + printf(" couldn't determine if soft link '%s' exists\n", MOVE_LINK_TEST_SOFT_LINK_NAME); PART_ERROR(H5Lmove_soft_no_check); } if (!link_exists) { H5_FAILED(); - HDprintf(" soft link did not exist\n"); + printf(" soft link did not exist\n"); PART_ERROR(H5Lmove_soft_no_check); } /* Verify the link doesn't currently exist in the target group */ if ((link_exists = H5Lexists(dst_grp_id, MOVE_LINK_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if soft link '%s' exists\n", MOVE_LINK_TEST_SOFT_LINK_NAME); + printf(" couldn't determine if soft link '%s' exists\n", MOVE_LINK_TEST_SOFT_LINK_NAME); PART_ERROR(H5Lmove_soft_no_check); } if (link_exists) { H5_FAILED(); - HDprintf(" soft link existed in target group before move!\n"); + printf(" soft link existed in target group before move!\n"); PART_ERROR(H5Lmove_soft_no_check); } @@ -9794,34 +9676,34 @@ test_move_link(void) if (H5Lmove(src_grp_id, MOVE_LINK_TEST_SOFT_LINK_NAME, dst_grp_id, MOVE_LINK_TEST_SOFT_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to move link '%s'\n", MOVE_LINK_TEST_SOFT_LINK_NAME); + printf(" failed to move link '%s'\n", MOVE_LINK_TEST_SOFT_LINK_NAME); PART_ERROR(H5Lmove_soft_no_check); } /* Verify the link has been moved */ if ((link_exists = H5Lexists(dst_grp_id, MOVE_LINK_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if soft link '%s' exists\n", MOVE_LINK_TEST_SOFT_LINK_NAME); + printf(" couldn't determine if soft link '%s' exists\n", MOVE_LINK_TEST_SOFT_LINK_NAME); PART_ERROR(H5Lmove_soft_no_check); } if (!link_exists) { H5_FAILED(); - HDprintf(" soft link did not exist\n"); + printf(" soft link did not exist\n"); PART_ERROR(H5Lmove_soft_no_check); } /* Verify the old link is gone */ if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if old soft link '%s' exists\n", - MOVE_LINK_TEST_SOFT_LINK_NAME); + printf(" couldn't determine if old soft link '%s' exists\n", + MOVE_LINK_TEST_SOFT_LINK_NAME); PART_ERROR(H5Lmove_soft_no_check); } if (link_exists) { H5_FAILED(); - HDprintf(" old soft link exists\n"); + printf(" old soft link exists\n"); PART_ERROR(H5Lmove_soft_no_check); } @@ -9841,27 +9723,27 @@ test_move_link(void) if (H5Lcreate_soft(MOVE_LINK_TEST_SOFT_LINK_TARGET_PATH, src_grp_id, MOVE_LINK_TEST_SOFT_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create soft link '%s'\n", MOVE_LINK_TEST_SOFT_LINK_NAME2); + printf(" couldn't create soft link '%s'\n", MOVE_LINK_TEST_SOFT_LINK_NAME2); PART_ERROR(H5Lmove_soft_check); } /* Verify the link has been created */ if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_SOFT_LINK_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if soft link '%s' exists\n", MOVE_LINK_TEST_SOFT_LINK_NAME2); + printf(" couldn't determine if soft link '%s' exists\n", MOVE_LINK_TEST_SOFT_LINK_NAME2); PART_ERROR(H5Lmove_soft_check); } if (!link_exists) { H5_FAILED(); - HDprintf(" soft link did not exist\n"); + printf(" soft link did not exist\n"); PART_ERROR(H5Lmove_soft_check); } /* Retrieve the link's info */ if (H5Lget_info2(src_grp_id, MOVE_LINK_TEST_SOFT_LINK_NAME2, &orig_info, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't retrieve info for link '%s'\n", MOVE_LINK_TEST_SOFT_LINK_NAME2); + printf(" couldn't retrieve info for link '%s'\n", MOVE_LINK_TEST_SOFT_LINK_NAME2); PART_ERROR(H5Lmove_soft_check); } @@ -9869,20 +9751,20 @@ test_move_link(void) if (H5Lget_val(src_grp_id, MOVE_LINK_TEST_SOFT_LINK_NAME2, orig_link_val, MOVE_LINK_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't retrieve value for soft link '%s'\n", MOVE_LINK_TEST_SOFT_LINK_NAME2); + printf(" couldn't retrieve value for soft link '%s'\n", MOVE_LINK_TEST_SOFT_LINK_NAME2); PART_ERROR(H5Lmove_soft_check); } /* Verify the link doesn't currently exist in the target group */ if ((link_exists = H5Lexists(dst_grp_id, MOVE_LINK_TEST_SOFT_LINK_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if soft link '%s' exists\n", MOVE_LINK_TEST_SOFT_LINK_NAME2); + printf(" couldn't determine if soft link '%s' exists\n", MOVE_LINK_TEST_SOFT_LINK_NAME2); PART_ERROR(H5Lmove_soft_check); } if (link_exists) { H5_FAILED(); - HDprintf(" soft link existed in target group before move!\n"); + printf(" soft link existed in target group before move!\n"); PART_ERROR(H5Lmove_soft_check); } @@ -9890,62 +9772,62 @@ test_move_link(void) if (H5Lmove(src_grp_id, MOVE_LINK_TEST_SOFT_LINK_NAME2, dst_grp_id, MOVE_LINK_TEST_SOFT_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to move link '%s'\n", MOVE_LINK_TEST_SOFT_LINK_NAME2); + printf(" failed to move link '%s'\n", MOVE_LINK_TEST_SOFT_LINK_NAME2); PART_ERROR(H5Lmove_soft_check); } /* Verify the link has been moved */ if ((link_exists = H5Lexists(dst_grp_id, MOVE_LINK_TEST_SOFT_LINK_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if soft link '%s' exists\n", MOVE_LINK_TEST_SOFT_LINK_NAME2); + printf(" couldn't determine if soft link '%s' exists\n", MOVE_LINK_TEST_SOFT_LINK_NAME2); PART_ERROR(H5Lmove_soft_check); } if (!link_exists) { H5_FAILED(); - HDprintf(" soft link did not exist\n"); + printf(" soft link did not exist\n"); PART_ERROR(H5Lmove_soft_check); } /* Verify the old link is gone */ if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_SOFT_LINK_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if old soft link '%s' exists\n", - MOVE_LINK_TEST_SOFT_LINK_NAME2); + printf(" couldn't determine if old soft link '%s' exists\n", + MOVE_LINK_TEST_SOFT_LINK_NAME2); PART_ERROR(H5Lmove_soft_check); } if (link_exists) { H5_FAILED(); - HDprintf(" old soft link exists\n"); + printf(" old soft link exists\n"); PART_ERROR(H5Lmove_soft_check); } /* Retrieve the moved link's info */ if (H5Lget_info2(dst_grp_id, MOVE_LINK_TEST_SOFT_LINK_NAME2, &new_info, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't retrieve info for link '%s'\n", MOVE_LINK_TEST_SOFT_LINK_NAME2); + printf(" couldn't retrieve info for link '%s'\n", MOVE_LINK_TEST_SOFT_LINK_NAME2); PART_ERROR(H5Lmove_soft_check); } if (new_info.type != orig_info.type) { H5_FAILED(); - HDprintf(" moved link's link type doesn't match original link's type\n"); + printf(" moved link's link type doesn't match original link's type\n"); PART_ERROR(H5Lmove_soft_check); } if (new_info.u.val_size != orig_info.u.val_size) { H5_FAILED(); - HDprintf(" moved soft link's value size of %llu doesn't match original link's value size " - "of %llu\n", - (unsigned long long)new_info.u.val_size, (unsigned long long)orig_info.u.val_size); + printf(" moved soft link's value size of %llu doesn't match original link's value size " + "of %llu\n", + (unsigned long long)new_info.u.val_size, (unsigned long long)orig_info.u.val_size); PART_ERROR(H5Lmove_soft_check); } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (new_info.corder_valid != orig_info.corder_valid) { H5_FAILED(); - HDprintf( + printf( " moved link's 'corder_valid' field doesn't match original link's 'corder_valid' " "field\n"); PART_ERROR(H5Lmove_soft_check); @@ -9954,16 +9836,16 @@ test_move_link(void) if (new_info.corder_valid && orig_info.corder_valid && (new_info.corder != orig_info.corder)) { H5_FAILED(); - HDprintf(" moved link's creation order value %" PRId64 - " doesn't match original link's creation order value %" PRId64 "\n", - new_info.corder, orig_info.corder); + printf(" moved link's creation order value %" PRId64 + " doesn't match original link's creation order value %" PRId64 "\n", + new_info.corder, orig_info.corder); PART_ERROR(H5Lmove_soft_check); } } if (new_info.cset != orig_info.cset) { H5_FAILED(); - HDprintf(" moved link's character set doesn't match original link's character set\n"); + printf(" moved link's character set doesn't match original link's character set\n"); PART_ERROR(H5Lmove_soft_check); } @@ -9971,14 +9853,14 @@ test_move_link(void) if (H5Lget_val(dst_grp_id, MOVE_LINK_TEST_SOFT_LINK_NAME2, new_link_val, MOVE_LINK_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't retrieve value for soft link '%s'\n", MOVE_LINK_TEST_SOFT_LINK_NAME2); + printf(" couldn't retrieve value for soft link '%s'\n", MOVE_LINK_TEST_SOFT_LINK_NAME2); PART_ERROR(H5Lmove_soft_check); } if (HDstrncmp(orig_link_val, new_link_val, MOVE_LINK_TEST_LINK_VAL_BUF_SIZE)) { H5_FAILED(); - HDprintf(" moved soft link's value '%s' doesn't match original link's value '%s'\n", - new_link_val, orig_link_val); + printf(" moved soft link's value '%s' doesn't match original link's value '%s'\n", + new_link_val, orig_link_val); PART_ERROR(H5Lmove_soft_check); } @@ -9994,20 +9876,20 @@ test_move_link(void) if (H5Lcreate_soft(MOVE_LINK_TEST_SOFT_LINK_TARGET_PATH, src_grp_id, MOVE_LINK_TEST_SOFT_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create soft link '%s'\n", MOVE_LINK_TEST_SOFT_LINK_NAME3); + printf(" couldn't create soft link '%s'\n", MOVE_LINK_TEST_SOFT_LINK_NAME3); PART_ERROR(H5Lmove_soft_same_loc); } /* Verify the link has been created */ if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_SOFT_LINK_NAME3, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if soft link '%s' exists\n", MOVE_LINK_TEST_SOFT_LINK_NAME3); + printf(" couldn't determine if soft link '%s' exists\n", MOVE_LINK_TEST_SOFT_LINK_NAME3); PART_ERROR(H5Lmove_soft_same_loc); } if (!link_exists) { H5_FAILED(); - HDprintf(" soft link did not exist\n"); + printf(" soft link did not exist\n"); PART_ERROR(H5Lmove_soft_same_loc); } @@ -10015,14 +9897,14 @@ test_move_link(void) if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_SOFT_LINK_SAME_LOC_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if soft link '%s' exists\n", - MOVE_LINK_TEST_SOFT_LINK_SAME_LOC_NAME); + printf(" couldn't determine if soft link '%s' exists\n", + MOVE_LINK_TEST_SOFT_LINK_SAME_LOC_NAME); PART_ERROR(H5Lmove_soft_same_loc); } if (link_exists) { H5_FAILED(); - HDprintf(" soft link existed in target group before move!\n"); + printf(" soft link existed in target group before move!\n"); PART_ERROR(H5Lmove_soft_same_loc); } @@ -10030,35 +9912,35 @@ test_move_link(void) if (H5Lmove(H5L_SAME_LOC, MOVE_LINK_TEST_SOFT_LINK_NAME3, src_grp_id, MOVE_LINK_TEST_SOFT_LINK_SAME_LOC_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to move link '%s' using H5L_SAME_LOC as first parameter to H5Lmove\n", - MOVE_LINK_TEST_SOFT_LINK_NAME3); + printf(" failed to move link '%s' using H5L_SAME_LOC as first parameter to H5Lmove\n", + MOVE_LINK_TEST_SOFT_LINK_NAME3); PART_ERROR(H5Lmove_soft_same_loc); } /* Ensure the link has been renamed */ if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_SOFT_LINK_NAME3, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if soft link '%s' exists\n", MOVE_LINK_TEST_SOFT_LINK_NAME3); + printf(" couldn't determine if soft link '%s' exists\n", MOVE_LINK_TEST_SOFT_LINK_NAME3); PART_ERROR(H5Lmove_soft_same_loc); } if (link_exists) { H5_FAILED(); - HDprintf(" original soft link existed in target group after move!\n"); + printf(" original soft link existed in target group after move!\n"); PART_ERROR(H5Lmove_soft_same_loc); } if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_SOFT_LINK_SAME_LOC_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if soft link '%s' exists\n", - MOVE_LINK_TEST_SOFT_LINK_SAME_LOC_NAME); + printf(" couldn't determine if soft link '%s' exists\n", + MOVE_LINK_TEST_SOFT_LINK_SAME_LOC_NAME); PART_ERROR(H5Lmove_soft_same_loc); } if (!link_exists) { H5_FAILED(); - HDprintf(" soft link did not exist after move!\n"); + printf(" soft link did not exist after move!\n"); PART_ERROR(H5Lmove_soft_same_loc); } @@ -10066,35 +9948,35 @@ test_move_link(void) if (H5Lmove(src_grp_id, MOVE_LINK_TEST_SOFT_LINK_SAME_LOC_NAME, H5L_SAME_LOC, MOVE_LINK_TEST_SOFT_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to move link '%s' using H5L_SAME_LOC as third parameter to H5Lmove\n", - MOVE_LINK_TEST_SOFT_LINK_SAME_LOC_NAME); + printf(" failed to move link '%s' using H5L_SAME_LOC as third parameter to H5Lmove\n", + MOVE_LINK_TEST_SOFT_LINK_SAME_LOC_NAME); PART_ERROR(H5Lmove_soft_same_loc); } /* Verify the link has been renamed back */ if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_SOFT_LINK_NAME3, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if soft link '%s' exists\n", MOVE_LINK_TEST_SOFT_LINK_NAME3); + printf(" couldn't determine if soft link '%s' exists\n", MOVE_LINK_TEST_SOFT_LINK_NAME3); PART_ERROR(H5Lmove_soft_same_loc); } if (!link_exists) { H5_FAILED(); - HDprintf(" original hard link did not exist after moving the link back!\n"); + printf(" original hard link did not exist after moving the link back!\n"); PART_ERROR(H5Lmove_soft_same_loc); } if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_SOFT_LINK_SAME_LOC_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if old soft link '%s' exists\n", - MOVE_LINK_TEST_SOFT_LINK_SAME_LOC_NAME); + printf(" couldn't determine if old soft link '%s' exists\n", + MOVE_LINK_TEST_SOFT_LINK_SAME_LOC_NAME); PART_ERROR(H5Lmove_soft_same_loc); } if (link_exists) { H5_FAILED(); - HDprintf(" renamed soft link exists after moving the link back!\n"); + printf(" renamed soft link exists after moving the link back!\n"); PART_ERROR(H5Lmove_soft_same_loc); } @@ -10110,34 +9992,34 @@ test_move_link(void) if (H5Lcreate_soft(MOVE_LINK_TEST_SOFT_LINK_TARGET_PATH, src_grp_id, MOVE_LINK_TEST_SOFT_LINK_NAME4, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create soft link '%s'\n", MOVE_LINK_TEST_SOFT_LINK_NAME4); + printf(" couldn't create soft link '%s'\n", MOVE_LINK_TEST_SOFT_LINK_NAME4); PART_ERROR(H5Lmove_soft_rename); } /* Verify the link has been created */ if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_SOFT_LINK_NAME4, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if soft link '%s' exists\n", MOVE_LINK_TEST_SOFT_LINK_NAME4); + printf(" couldn't determine if soft link '%s' exists\n", MOVE_LINK_TEST_SOFT_LINK_NAME4); PART_ERROR(H5Lmove_soft_rename); } if (!link_exists) { H5_FAILED(); - HDprintf(" soft link did not exist\n"); + printf(" soft link did not exist\n"); PART_ERROR(H5Lmove_soft_rename); } /* Verify the renamed link doesn't currently exist in the source group */ if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_SOFT_LINK_NEW_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if renamed soft link '%s' exists\n", - MOVE_LINK_TEST_SOFT_LINK_NEW_NAME); + printf(" couldn't determine if renamed soft link '%s' exists\n", + MOVE_LINK_TEST_SOFT_LINK_NEW_NAME); PART_ERROR(H5Lmove_soft_rename); } if (link_exists) { H5_FAILED(); - HDprintf(" renamed soft link existed in source group before move!\n"); + printf(" renamed soft link existed in source group before move!\n"); PART_ERROR(H5Lmove_soft_rename); } @@ -10145,35 +10027,35 @@ test_move_link(void) if (H5Lmove(src_grp_id, MOVE_LINK_TEST_SOFT_LINK_NAME4, src_grp_id, MOVE_LINK_TEST_SOFT_LINK_NEW_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to rename link '%s'\n", MOVE_LINK_TEST_SOFT_LINK_NAME4); + printf(" failed to rename link '%s'\n", MOVE_LINK_TEST_SOFT_LINK_NAME4); PART_ERROR(H5Lmove_soft_rename); } /* Verify the link has been renamed */ if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_SOFT_LINK_NEW_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if renamed soft link '%s' exists\n", - MOVE_LINK_TEST_SOFT_LINK_NEW_NAME); + printf(" couldn't determine if renamed soft link '%s' exists\n", + MOVE_LINK_TEST_SOFT_LINK_NEW_NAME); PART_ERROR(H5Lmove_soft_rename); } if (!link_exists) { H5_FAILED(); - HDprintf(" renamed soft link did not exist\n"); + printf(" renamed soft link did not exist\n"); PART_ERROR(H5Lmove_soft_rename); } /* Verify the old link is gone */ if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_SOFT_LINK_NAME4, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if old soft link '%s' exists\n", - MOVE_LINK_TEST_SOFT_LINK_NAME4); + printf(" couldn't determine if old soft link '%s' exists\n", + MOVE_LINK_TEST_SOFT_LINK_NAME4); PART_ERROR(H5Lmove_soft_rename); } if (link_exists) { H5_FAILED(); - HDprintf(" old soft link exists\n"); + printf(" old soft link exists\n"); PART_ERROR(H5Lmove_soft_rename); } @@ -10190,13 +10072,13 @@ test_move_link(void) if ((ext_file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); + printf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); PART_ERROR(H5Lmove_external_no_check); } if (H5Fclose(ext_file_id) < 0) { H5_FAILED(); - HDprintf(" couldn't close file '%s'\n", ext_link_filename); + printf(" couldn't close file '%s'\n", ext_link_filename); PART_ERROR(H5Lmove_external_no_check); } @@ -10204,35 +10086,35 @@ test_move_link(void) if (H5Lcreate_external(ext_link_filename, "/", src_grp_id, MOVE_LINK_TEST_EXTERN_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create external link '%s'\n", MOVE_LINK_TEST_EXTERN_LINK_NAME); + printf(" couldn't create external link '%s'\n", MOVE_LINK_TEST_EXTERN_LINK_NAME); PART_ERROR(H5Lmove_external_no_check); } /* Verify the link has been created */ if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_EXTERN_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if external link '%s' exists\n", - MOVE_LINK_TEST_EXTERN_LINK_NAME); + printf(" couldn't determine if external link '%s' exists\n", + MOVE_LINK_TEST_EXTERN_LINK_NAME); PART_ERROR(H5Lmove_external_no_check); } if (!link_exists) { H5_FAILED(); - HDprintf(" external link did not exist\n"); + printf(" external link did not exist\n"); PART_ERROR(H5Lmove_external_no_check); } /* Verify the link doesn't currently exist in the target group */ if ((link_exists = H5Lexists(dst_grp_id, MOVE_LINK_TEST_EXTERN_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if external link '%s' exists\n", - MOVE_LINK_TEST_EXTERN_LINK_NAME); + printf(" couldn't determine if external link '%s' exists\n", + MOVE_LINK_TEST_EXTERN_LINK_NAME); PART_ERROR(H5Lmove_external_no_check); } if (link_exists) { H5_FAILED(); - HDprintf(" external link existed in target group before move!\n"); + printf(" external link existed in target group before move!\n"); PART_ERROR(H5Lmove_external_no_check); } @@ -10240,35 +10122,35 @@ test_move_link(void) if (H5Lmove(src_grp_id, MOVE_LINK_TEST_EXTERN_LINK_NAME, dst_grp_id, MOVE_LINK_TEST_EXTERN_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to move link '%s'\n", MOVE_LINK_TEST_EXTERN_LINK_NAME); + printf(" failed to move link '%s'\n", MOVE_LINK_TEST_EXTERN_LINK_NAME); PART_ERROR(H5Lmove_external_no_check); } /* Verify the link has been moved */ if ((link_exists = H5Lexists(dst_grp_id, MOVE_LINK_TEST_EXTERN_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if external link '%s' exists\n", - MOVE_LINK_TEST_EXTERN_LINK_NAME); + printf(" couldn't determine if external link '%s' exists\n", + MOVE_LINK_TEST_EXTERN_LINK_NAME); PART_ERROR(H5Lmove_external_no_check); } if (!link_exists) { H5_FAILED(); - HDprintf(" external link did not exist\n"); + printf(" external link did not exist\n"); PART_ERROR(H5Lmove_external_no_check); } /* Verify the old link is gone */ if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_EXTERN_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if old external link '%s' exists\n", - MOVE_LINK_TEST_EXTERN_LINK_NAME); + printf(" couldn't determine if old external link '%s' exists\n", + MOVE_LINK_TEST_EXTERN_LINK_NAME); PART_ERROR(H5Lmove_external_no_check); } if (link_exists) { H5_FAILED(); - HDprintf(" old external link exists\n"); + printf(" old external link exists\n"); PART_ERROR(H5Lmove_external_no_check); } @@ -10299,13 +10181,13 @@ test_move_link(void) if ((ext_file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); + printf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); PART_ERROR(H5Lmove_external_check); } if (H5Fclose(ext_file_id) < 0) { H5_FAILED(); - HDprintf(" couldn't close file '%s'\n", ext_link_filename); + printf(" couldn't close file '%s'\n", ext_link_filename); PART_ERROR(H5Lmove_external_check); } @@ -10313,28 +10195,28 @@ test_move_link(void) if (H5Lcreate_external(ext_link_filename, "/", src_grp_id, MOVE_LINK_TEST_EXTERN_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create external link '%s'\n", MOVE_LINK_TEST_EXTERN_LINK_NAME2); + printf(" couldn't create external link '%s'\n", MOVE_LINK_TEST_EXTERN_LINK_NAME2); PART_ERROR(H5Lmove_external_check); } /* Verify the link has been created */ if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_EXTERN_LINK_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if external link '%s' exists\n", - MOVE_LINK_TEST_EXTERN_LINK_NAME2); + printf(" couldn't determine if external link '%s' exists\n", + MOVE_LINK_TEST_EXTERN_LINK_NAME2); PART_ERROR(H5Lmove_external_check); } if (!link_exists) { H5_FAILED(); - HDprintf(" external link did not exist\n"); + printf(" external link did not exist\n"); PART_ERROR(H5Lmove_external_check); } /* Retrieve the link's info */ if (H5Lget_info2(src_grp_id, MOVE_LINK_TEST_EXTERN_LINK_NAME2, &orig_info, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't retrieve info for link '%s'\n", MOVE_LINK_TEST_EXTERN_LINK_NAME2); + printf(" couldn't retrieve info for link '%s'\n", MOVE_LINK_TEST_EXTERN_LINK_NAME2); PART_ERROR(H5Lmove_external_check); } @@ -10342,29 +10224,29 @@ test_move_link(void) if (H5Lget_val(src_grp_id, MOVE_LINK_TEST_EXTERN_LINK_NAME2, orig_link_val, MOVE_LINK_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't retrieve value for external link '%s'\n", - MOVE_LINK_TEST_EXTERN_LINK_NAME2); + printf(" couldn't retrieve value for external link '%s'\n", + MOVE_LINK_TEST_EXTERN_LINK_NAME2); PART_ERROR(H5Lmove_external_check); } if (H5Lunpack_elink_val(orig_link_val, orig_info.u.val_size, &unpack_flags, &orig_filename, &orig_objname) < 0) { H5_FAILED(); - HDprintf(" couldn't unpack original external link's value buffer\n"); + printf(" couldn't unpack original external link's value buffer\n"); PART_ERROR(H5Lmove_external_check); } /* Verify the link doesn't currently exist in the target group */ if ((link_exists = H5Lexists(dst_grp_id, MOVE_LINK_TEST_EXTERN_LINK_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if external link '%s' exists\n", - MOVE_LINK_TEST_EXTERN_LINK_NAME2); + printf(" couldn't determine if external link '%s' exists\n", + MOVE_LINK_TEST_EXTERN_LINK_NAME2); PART_ERROR(H5Lmove_external_check); } if (link_exists) { H5_FAILED(); - HDprintf(" external link existed in target group before move!\n"); + printf(" external link existed in target group before move!\n"); PART_ERROR(H5Lmove_external_check); } @@ -10372,63 +10254,63 @@ test_move_link(void) if (H5Lmove(src_grp_id, MOVE_LINK_TEST_EXTERN_LINK_NAME2, dst_grp_id, MOVE_LINK_TEST_EXTERN_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to move link '%s'\n", MOVE_LINK_TEST_EXTERN_LINK_NAME2); + printf(" failed to move link '%s'\n", MOVE_LINK_TEST_EXTERN_LINK_NAME2); PART_ERROR(H5Lmove_external_check); } /* Verify the link has been moved */ if ((link_exists = H5Lexists(dst_grp_id, MOVE_LINK_TEST_EXTERN_LINK_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if external link '%s' exists\n", - MOVE_LINK_TEST_EXTERN_LINK_NAME2); + printf(" couldn't determine if external link '%s' exists\n", + MOVE_LINK_TEST_EXTERN_LINK_NAME2); PART_ERROR(H5Lmove_external_check); } if (!link_exists) { H5_FAILED(); - HDprintf(" external link did not exist\n"); + printf(" external link did not exist\n"); PART_ERROR(H5Lmove_external_check); } /* Verify the old link is gone */ if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_EXTERN_LINK_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if old external link '%s' exists\n", - MOVE_LINK_TEST_EXTERN_LINK_NAME2); + printf(" couldn't determine if old external link '%s' exists\n", + MOVE_LINK_TEST_EXTERN_LINK_NAME2); PART_ERROR(H5Lmove_external_check); } if (link_exists) { H5_FAILED(); - HDprintf(" old external link exists\n"); + printf(" old external link exists\n"); PART_ERROR(H5Lmove_external_check); } /* Retrieve the moved link's info */ if (H5Lget_info2(dst_grp_id, MOVE_LINK_TEST_EXTERN_LINK_NAME2, &new_info, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't retrieve info for link '%s'\n", MOVE_LINK_TEST_EXTERN_LINK_NAME2); + printf(" couldn't retrieve info for link '%s'\n", MOVE_LINK_TEST_EXTERN_LINK_NAME2); PART_ERROR(H5Lmove_external_check); } if (new_info.type != orig_info.type) { H5_FAILED(); - HDprintf(" moved link's link type doesn't match original link's type\n"); + printf(" moved link's link type doesn't match original link's type\n"); PART_ERROR(H5Lmove_external_check); } if (new_info.u.val_size != orig_info.u.val_size) { H5_FAILED(); - HDprintf(" moved external link's value size of %llu doesn't match original link's value " - "size of %llu\n", - (unsigned long long)new_info.u.val_size, (unsigned long long)orig_info.u.val_size); + printf(" moved external link's value size of %llu doesn't match original link's value " + "size of %llu\n", + (unsigned long long)new_info.u.val_size, (unsigned long long)orig_info.u.val_size); PART_ERROR(H5Lmove_external_check); } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (new_info.corder_valid != orig_info.corder_valid) { H5_FAILED(); - HDprintf( + printf( " moved link's 'corder_valid' field doesn't match original link's 'corder_valid' " "field\n"); PART_ERROR(H5Lmove_external_check); @@ -10437,17 +10319,17 @@ test_move_link(void) if (new_info.corder_valid && orig_info.corder_valid && (new_info.corder != orig_info.corder)) { H5_FAILED(); - HDprintf(" moved link's creation order value %" PRId64 - " doesn't match original link's creation " - "order value %" PRId64 "\n", - new_info.corder, orig_info.corder); + printf(" moved link's creation order value %" PRId64 + " doesn't match original link's creation " + "order value %" PRId64 "\n", + new_info.corder, orig_info.corder); PART_ERROR(H5Lmove_external_check); } } if (new_info.cset != orig_info.cset) { H5_FAILED(); - HDprintf(" moved link's character set doesn't match original link's character set\n"); + printf(" moved link's character set doesn't match original link's character set\n"); PART_ERROR(H5Lmove_external_check); } @@ -10455,31 +10337,31 @@ test_move_link(void) if (H5Lget_val(dst_grp_id, MOVE_LINK_TEST_EXTERN_LINK_NAME2, new_link_val, MOVE_LINK_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't retrieve value for external link '%s'\n", - MOVE_LINK_TEST_EXTERN_LINK_NAME2); + printf(" couldn't retrieve value for external link '%s'\n", + MOVE_LINK_TEST_EXTERN_LINK_NAME2); PART_ERROR(H5Lmove_external_check); } if (H5Lunpack_elink_val(new_link_val, new_info.u.val_size, &unpack_flags, &new_filename, &new_objname) < 0) { H5_FAILED(); - HDprintf(" couldn't unpack moved external link's value buffer\n"); + printf(" couldn't unpack moved external link's value buffer\n"); PART_ERROR(H5Lmove_external_check); } if (HDstrncmp(new_filename, orig_filename, strlen(orig_filename)) < 0) { H5_FAILED(); - HDprintf(" moved external link's filename '%s' doesn't match original external link's " - "filename '%s'\n", - new_filename, orig_filename); + printf(" moved external link's filename '%s' doesn't match original external link's " + "filename '%s'\n", + new_filename, orig_filename); PART_ERROR(H5Lmove_external_check); } if (HDstrncmp(new_objname, orig_objname, strlen(orig_objname)) < 0) { H5_FAILED(); - HDprintf(" moved external link's object name '%s' doesn't match original external link's " - "object name '%s'\n", - new_objname, orig_objname); + printf(" moved external link's object name '%s' doesn't match original external link's " + "object name '%s'\n", + new_objname, orig_objname); PART_ERROR(H5Lmove_external_check); } @@ -10503,13 +10385,13 @@ test_move_link(void) if ((ext_file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); + printf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); PART_ERROR(H5Lmove_external_same_loc); } if (H5Fclose(ext_file_id) < 0) { H5_FAILED(); - HDprintf(" couldn't close file '%s'\n", ext_link_filename); + printf(" couldn't close file '%s'\n", ext_link_filename); PART_ERROR(H5Lmove_external_same_loc); } @@ -10517,21 +10399,21 @@ test_move_link(void) if (H5Lcreate_external(ext_link_filename, "/", src_grp_id, MOVE_LINK_TEST_EXTERN_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create external link '%s'\n", MOVE_LINK_TEST_EXTERN_LINK_NAME3); + printf(" couldn't create external link '%s'\n", MOVE_LINK_TEST_EXTERN_LINK_NAME3); PART_ERROR(H5Lmove_external_same_loc); } /* Verify the link has been created */ if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_EXTERN_LINK_NAME3, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if external link '%s' exists\n", - MOVE_LINK_TEST_EXTERN_LINK_NAME3); + printf(" couldn't determine if external link '%s' exists\n", + MOVE_LINK_TEST_EXTERN_LINK_NAME3); PART_ERROR(H5Lmove_external_same_loc); } if (!link_exists) { H5_FAILED(); - HDprintf(" external link did not exist\n"); + printf(" external link did not exist\n"); PART_ERROR(H5Lmove_external_same_loc); } @@ -10539,14 +10421,14 @@ test_move_link(void) if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_EXTERN_LINK_SAME_LOC_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if external link '%s' exists\n", - MOVE_LINK_TEST_EXTERN_LINK_SAME_LOC_NAME); + printf(" couldn't determine if external link '%s' exists\n", + MOVE_LINK_TEST_EXTERN_LINK_SAME_LOC_NAME); PART_ERROR(H5Lmove_external_same_loc); } if (link_exists) { H5_FAILED(); - HDprintf(" external link existed in target group before move!\n"); + printf(" external link existed in target group before move!\n"); PART_ERROR(H5Lmove_external_same_loc); } @@ -10554,35 +10436,35 @@ test_move_link(void) if (H5Lmove(H5L_SAME_LOC, MOVE_LINK_TEST_EXTERN_LINK_NAME3, src_grp_id, MOVE_LINK_TEST_EXTERN_LINK_SAME_LOC_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to move link '%s'\n", MOVE_LINK_TEST_EXTERN_LINK_NAME3); + printf(" failed to move link '%s'\n", MOVE_LINK_TEST_EXTERN_LINK_NAME3); PART_ERROR(H5Lmove_external_same_loc); } /* Ensure the link has been renamed */ if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_EXTERN_LINK_NAME3, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if external link '%s' exists\n", - MOVE_LINK_TEST_EXTERN_LINK_NAME3); + printf(" couldn't determine if external link '%s' exists\n", + MOVE_LINK_TEST_EXTERN_LINK_NAME3); PART_ERROR(H5Lmove_external_same_loc); } if (link_exists) { H5_FAILED(); - HDprintf(" original external link existed in target group after move!\n"); + printf(" original external link existed in target group after move!\n"); PART_ERROR(H5Lmove_external_same_loc); } if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_EXTERN_LINK_SAME_LOC_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if external link '%s' exists\n", - MOVE_LINK_TEST_EXTERN_LINK_SAME_LOC_NAME); + printf(" couldn't determine if external link '%s' exists\n", + MOVE_LINK_TEST_EXTERN_LINK_SAME_LOC_NAME); PART_ERROR(H5Lmove_external_same_loc); } if (!link_exists) { H5_FAILED(); - HDprintf(" external link did not exist after move!\n"); + printf(" external link did not exist after move!\n"); PART_ERROR(H5Lmove_external_same_loc); } @@ -10590,35 +10472,35 @@ test_move_link(void) if (H5Lmove(src_grp_id, MOVE_LINK_TEST_EXTERN_LINK_SAME_LOC_NAME, H5L_SAME_LOC, MOVE_LINK_TEST_EXTERN_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to move link '%s'\n", MOVE_LINK_TEST_EXTERN_LINK_SAME_LOC_NAME); + printf(" failed to move link '%s'\n", MOVE_LINK_TEST_EXTERN_LINK_SAME_LOC_NAME); PART_ERROR(H5Lmove_external_same_loc); } /* Verify the link has been renamed back */ if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_EXTERN_LINK_NAME3, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if external link '%s' exists\n", - MOVE_LINK_TEST_EXTERN_LINK_NAME3); + printf(" couldn't determine if external link '%s' exists\n", + MOVE_LINK_TEST_EXTERN_LINK_NAME3); PART_ERROR(H5Lmove_external_same_loc); } if (!link_exists) { H5_FAILED(); - HDprintf(" original external link did not exist after moving the link back!\n"); + printf(" original external link did not exist after moving the link back!\n"); PART_ERROR(H5Lmove_external_same_loc); } if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_EXTERN_LINK_SAME_LOC_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if old external link '%s' exists\n", - MOVE_LINK_TEST_EXTERN_LINK_SAME_LOC_NAME); + printf(" couldn't determine if old external link '%s' exists\n", + MOVE_LINK_TEST_EXTERN_LINK_SAME_LOC_NAME); PART_ERROR(H5Lmove_external_same_loc); } if (link_exists) { H5_FAILED(); - HDprintf(" renamed external link exists after moving the link back!\n"); + printf(" renamed external link exists after moving the link back!\n"); PART_ERROR(H5Lmove_external_same_loc); } @@ -10642,13 +10524,13 @@ test_move_link(void) if ((ext_file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); + printf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); PART_ERROR(H5Lmove_external_rename); } if (H5Fclose(ext_file_id) < 0) { H5_FAILED(); - HDprintf(" couldn't close file '%s'\n", ext_link_filename); + printf(" couldn't close file '%s'\n", ext_link_filename); PART_ERROR(H5Lmove_external_rename); } @@ -10656,35 +10538,35 @@ test_move_link(void) if (H5Lcreate_external(ext_link_filename, "/", src_grp_id, MOVE_LINK_TEST_EXTERN_LINK_NAME4, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create external link '%s'\n", MOVE_LINK_TEST_EXTERN_LINK_NAME4); + printf(" couldn't create external link '%s'\n", MOVE_LINK_TEST_EXTERN_LINK_NAME4); PART_ERROR(H5Lmove_external_rename); } /* Verify the link has been created */ if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_EXTERN_LINK_NAME4, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if external link '%s' exists\n", - MOVE_LINK_TEST_EXTERN_LINK_NAME4); + printf(" couldn't determine if external link '%s' exists\n", + MOVE_LINK_TEST_EXTERN_LINK_NAME4); PART_ERROR(H5Lmove_external_rename); } if (!link_exists) { H5_FAILED(); - HDprintf(" external link did not exist\n"); + printf(" external link did not exist\n"); PART_ERROR(H5Lmove_external_rename); } /* Verify the renamed link doesn't currently exist in the source group */ if ((link_exists = H5Lexists(dst_grp_id, MOVE_LINK_TEST_EXTERN_LINK_NEW_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if renamed external link '%s' exists\n", - MOVE_LINK_TEST_EXTERN_LINK_NEW_NAME); + printf(" couldn't determine if renamed external link '%s' exists\n", + MOVE_LINK_TEST_EXTERN_LINK_NEW_NAME); PART_ERROR(H5Lmove_external_rename); } if (link_exists) { H5_FAILED(); - HDprintf(" renamed external link existed in source group before move!\n"); + printf(" renamed external link existed in source group before move!\n"); PART_ERROR(H5Lmove_external_rename); } @@ -10692,35 +10574,35 @@ test_move_link(void) if (H5Lmove(src_grp_id, MOVE_LINK_TEST_EXTERN_LINK_NAME4, src_grp_id, MOVE_LINK_TEST_EXTERN_LINK_NEW_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to rename link '%s'\n", MOVE_LINK_TEST_EXTERN_LINK_NAME4); + printf(" failed to rename link '%s'\n", MOVE_LINK_TEST_EXTERN_LINK_NAME4); PART_ERROR(H5Lmove_external_rename); } /* Verify the link has been renamed */ if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_EXTERN_LINK_NEW_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if renamed external link '%s' exists\n", - MOVE_LINK_TEST_EXTERN_LINK_NEW_NAME); + printf(" couldn't determine if renamed external link '%s' exists\n", + MOVE_LINK_TEST_EXTERN_LINK_NEW_NAME); PART_ERROR(H5Lmove_external_rename); } if (!link_exists) { H5_FAILED(); - HDprintf(" renamed external link did not exist\n"); + printf(" renamed external link did not exist\n"); PART_ERROR(H5Lmove_external_rename); } /* Verify the old link is gone */ if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_EXTERN_LINK_NAME4, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if old external link '%s' exists\n", - MOVE_LINK_TEST_EXTERN_LINK_NAME4); + printf(" couldn't determine if old external link '%s' exists\n", + MOVE_LINK_TEST_EXTERN_LINK_NAME4); PART_ERROR(H5Lmove_external_rename); } if (link_exists) { H5_FAILED(); - HDprintf(" old external link exists\n"); + printf(" old external link exists\n"); PART_ERROR(H5Lmove_external_rename); } @@ -10840,53 +10722,53 @@ test_move_links_into_group_with_links(void) !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_MORE) || !(vol_cap_flags_g & H5VL_CAP_FLAG_HARD_LINKS) || !(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" API functions for basic file, group, link, hard link, or creation order aren't " - "supported with this connector\n"); + printf(" API functions for basic file, group, link, hard link, or creation order aren't " + "supported with this connector\n"); return 0; } if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, MOVE_LINK_INTO_GRP_WITH_LINKS_TEST_SUBGROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create group '%s'\n", MOVE_LINK_INTO_GRP_WITH_LINKS_TEST_SUBGROUP_NAME); + printf(" couldn't create group '%s'\n", MOVE_LINK_INTO_GRP_WITH_LINKS_TEST_SUBGROUP_NAME); goto error; } if ((gcpl_id = H5Pcreate(H5P_GROUP_CREATE)) < 0) { H5_FAILED(); - HDprintf(" couldn't create GCPL for link creation order tracking\n"); + printf(" couldn't create GCPL for link creation order tracking\n"); goto error; } if (H5Pset_link_creation_order(gcpl_id, H5P_CRT_ORDER_TRACKED) < 0) { H5_FAILED(); - HDprintf(" couldn't set link creation order tracking\n"); + printf(" couldn't set link creation order tracking\n"); goto error; } if ((src_grp_id = H5Gcreate2(group_id, MOVE_LINK_INTO_GRP_WITH_LINKS_TEST_SRC_GRP_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create group '%s'\n", MOVE_LINK_INTO_GRP_WITH_LINKS_TEST_SRC_GRP_NAME); + printf(" couldn't create group '%s'\n", MOVE_LINK_INTO_GRP_WITH_LINKS_TEST_SRC_GRP_NAME); goto error; } if ((dst_grp_id = H5Gcreate2(group_id, MOVE_LINK_INTO_GRP_WITH_LINKS_TEST_DST_GRP_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create group '%s'\n", MOVE_LINK_INTO_GRP_WITH_LINKS_TEST_DST_GRP_NAME); + printf(" couldn't create group '%s'\n", MOVE_LINK_INTO_GRP_WITH_LINKS_TEST_DST_GRP_NAME); goto error; } @@ -10896,7 +10778,7 @@ test_move_links_into_group_with_links(void) if (H5Lcreate_hard(src_grp_id, ".", src_grp_id, link_name, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create link '%s' in source group\n", link_name); + printf(" couldn't create link '%s' in source group\n", link_name); goto error; } @@ -10904,21 +10786,21 @@ test_move_links_into_group_with_links(void) memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info2(src_grp_id, link_name, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve info for link '%s'\n", link_name); + printf(" failed to retrieve info for link '%s'\n", link_name); goto error; } if (!link_info.corder_valid) { H5_FAILED(); - HDprintf(" creation order value for newly-created link '%s' was marked as not valid!\n", - link_name); + printf(" creation order value for newly-created link '%s' was marked as not valid!\n", + link_name); goto error; } if (link_info.corder != (int64_t)i) { H5_FAILED(); - HDprintf(" creation order value %lld for link '%s' did not match expected value %lld\n", - (long long)link_info.corder, link_name, (long long)i); + printf(" creation order value %lld for link '%s' did not match expected value %lld\n", + (long long)link_info.corder, link_name, (long long)i); goto error; } } @@ -10929,7 +10811,7 @@ test_move_links_into_group_with_links(void) if (H5Lcreate_hard(dst_grp_id, ".", dst_grp_id, link_name, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create link '%s' in destination group\n", link_name); + printf(" couldn't create link '%s' in destination group\n", link_name); goto error; } } @@ -10940,7 +10822,7 @@ test_move_links_into_group_with_links(void) if (H5Lmove(src_grp_id, link_name, dst_grp_id, link_name, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to move link '%s' from source group to destination group\n", link_name); + printf(" failed to move link '%s' from source group to destination group\n", link_name); goto error; } @@ -10948,22 +10830,22 @@ test_move_links_into_group_with_links(void) memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info2(dst_grp_id, link_name, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve info for link '%s'\n", link_name); + printf(" failed to retrieve info for link '%s'\n", link_name); goto error; } if (!link_info.corder_valid) { H5_FAILED(); - HDprintf(" creation order value for moved link '%s' was marked as not valid!\n", link_name); + printf(" creation order value for moved link '%s' was marked as not valid!\n", link_name); goto error; } if (link_info.corder != (int64_t)(i + MOVE_LINK_INTO_GRP_WITH_LINKS_TEST_NUM_LINKS)) { H5_FAILED(); - HDprintf(" creation order value for moved link '%s' was not adjusted after move! It should " - "have been %lld but was %lld\n", - link_name, (long long)(i + MOVE_LINK_INTO_GRP_WITH_LINKS_TEST_NUM_LINKS), - (long long)link_info.corder); + printf(" creation order value for moved link '%s' was not adjusted after move! It should " + "have been %lld but was %lld\n", + link_name, (long long)(i + MOVE_LINK_INTO_GRP_WITH_LINKS_TEST_NUM_LINKS), + (long long)link_info.corder); goto error; } } @@ -11043,54 +10925,54 @@ test_move_link_reset_grp_max_crt_order(void) !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_MORE) || !(vol_cap_flags_g & H5VL_CAP_FLAG_HARD_LINKS) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_MORE) || !(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" API functions for basic file, group, link, hard link, or creation order aren't " - "supported with this connector\n"); + printf(" API functions for basic file, group, link, hard link, or creation order aren't " + "supported with this connector\n"); return 0; } if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); goto error; } if ((gcpl_id = H5Pcreate(H5P_GROUP_CREATE)) < 0) { H5_FAILED(); - HDprintf(" couldn't create GCPL for link creation order tracking\n"); + printf(" couldn't create GCPL for link creation order tracking\n"); goto error; } if (H5Pset_link_creation_order(gcpl_id, H5P_CRT_ORDER_TRACKED) < 0) { H5_FAILED(); - HDprintf(" couldn't set link creation order tracking\n"); + printf(" couldn't set link creation order tracking\n"); goto error; } if ((group_id = H5Gcreate2(container_group, MOVE_LINK_RESET_MAX_CRT_ORDER_TEST_SUBGROUP_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container sub-group '%s'\n", - MOVE_LINK_RESET_MAX_CRT_ORDER_TEST_SUBGROUP_NAME); + printf(" couldn't create container sub-group '%s'\n", + MOVE_LINK_RESET_MAX_CRT_ORDER_TEST_SUBGROUP_NAME); goto error; } if ((src_grp_id = H5Gcreate2(group_id, MOVE_LINK_RESET_MAX_CRT_ORDER_TEST_SRC_GRP_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create group '%s'\n", MOVE_LINK_RESET_MAX_CRT_ORDER_TEST_SRC_GRP_NAME); + printf(" couldn't create group '%s'\n", MOVE_LINK_RESET_MAX_CRT_ORDER_TEST_SRC_GRP_NAME); goto error; } if ((dst_grp_id = H5Gcreate2(group_id, MOVE_LINK_RESET_MAX_CRT_ORDER_TEST_DST_GRP_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create group '%s'\n", MOVE_LINK_RESET_MAX_CRT_ORDER_TEST_DST_GRP_NAME); + printf(" couldn't create group '%s'\n", MOVE_LINK_RESET_MAX_CRT_ORDER_TEST_DST_GRP_NAME); goto error; } @@ -11100,7 +10982,7 @@ test_move_link_reset_grp_max_crt_order(void) if (H5Lcreate_hard(src_grp_id, ".", src_grp_id, link_name, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create hard link '%s' in source group\n", link_name); + printf(" couldn't create hard link '%s' in source group\n", link_name); goto error; } } @@ -11114,15 +10996,15 @@ test_move_link_reset_grp_max_crt_order(void) if (H5Gget_info(src_grp_id, &grp_info) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve source group's info\n"); + printf(" failed to retrieve source group's info\n"); goto error; } if (grp_info.max_corder != MOVE_LINK_RESET_MAX_CRT_ORDER_TEST_NUM_LINKS) { H5_FAILED(); - HDprintf(" source group's maximum creation order value got adjusted to %lld during link " - "moving; value should have remained at %d\n", - (long long)grp_info.max_corder, MOVE_LINK_RESET_MAX_CRT_ORDER_TEST_NUM_LINKS); + printf(" source group's maximum creation order value got adjusted to %lld during link " + "moving; value should have remained at %d\n", + (long long)grp_info.max_corder, MOVE_LINK_RESET_MAX_CRT_ORDER_TEST_NUM_LINKS); goto error; } @@ -11130,7 +11012,7 @@ test_move_link_reset_grp_max_crt_order(void) if (H5Lmove(src_grp_id, link_name, dst_grp_id, link_name, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to move link '%s' to destination group\n", link_name); + printf(" failed to move link '%s' to destination group\n", link_name); goto error; } } @@ -11143,15 +11025,15 @@ test_move_link_reset_grp_max_crt_order(void) if (H5Gget_info(src_grp_id, &grp_info) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve source group's info\n"); + printf(" failed to retrieve source group's info\n"); goto error; } if (grp_info.max_corder != 0) { H5_FAILED(); - HDprintf(" source group's maximum creation order value didn't reset to 0 after moving all links " - "out of it; value is still %lld\n", - (long long)grp_info.max_corder); + printf(" source group's maximum creation order value didn't reset to 0 after moving all links " + "out of it; value is still %lld\n", + (long long)grp_info.max_corder); goto error; } @@ -11160,15 +11042,15 @@ test_move_link_reset_grp_max_crt_order(void) if (H5Gget_info(dst_grp_id, &grp_info) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve destination group's info\n"); + printf(" failed to retrieve destination group's info\n"); goto error; } if (grp_info.max_corder != MOVE_LINK_RESET_MAX_CRT_ORDER_TEST_NUM_LINKS) { H5_FAILED(); - HDprintf(" destination group's maximum creation order value of %lld didn't match expected value " - "of %d after moving all links into it\n", - (long long)grp_info.max_corder, MOVE_LINK_RESET_MAX_CRT_ORDER_TEST_NUM_LINKS); + printf(" destination group's maximum creation order value of %lld didn't match expected value " + "of %d after moving all links into it\n", + (long long)grp_info.max_corder, MOVE_LINK_RESET_MAX_CRT_ORDER_TEST_NUM_LINKS); goto error; } @@ -11225,8 +11107,8 @@ test_move_link_invalid_params(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_MORE) || !(vol_cap_flags_g & H5VL_CAP_FLAG_HARD_LINKS)) { SKIPPED(); - HDprintf(" API functions for basic file, group, link, or hard link aren't supported with this " - "connector\n"); + printf(" API functions for basic file, group, link, or hard link aren't supported with this " + "connector\n"); return 0; } @@ -11234,41 +11116,41 @@ test_move_link_invalid_params(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, MOVE_LINK_INVALID_PARAMS_TEST_SUBGROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create group '%s'\n", MOVE_LINK_INVALID_PARAMS_TEST_SUBGROUP_NAME); + printf(" couldn't create group '%s'\n", MOVE_LINK_INVALID_PARAMS_TEST_SUBGROUP_NAME); goto error; } if ((src_grp_id = H5Gcreate2(group_id, MOVE_LINK_INVALID_PARAMS_TEST_SRC_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create group '%s'\n", MOVE_LINK_INVALID_PARAMS_TEST_SRC_GROUP_NAME); + printf(" couldn't create group '%s'\n", MOVE_LINK_INVALID_PARAMS_TEST_SRC_GROUP_NAME); goto error; } if ((dst_grp_id = H5Gcreate2(group_id, MOVE_LINK_INVALID_PARAMS_TEST_DST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create group '%s'\n", MOVE_LINK_INVALID_PARAMS_TEST_DST_GROUP_NAME); + printf(" couldn't create group '%s'\n", MOVE_LINK_INVALID_PARAMS_TEST_DST_GROUP_NAME); goto error; } if (H5Lcreate_hard(group_id, ".", src_grp_id, MOVE_LINK_INVALID_PARAMS_TEST_HARD_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create hard link '%s'\n", MOVE_LINK_INVALID_PARAMS_TEST_HARD_LINK_NAME); + printf(" couldn't create hard link '%s'\n", MOVE_LINK_INVALID_PARAMS_TEST_HARD_LINK_NAME); goto error; } @@ -11276,14 +11158,14 @@ test_move_link_invalid_params(void) if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_INVALID_PARAMS_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if hard link '%s' exists\n", - MOVE_LINK_INVALID_PARAMS_TEST_HARD_LINK_NAME); + printf(" couldn't determine if hard link '%s' exists\n", + MOVE_LINK_INVALID_PARAMS_TEST_HARD_LINK_NAME); goto error; } if (!link_exists) { H5_FAILED(); - HDprintf(" hard link did not exist\n"); + printf(" hard link did not exist\n"); goto error; } @@ -11291,14 +11173,14 @@ test_move_link_invalid_params(void) if ((link_exists = H5Lexists(dst_grp_id, MOVE_LINK_INVALID_PARAMS_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if hard link '%s' exists\n", - MOVE_LINK_INVALID_PARAMS_TEST_HARD_LINK_NAME); + printf(" couldn't determine if hard link '%s' exists\n", + MOVE_LINK_INVALID_PARAMS_TEST_HARD_LINK_NAME); goto error; } if (link_exists) { H5_FAILED(); - HDprintf(" hard link existed in target group before move!\n"); + printf(" hard link existed in target group before move!\n"); goto error; } @@ -11319,7 +11201,7 @@ test_move_link_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Lmove succeeded with an invalid source location ID!\n"); + printf(" H5Lmove succeeded with an invalid source location ID!\n"); PART_ERROR(H5Lmove_invalid_src_loc_id); } @@ -11340,7 +11222,7 @@ test_move_link_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Lmove succeeded with a NULL source name!\n"); + printf(" H5Lmove succeeded with a NULL source name!\n"); PART_ERROR(H5Lmove_invalid_src_name); } @@ -11353,7 +11235,7 @@ test_move_link_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Lmove succeeded with an invalid source name of ''!\n"); + printf(" H5Lmove succeeded with an invalid source name of ''!\n"); PART_ERROR(H5Lmove_invalid_src_name); } @@ -11374,7 +11256,7 @@ test_move_link_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Lmove succeeded with an invalid destination location ID!\n"); + printf(" H5Lmove succeeded with an invalid destination location ID!\n"); PART_ERROR(H5Lmove_invalid_dst_loc_id); } @@ -11395,7 +11277,7 @@ test_move_link_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Lmove succeeded with a NULL destination name!\n"); + printf(" H5Lmove succeeded with a NULL destination name!\n"); PART_ERROR(H5Lmove_invalid_dst_name); } @@ -11408,7 +11290,7 @@ test_move_link_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Lmove succeeded with an invalid destination name of ''!\n"); + printf(" H5Lmove succeeded with an invalid destination name of ''!\n"); PART_ERROR(H5Lmove_invalid_dst_name); } @@ -11429,7 +11311,7 @@ test_move_link_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Lmove succeeded with an invalid LCPL!\n"); + printf(" H5Lmove succeeded with an invalid LCPL!\n"); PART_ERROR(H5Lmove_invalid_lcpl); } @@ -11450,7 +11332,7 @@ test_move_link_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Lmove succeeded with an invalid LAPL!\n"); + printf(" H5Lmove succeeded with an invalid LAPL!\n"); PART_ERROR(H5Lmove_invalid_lapl); } @@ -11466,28 +11348,28 @@ test_move_link_invalid_params(void) if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_INVALID_PARAMS_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if hard link '%s' exists\n", - MOVE_LINK_INVALID_PARAMS_TEST_HARD_LINK_NAME); + printf(" couldn't determine if hard link '%s' exists\n", + MOVE_LINK_INVALID_PARAMS_TEST_HARD_LINK_NAME); PART_ERROR(H5Lmove_existence); } if (!link_exists) { H5_FAILED(); - HDprintf(" hard link didn't exist in source group after invalid move!\n"); + printf(" hard link didn't exist in source group after invalid move!\n"); PART_ERROR(H5Lmove_existence); } if ((link_exists = H5Lexists(dst_grp_id, MOVE_LINK_INVALID_PARAMS_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if hard link '%s' exists\n", - MOVE_LINK_INVALID_PARAMS_TEST_HARD_LINK_NAME); + printf(" couldn't determine if hard link '%s' exists\n", + MOVE_LINK_INVALID_PARAMS_TEST_HARD_LINK_NAME); PART_ERROR(H5Lmove_existence); } if (link_exists) { H5_FAILED(); - HDprintf(" hard link existed in target group after invalid move!\n"); + printf(" hard link existed in target group after invalid move!\n"); PART_ERROR(H5Lmove_existence); } @@ -11510,7 +11392,7 @@ test_move_link_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Lmove succeeded with an invalid same location!\n"); + printf(" H5Lmove succeeded with an invalid same location!\n"); PART_ERROR(H5Lmove_same_location); } @@ -11527,7 +11409,7 @@ test_move_link_invalid_params(void) if ((ext_file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); + printf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); PART_ERROR(H5Lmove_across_files); } @@ -11541,7 +11423,7 @@ test_move_link_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Lmove succeeded in moving a hard link across files!\n"); + printf(" H5Lmove succeeded in moving a hard link across files!\n"); PART_ERROR(H5Lmove_across_files); } @@ -11549,21 +11431,21 @@ test_move_link_invalid_params(void) if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_INVALID_PARAMS_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if original link '%s' exists after invalid link move\n", - MOVE_LINK_INVALID_PARAMS_TEST_HARD_LINK_NAME); + printf(" couldn't determine if original link '%s' exists after invalid link move\n", + MOVE_LINK_INVALID_PARAMS_TEST_HARD_LINK_NAME); PART_ERROR(H5Lmove_across_files); } if (!link_exists) { H5_FAILED(); - HDprintf(" original link '%s' didn't exist after failed move!\n", - MOVE_LINK_INVALID_PARAMS_TEST_HARD_LINK_NAME); + printf(" original link '%s' didn't exist after failed move!\n", + MOVE_LINK_INVALID_PARAMS_TEST_HARD_LINK_NAME); PART_ERROR(H5Lmove_across_files); } if (H5Fclose(ext_file_id) < 0) { H5_FAILED(); - HDprintf(" failed to close a file!\n"); + printf(" failed to close a file!\n"); PART_ERROR(H5Lmove_across_files); } @@ -11632,8 +11514,8 @@ test_get_link_val(void) !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_MORE) || !(vol_cap_flags_g & H5VL_CAP_FLAG_EXTERNAL_LINKS) || !(vol_cap_flags_g & H5VL_CAP_FLAG_SOFT_LINKS)) { SKIPPED(); - HDprintf(" API functions for basic file, group, link, soft link, external link, or creation " - "order aren't supported with this connector\n"); + printf(" API functions for basic file, group, link, soft link, external link, or creation " + "order aren't supported with this connector\n"); return 0; } @@ -11641,26 +11523,26 @@ test_get_link_val(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); goto error; } if ((gcpl_id = H5Pcreate(H5P_GROUP_CREATE)) < 0) { H5_FAILED(); - HDprintf(" couldn't create GCPL for link creation order tracking\n"); + printf(" couldn't create GCPL for link creation order tracking\n"); goto error; } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (H5Pset_link_creation_order(gcpl_id, H5P_CRT_ORDER_TRACKED) < 0) { H5_FAILED(); - HDprintf(" couldn't set link creation order tracking\n"); + printf(" couldn't set link creation order tracking\n"); goto error; } } @@ -11668,7 +11550,7 @@ test_get_link_val(void) if ((group_id = H5Gcreate2(container_group, GET_LINK_VAL_TEST_SUBGROUP_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container subgroup '%s'\n", GET_LINK_VAL_TEST_SUBGROUP_NAME); + printf(" couldn't create container subgroup '%s'\n", GET_LINK_VAL_TEST_SUBGROUP_NAME); goto error; } @@ -11682,64 +11564,64 @@ test_get_link_val(void) TESTING_2("H5Lget_val on soft link"); - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_VAL_TEST_SUBGROUP1_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create subgroup '%s'\n", GET_LINK_VAL_TEST_SUBGROUP1_NAME); + printf(" couldn't create subgroup '%s'\n", GET_LINK_VAL_TEST_SUBGROUP1_NAME); PART_ERROR(H5Lget_val_soft); } if (H5Lcreate_soft(link_target, subgroup_id, GET_LINK_VAL_TEST_SOFT_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create soft link '%s'\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME); + printf(" couldn't create soft link '%s'\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME); PART_ERROR(H5Lget_val_soft); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_VAL_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME); + printf(" couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME); PART_ERROR(H5Lget_val_soft); } if (!link_exists) { H5_FAILED(); - HDprintf(" link '%s' did not exist\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME); + printf(" link '%s' did not exist\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME); PART_ERROR(H5Lget_val_soft); } if (H5Lget_info2(subgroup_id, GET_LINK_VAL_TEST_SOFT_LINK_NAME, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve soft link's info\n"); + printf(" failed to retrieve soft link's info\n"); PART_ERROR(H5Lget_val_soft); } link_val_size = strlen(link_target) + 1; if (link_info.u.val_size != link_val_size) { H5_FAILED(); - HDprintf(" link value size %zu did not match expected size of %zu\n", link_info.u.val_size, - link_val_size); + printf(" link value size %zu did not match expected size of %zu\n", link_info.u.val_size, + link_val_size); PART_ERROR(H5Lget_val_by_idx_soft_crt_order_increasing); } if (H5Lget_val(subgroup_id, GET_LINK_VAL_TEST_SOFT_LINK_NAME, link_val_buf, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't get soft link value\n"); + printf(" couldn't get soft link value\n"); PART_ERROR(H5Lget_val_soft); } if (HDstrncmp(link_val_buf, link_target, link_val_size)) { H5_FAILED(); - HDprintf(" soft link value did not match\n"); + printf(" soft link value did not match\n"); PART_ERROR(H5Lget_val_soft); } if (H5Gclose(subgroup_id) < 0) { H5_FAILED(); - HDprintf(" failed to close group '%s'\n", GET_LINK_VAL_TEST_SUBGROUP1_NAME); + printf(" failed to close group '%s'\n", GET_LINK_VAL_TEST_SUBGROUP1_NAME); PART_ERROR(H5Lget_val_soft); } @@ -11760,95 +11642,95 @@ test_get_link_val(void) TESTING_2("H5Lget_val on external link"); - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); HDsnprintf(ext_link_filename, H5_API_TEST_FILENAME_MAX_LENGTH, "%s", EXTERNAL_LINK_TEST_FILE_NAME); if ((ext_file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); + printf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); PART_ERROR(H5Lget_val_external); } if (H5Fclose(ext_file_id) < 0) { H5_FAILED(); - HDprintf(" couldn't close file '%s'\n", ext_link_filename); + printf(" couldn't close file '%s'\n", ext_link_filename); PART_ERROR(H5Lget_val_external); } if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_VAL_TEST_SUBGROUP2_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create subgroup '%s'\n", GET_LINK_VAL_TEST_SUBGROUP2_NAME); + printf(" couldn't create subgroup '%s'\n", GET_LINK_VAL_TEST_SUBGROUP2_NAME); PART_ERROR(H5Lget_val_external); } if (H5Lcreate_external(ext_link_filename, ext_obj_name, subgroup_id, GET_LINK_VAL_TEST_EXT_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create external link '%s'\n", GET_LINK_VAL_TEST_EXT_LINK_NAME); + printf(" couldn't create external link '%s'\n", GET_LINK_VAL_TEST_EXT_LINK_NAME); PART_ERROR(H5Lget_val_external); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_VAL_TEST_EXT_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if external link '%s' exists\n", - GET_LINK_VAL_TEST_EXT_LINK_NAME); + printf(" couldn't determine if external link '%s' exists\n", + GET_LINK_VAL_TEST_EXT_LINK_NAME); PART_ERROR(H5Lget_val_external); } if (!link_exists) { H5_FAILED(); - HDprintf(" external link '%s' did not exist\n", GET_LINK_VAL_TEST_EXT_LINK_NAME); + printf(" external link '%s' did not exist\n", GET_LINK_VAL_TEST_EXT_LINK_NAME); PART_ERROR(H5Lget_val_external); } if (H5Lget_info2(subgroup_id, GET_LINK_VAL_TEST_EXT_LINK_NAME, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve external link's info\n"); + printf(" failed to retrieve external link's info\n"); PART_ERROR(H5Lget_val_external); } link_val_size = 1 + strlen(ext_link_filename) + 1 + strlen(ext_obj_name) + 1; if (link_info.u.val_size != link_val_size) { H5_FAILED(); - HDprintf(" link value size %zu did not match expected size of %zu\n", link_info.u.val_size, - link_val_size); + printf(" link value size %zu did not match expected size of %zu\n", link_info.u.val_size, + link_val_size); PART_ERROR(H5Lget_val_external); } if (H5Lget_val(subgroup_id, GET_LINK_VAL_TEST_EXT_LINK_NAME, link_val_buf, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't get external link value\n"); + printf(" couldn't get external link value\n"); PART_ERROR(H5Lget_val_external); } if (H5Lunpack_elink_val(link_val_buf, link_info.u.val_size, &ext_link_flags, &ext_link_filepath, &ext_link_val) < 0) { H5_FAILED(); - HDprintf(" couldn't unpack external link value buffer\n"); + printf(" couldn't unpack external link value buffer\n"); PART_ERROR(H5Lget_val_external); } if (HDstrncmp(ext_link_filepath, ext_link_filename, strlen(ext_link_filename) + 1)) { H5_FAILED(); - HDprintf(" external link target file '%s' did not match expected '%s'\n", - ext_link_filepath, ext_link_filename); + printf(" external link target file '%s' did not match expected '%s'\n", ext_link_filepath, + ext_link_filename); PART_ERROR(H5Lget_val_external); } if (HDstrncmp(ext_link_val, ext_obj_name, strlen(ext_obj_name) + 1)) { H5_FAILED(); - HDprintf(" external link value '%s' did not match expected '%s'\n", ext_link_val, - ext_obj_name); + printf(" external link value '%s' did not match expected '%s'\n", ext_link_val, + ext_obj_name); PART_ERROR(H5Lget_val_external); } if (H5Gclose(subgroup_id) < 0) { H5_FAILED(); - HDprintf(" failed to close group '%s'\n", GET_LINK_VAL_TEST_SUBGROUP2_NAME); + printf(" failed to close group '%s'\n", GET_LINK_VAL_TEST_SUBGROUP2_NAME); PART_ERROR(H5Lget_val_external); } @@ -11896,14 +11778,14 @@ test_get_link_val(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" creation order tracking isn't supported with this VOL connector\n"); + printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Lget_val_by_idx_soft_crt_order_increasing); } if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_VAL_TEST_SUBGROUP4_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create subgroup '%s'\n", GET_LINK_VAL_TEST_SUBGROUP4_NAME); + printf(" couldn't create subgroup '%s'\n", GET_LINK_VAL_TEST_SUBGROUP4_NAME); PART_ERROR(H5Lget_val_by_idx_soft_crt_order_increasing); } @@ -11911,158 +11793,158 @@ test_get_link_val(void) if (H5Lcreate_soft(link_target_a, subgroup_id, GET_LINK_VAL_TEST_SOFT_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create soft link '%s'\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME); + printf(" couldn't create soft link '%s'\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME); PART_ERROR(H5Lget_val_by_idx_soft_crt_order_increasing); } if (H5Lcreate_soft(link_target_b, subgroup_id, GET_LINK_VAL_TEST_SOFT_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create soft link '%s'\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME2); + printf(" couldn't create soft link '%s'\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME2); PART_ERROR(H5Lget_val_by_idx_soft_crt_order_increasing); } if (H5Lcreate_soft(link_target_c, subgroup_id, GET_LINK_VAL_TEST_SOFT_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create soft link '%s'\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME3); + printf(" couldn't create soft link '%s'\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME3); PART_ERROR(H5Lget_val_by_idx_soft_crt_order_increasing); } /* Verify the links exist */ if ((link_exists = H5Lexists(subgroup_id, GET_LINK_VAL_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME); + printf(" couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME); PART_ERROR(H5Lget_val_by_idx_soft_crt_order_increasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" link '%s' did not exist\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME); + printf(" link '%s' did not exist\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME); PART_ERROR(H5Lget_val_by_idx_soft_crt_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_VAL_TEST_SOFT_LINK_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME2); + printf(" couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME2); PART_ERROR(H5Lget_val_by_idx_soft_crt_order_increasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" link '%s' did not exist\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME2); + printf(" link '%s' did not exist\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME2); PART_ERROR(H5Lget_val_by_idx_soft_crt_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_VAL_TEST_SOFT_LINK_NAME3, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME3); + printf(" couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME3); PART_ERROR(H5Lget_val_by_idx_soft_crt_order_increasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" link '%s' did not exist\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME3); + printf(" link '%s' did not exist\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME3); PART_ERROR(H5Lget_val_by_idx_soft_crt_order_increasing); } /* Retrieve the info and value of each link in turn */ - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 0, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve soft link's info at index %d\n", 0); + printf(" failed to retrieve soft link's info at index %d\n", 0); PART_ERROR(H5Lget_val_by_idx_soft_crt_order_increasing); } link_val_size = strlen(link_target_a) + 1; if (link_info.u.val_size != link_val_size) { H5_FAILED(); - HDprintf(" link value size %zu for link at index %d did not match expected size of %zu\n", - link_info.u.val_size, 0, link_val_size); + printf(" link value size %zu for link at index %d did not match expected size of %zu\n", + link_info.u.val_size, 0, link_val_size); PART_ERROR(H5Lget_val_by_idx_soft_crt_order_increasing); } - HDmemset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); + memset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); if (H5Lget_val_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 0, link_val_buf, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't get soft link value at index %d\n", 0); + printf(" couldn't get soft link value at index %d\n", 0); PART_ERROR(H5Lget_val_by_idx_soft_crt_order_increasing); } if (HDstrncmp(link_val_buf, link_target_a, strlen(link_target_a) + 1)) { H5_FAILED(); - HDprintf(" link value '%s' for link at index %d did not match expected value '%s'\n", - link_val_buf, 0, link_target_a); + printf(" link value '%s' for link at index %d did not match expected value '%s'\n", + link_val_buf, 0, link_target_a); PART_ERROR(H5Lget_val_by_idx_soft_crt_order_increasing); } - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 1, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve soft link's info at index %d\n", 1); + printf(" failed to retrieve soft link's info at index %d\n", 1); PART_ERROR(H5Lget_val_by_idx_soft_crt_order_increasing); } link_val_size = strlen(link_target_b) + 1; if (link_info.u.val_size != link_val_size) { H5_FAILED(); - HDprintf(" link value size %zu for link at index %d did not match expected size of %zu\n", - link_info.u.val_size, 1, link_val_size); + printf(" link value size %zu for link at index %d did not match expected size of %zu\n", + link_info.u.val_size, 1, link_val_size); PART_ERROR(H5Lget_val_by_idx_soft_crt_order_increasing); } - HDmemset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); + memset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); if (H5Lget_val_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 1, link_val_buf, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't get soft link value at index %d\n", 1); + printf(" couldn't get soft link value at index %d\n", 1); PART_ERROR(H5Lget_val_by_idx_soft_crt_order_increasing); } if (HDstrncmp(link_val_buf, link_target_b, strlen(link_target_b) + 1)) { H5_FAILED(); - HDprintf(" link value '%s' for link at index %d did not match expected value '%s'\n", - link_val_buf, 1, link_target_b); + printf(" link value '%s' for link at index %d did not match expected value '%s'\n", + link_val_buf, 1, link_target_b); PART_ERROR(H5Lget_val_by_idx_soft_crt_order_increasing); } - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 2, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve soft link's info at index %d\n", 2); + printf(" failed to retrieve soft link's info at index %d\n", 2); PART_ERROR(H5Lget_val_by_idx_soft_crt_order_increasing); } link_val_size = strlen(link_target_c) + 1; if (link_info.u.val_size != link_val_size) { H5_FAILED(); - HDprintf(" link value size %zu for link at index %d did not match expected size of %zu\n", - link_info.u.val_size, 2, link_val_size); + printf(" link value size %zu for link at index %d did not match expected size of %zu\n", + link_info.u.val_size, 2, link_val_size); PART_ERROR(H5Lget_val_by_idx_soft_crt_order_increasing); } - HDmemset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); + memset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); if (H5Lget_val_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 2, link_val_buf, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't get soft link value at index %d\n", 2); + printf(" couldn't get soft link value at index %d\n", 2); PART_ERROR(H5Lget_val_by_idx_soft_crt_order_increasing); } if (HDstrncmp(link_val_buf, link_target_c, strlen(link_target_c) + 1)) { H5_FAILED(); - HDprintf(" link value '%s' for link at index %d did not match expected value '%s'\n", - link_val_buf, 2, link_target_c); + printf(" link value '%s' for link at index %d did not match expected value '%s'\n", + link_val_buf, 2, link_target_c); PART_ERROR(H5Lget_val_by_idx_soft_crt_order_increasing); } if (H5Gclose(subgroup_id) < 0) { H5_FAILED(); - HDprintf(" failed to close group '%s'\n", GET_LINK_VAL_TEST_SUBGROUP4_NAME); + printf(" failed to close group '%s'\n", GET_LINK_VAL_TEST_SUBGROUP4_NAME); PART_ERROR(H5Lget_val_by_idx_soft_crt_order_increasing); } @@ -12090,14 +11972,14 @@ test_get_link_val(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" creation order tracking isn't supported with this VOL connector\n"); + printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Lget_val_by_idx_soft_crt_order_decreasing); } if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_VAL_TEST_SUBGROUP5_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create subgroup '%s'\n", GET_LINK_VAL_TEST_SUBGROUP5_NAME); + printf(" couldn't create subgroup '%s'\n", GET_LINK_VAL_TEST_SUBGROUP5_NAME); PART_ERROR(H5Lget_val_by_idx_soft_crt_order_decreasing); } @@ -12105,158 +11987,158 @@ test_get_link_val(void) if (H5Lcreate_soft(link_target_a, subgroup_id, GET_LINK_VAL_TEST_SOFT_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create soft link '%s'\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME); + printf(" couldn't create soft link '%s'\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME); PART_ERROR(H5Lget_val_by_idx_soft_crt_order_decreasing); } if (H5Lcreate_soft(link_target_b, subgroup_id, GET_LINK_VAL_TEST_SOFT_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create soft link '%s'\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME2); + printf(" couldn't create soft link '%s'\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME2); PART_ERROR(H5Lget_val_by_idx_soft_crt_order_decreasing); } if (H5Lcreate_soft(link_target_c, subgroup_id, GET_LINK_VAL_TEST_SOFT_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create soft link '%s'\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME3); + printf(" couldn't create soft link '%s'\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME3); PART_ERROR(H5Lget_val_by_idx_soft_crt_order_decreasing); } /* Verify the links exist */ if ((link_exists = H5Lexists(subgroup_id, GET_LINK_VAL_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME); + printf(" couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME); PART_ERROR(H5Lget_val_by_idx_soft_crt_order_decreasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" link '%s' did not exist\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME); + printf(" link '%s' did not exist\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME); PART_ERROR(H5Lget_val_by_idx_soft_crt_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_VAL_TEST_SOFT_LINK_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME2); + printf(" couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME2); PART_ERROR(H5Lget_val_by_idx_soft_crt_order_decreasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" link '%s' did not exist\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME2); + printf(" link '%s' did not exist\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME2); PART_ERROR(H5Lget_val_by_idx_soft_crt_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_VAL_TEST_SOFT_LINK_NAME3, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME3); + printf(" couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME3); PART_ERROR(H5Lget_val_by_idx_soft_crt_order_decreasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" link '%s' did not exist\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME3); + printf(" link '%s' did not exist\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME3); PART_ERROR(H5Lget_val_by_idx_soft_crt_order_decreasing); } /* Retrieve the info and value of each link in turn */ - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 2, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve soft link's info at index %d\n", 2); + printf(" failed to retrieve soft link's info at index %d\n", 2); PART_ERROR(H5Lget_val_by_idx_soft_crt_order_decreasing); } link_val_size = strlen(link_target_a) + 1; if (link_info.u.val_size != link_val_size) { H5_FAILED(); - HDprintf(" link value size %zu for link at index %d did not match expected size of %zu\n", - link_info.u.val_size, 2, link_val_size); + printf(" link value size %zu for link at index %d did not match expected size of %zu\n", + link_info.u.val_size, 2, link_val_size); PART_ERROR(H5Lget_val_by_idx_soft_crt_order_decreasing); } - HDmemset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); + memset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); if (H5Lget_val_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 2, link_val_buf, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't get soft link value at index %d\n", 2); + printf(" couldn't get soft link value at index %d\n", 2); PART_ERROR(H5Lget_val_by_idx_soft_crt_order_decreasing); } if (HDstrncmp(link_val_buf, link_target_a, strlen(link_target_a) + 1)) { H5_FAILED(); - HDprintf(" link value '%s' for link at index %d did not match expected value '%s'\n", - link_val_buf, 2, link_target_a); + printf(" link value '%s' for link at index %d did not match expected value '%s'\n", + link_val_buf, 2, link_target_a); PART_ERROR(H5Lget_val_by_idx_soft_crt_order_decreasing); } - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 1, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve soft link's info at index %d\n", 1); + printf(" failed to retrieve soft link's info at index %d\n", 1); PART_ERROR(H5Lget_val_by_idx_soft_crt_order_decreasing); } link_val_size = strlen(link_target_b) + 1; if (link_info.u.val_size != link_val_size) { H5_FAILED(); - HDprintf(" link value size %zu for link at index %d did not match expected size of %zu\n", - link_info.u.val_size, 1, link_val_size); + printf(" link value size %zu for link at index %d did not match expected size of %zu\n", + link_info.u.val_size, 1, link_val_size); PART_ERROR(H5Lget_val_by_idx_soft_crt_order_decreasing); } - HDmemset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); + memset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); if (H5Lget_val_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 1, link_val_buf, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't get soft link value at index %d\n", 1); + printf(" couldn't get soft link value at index %d\n", 1); PART_ERROR(H5Lget_val_by_idx_soft_crt_order_decreasing); } if (HDstrncmp(link_val_buf, link_target_b, strlen(link_target_b) + 1)) { H5_FAILED(); - HDprintf(" link value '%s' for link at index %d did not match expected value '%s'\n", - link_val_buf, 1, link_target_b); + printf(" link value '%s' for link at index %d did not match expected value '%s'\n", + link_val_buf, 1, link_target_b); PART_ERROR(H5Lget_val_by_idx_soft_crt_order_decreasing); } - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 0, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve soft link's info at index %d\n", 0); + printf(" failed to retrieve soft link's info at index %d\n", 0); PART_ERROR(H5Lget_val_by_idx_soft_crt_order_decreasing); } link_val_size = strlen(link_target_c) + 1; if (link_info.u.val_size != link_val_size) { H5_FAILED(); - HDprintf(" link value size %zu for link at index %d did not match expected size of %zu\n", - link_info.u.val_size, 0, link_val_size); + printf(" link value size %zu for link at index %d did not match expected size of %zu\n", + link_info.u.val_size, 0, link_val_size); PART_ERROR(H5Lget_val_by_idx_soft_crt_order_decreasing); } - HDmemset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); + memset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); if (H5Lget_val_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 0, link_val_buf, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't get soft link value at index %d\n", 0); + printf(" couldn't get soft link value at index %d\n", 0); PART_ERROR(H5Lget_val_by_idx_soft_crt_order_decreasing); } if (HDstrncmp(link_val_buf, link_target_c, strlen(link_target_c) + 1)) { H5_FAILED(); - HDprintf(" link value '%s' for link at index %d did not match expected value '%s'\n", - link_val_buf, 0, link_target_c); + printf(" link value '%s' for link at index %d did not match expected value '%s'\n", + link_val_buf, 0, link_target_c); PART_ERROR(H5Lget_val_by_idx_soft_crt_order_decreasing); } if (H5Gclose(subgroup_id) < 0) { H5_FAILED(); - HDprintf(" failed to close group '%s'\n", GET_LINK_VAL_TEST_SUBGROUP5_NAME); + printf(" failed to close group '%s'\n", GET_LINK_VAL_TEST_SUBGROUP5_NAME); PART_ERROR(H5Lget_val_by_idx_soft_crt_order_decreasing); } @@ -12285,7 +12167,7 @@ test_get_link_val(void) if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_VAL_TEST_SUBGROUP6_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create subgroup '%s'\n", GET_LINK_VAL_TEST_SUBGROUP6_NAME); + printf(" couldn't create subgroup '%s'\n", GET_LINK_VAL_TEST_SUBGROUP6_NAME); PART_ERROR(H5Lget_val_by_idx_soft_name_order_increasing); } @@ -12293,158 +12175,158 @@ test_get_link_val(void) if (H5Lcreate_soft(link_target_a, subgroup_id, GET_LINK_VAL_TEST_SOFT_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create soft link '%s'\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME); + printf(" couldn't create soft link '%s'\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME); PART_ERROR(H5Lget_val_by_idx_soft_name_order_increasing); } if (H5Lcreate_soft(link_target_b, subgroup_id, GET_LINK_VAL_TEST_SOFT_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create soft link '%s'\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME2); + printf(" couldn't create soft link '%s'\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME2); PART_ERROR(H5Lget_val_by_idx_soft_name_order_increasing); } if (H5Lcreate_soft(link_target_c, subgroup_id, GET_LINK_VAL_TEST_SOFT_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create soft link '%s'\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME3); + printf(" couldn't create soft link '%s'\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME3); PART_ERROR(H5Lget_val_by_idx_soft_name_order_increasing); } /* Verify the links exist */ if ((link_exists = H5Lexists(subgroup_id, GET_LINK_VAL_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME); + printf(" couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME); PART_ERROR(H5Lget_val_by_idx_soft_name_order_increasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" link '%s' did not exist\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME); + printf(" link '%s' did not exist\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME); PART_ERROR(H5Lget_val_by_idx_soft_name_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_VAL_TEST_SOFT_LINK_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME2); + printf(" couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME2); PART_ERROR(H5Lget_val_by_idx_soft_name_order_increasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" link '%s' did not exist\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME2); + printf(" link '%s' did not exist\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME2); PART_ERROR(H5Lget_val_by_idx_soft_name_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_VAL_TEST_SOFT_LINK_NAME3, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME3); + printf(" couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME3); PART_ERROR(H5Lget_val_by_idx_soft_name_order_increasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" link '%s' did not exist\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME3); + printf(" link '%s' did not exist\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME3); PART_ERROR(H5Lget_val_by_idx_soft_name_order_increasing); } /* Retrieve the info and value of each link in turn */ - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 0, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve soft link's info at index %d\n", 0); + printf(" failed to retrieve soft link's info at index %d\n", 0); PART_ERROR(H5Lget_val_by_idx_soft_name_order_increasing); } link_val_size = strlen(link_target_a) + 1; if (link_info.u.val_size != link_val_size) { H5_FAILED(); - HDprintf(" link value size %zu for link at index %d did not match expected size of %zu\n", - link_info.u.val_size, 0, link_val_size); + printf(" link value size %zu for link at index %d did not match expected size of %zu\n", + link_info.u.val_size, 0, link_val_size); PART_ERROR(H5Lget_val_by_idx_soft_name_order_increasing); } - HDmemset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); + memset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); if (H5Lget_val_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 0, link_val_buf, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't get soft link value at index %d\n", 0); + printf(" couldn't get soft link value at index %d\n", 0); PART_ERROR(H5Lget_val_by_idx_soft_name_order_increasing); } if (HDstrncmp(link_val_buf, link_target_a, strlen(link_target_a) + 1)) { H5_FAILED(); - HDprintf(" link value '%s' for link at index %d did not match expected value '%s'\n", - link_val_buf, 0, link_target_a); + printf(" link value '%s' for link at index %d did not match expected value '%s'\n", + link_val_buf, 0, link_target_a); PART_ERROR(H5Lget_val_by_idx_soft_name_order_increasing); } - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 1, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve soft link's info at index %d\n", 1); + printf(" failed to retrieve soft link's info at index %d\n", 1); PART_ERROR(H5Lget_val_by_idx_soft_name_order_increasing); } link_val_size = strlen(link_target_b) + 1; if (link_info.u.val_size != link_val_size) { H5_FAILED(); - HDprintf(" link value size %zu for link at index %d did not match expected size of %zu\n", - link_info.u.val_size, 1, link_val_size); + printf(" link value size %zu for link at index %d did not match expected size of %zu\n", + link_info.u.val_size, 1, link_val_size); PART_ERROR(H5Lget_val_by_idx_soft_name_order_increasing); } - HDmemset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); + memset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); if (H5Lget_val_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 1, link_val_buf, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't get soft link value at index %d\n", 1); + printf(" couldn't get soft link value at index %d\n", 1); PART_ERROR(H5Lget_val_by_idx_soft_name_order_increasing); } if (HDstrncmp(link_val_buf, link_target_b, strlen(link_target_b) + 1)) { H5_FAILED(); - HDprintf(" link value '%s' for link at index %d did not match expected value '%s'\n", - link_val_buf, 1, link_target_b); + printf(" link value '%s' for link at index %d did not match expected value '%s'\n", + link_val_buf, 1, link_target_b); PART_ERROR(H5Lget_val_by_idx_soft_name_order_increasing); } - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 2, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve soft link's info at index %d\n", 2); + printf(" failed to retrieve soft link's info at index %d\n", 2); PART_ERROR(H5Lget_val_by_idx_soft_name_order_increasing); } link_val_size = strlen(link_target_c) + 1; if (link_info.u.val_size != link_val_size) { H5_FAILED(); - HDprintf(" link value size %zu for link at index %d did not match expected size of %zu\n", - link_info.u.val_size, 2, link_val_size); + printf(" link value size %zu for link at index %d did not match expected size of %zu\n", + link_info.u.val_size, 2, link_val_size); PART_ERROR(H5Lget_val_by_idx_soft_name_order_increasing); } - HDmemset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); + memset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); if (H5Lget_val_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 2, link_val_buf, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't get soft link value at index %d\n", 2); + printf(" couldn't get soft link value at index %d\n", 2); PART_ERROR(H5Lget_val_by_idx_soft_name_order_increasing); } if (HDstrncmp(link_val_buf, link_target_c, strlen(link_target_c) + 1)) { H5_FAILED(); - HDprintf(" link value '%s' for link at index %d did not match expected value '%s'\n", - link_val_buf, 2, link_target_c); + printf(" link value '%s' for link at index %d did not match expected value '%s'\n", + link_val_buf, 2, link_target_c); PART_ERROR(H5Lget_val_by_idx_soft_name_order_increasing); } if (H5Gclose(subgroup_id) < 0) { H5_FAILED(); - HDprintf(" failed to close group '%s'\n", GET_LINK_VAL_TEST_SUBGROUP6_NAME); + printf(" failed to close group '%s'\n", GET_LINK_VAL_TEST_SUBGROUP6_NAME); PART_ERROR(H5Lget_val_by_idx_soft_name_order_increasing); } @@ -12473,7 +12355,7 @@ test_get_link_val(void) if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_VAL_TEST_SUBGROUP7_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create subgroup '%s'\n", GET_LINK_VAL_TEST_SUBGROUP7_NAME); + printf(" couldn't create subgroup '%s'\n", GET_LINK_VAL_TEST_SUBGROUP7_NAME); PART_ERROR(H5Lget_val_by_idx_soft_name_order_decreasing); } @@ -12481,158 +12363,158 @@ test_get_link_val(void) if (H5Lcreate_soft(link_target_a, subgroup_id, GET_LINK_VAL_TEST_SOFT_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create soft link '%s'\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME); + printf(" couldn't create soft link '%s'\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME); PART_ERROR(H5Lget_val_by_idx_soft_name_order_decreasing); } if (H5Lcreate_soft(link_target_b, subgroup_id, GET_LINK_VAL_TEST_SOFT_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create soft link '%s'\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME2); + printf(" couldn't create soft link '%s'\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME2); PART_ERROR(H5Lget_val_by_idx_soft_name_order_decreasing); } if (H5Lcreate_soft(link_target_c, subgroup_id, GET_LINK_VAL_TEST_SOFT_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create soft link '%s'\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME3); + printf(" couldn't create soft link '%s'\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME3); PART_ERROR(H5Lget_val_by_idx_soft_name_order_decreasing); } /* Verify the links exist */ if ((link_exists = H5Lexists(subgroup_id, GET_LINK_VAL_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME); + printf(" couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME); PART_ERROR(H5Lget_val_by_idx_soft_name_order_decreasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" link '%s' did not exist\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME); + printf(" link '%s' did not exist\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME); PART_ERROR(H5Lget_val_by_idx_soft_name_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_VAL_TEST_SOFT_LINK_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME2); + printf(" couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME2); PART_ERROR(H5Lget_val_by_idx_soft_name_order_decreasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" link '%s' did not exist\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME2); + printf(" link '%s' did not exist\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME2); PART_ERROR(H5Lget_val_by_idx_soft_name_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_VAL_TEST_SOFT_LINK_NAME3, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME3); + printf(" couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME3); PART_ERROR(H5Lget_val_by_idx_soft_name_order_decreasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" link '%s' did not exist\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME3); + printf(" link '%s' did not exist\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME3); PART_ERROR(H5Lget_val_by_idx_soft_name_order_decreasing); } /* Retrieve the info and value of each link in turn */ - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 2, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve soft link's info at index %d\n", 2); + printf(" failed to retrieve soft link's info at index %d\n", 2); PART_ERROR(H5Lget_val_by_idx_soft_name_order_decreasing); } link_val_size = strlen(link_target_a) + 1; if (link_info.u.val_size != link_val_size) { H5_FAILED(); - HDprintf(" link value size %zu for link at index %d did not match expected size of %zu\n", - link_info.u.val_size, 2, link_val_size); + printf(" link value size %zu for link at index %d did not match expected size of %zu\n", + link_info.u.val_size, 2, link_val_size); PART_ERROR(H5Lget_val_by_idx_soft_name_order_decreasing); } - HDmemset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); + memset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); if (H5Lget_val_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 2, link_val_buf, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't get soft link value at index %d\n", 2); + printf(" couldn't get soft link value at index %d\n", 2); PART_ERROR(H5Lget_val_by_idx_soft_name_order_decreasing); } if (HDstrncmp(link_val_buf, link_target_a, strlen(link_target_a) + 1)) { H5_FAILED(); - HDprintf(" link value '%s' for link at index %d did not match expected value '%s'\n", - link_val_buf, 2, link_target_a); + printf(" link value '%s' for link at index %d did not match expected value '%s'\n", + link_val_buf, 2, link_target_a); PART_ERROR(H5Lget_val_by_idx_soft_name_order_decreasing); } - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 1, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve soft link's info at index %d\n", 1); + printf(" failed to retrieve soft link's info at index %d\n", 1); PART_ERROR(H5Lget_val_by_idx_soft_name_order_decreasing); } link_val_size = strlen(link_target_b) + 1; if (link_info.u.val_size != link_val_size) { H5_FAILED(); - HDprintf(" link value size %zu for link at index %d did not match expected size of %zu\n", - link_info.u.val_size, 1, link_val_size); + printf(" link value size %zu for link at index %d did not match expected size of %zu\n", + link_info.u.val_size, 1, link_val_size); PART_ERROR(H5Lget_val_by_idx_soft_name_order_decreasing); } - HDmemset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); + memset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); if (H5Lget_val_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 1, link_val_buf, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't get soft link value at index %d\n", 1); + printf(" couldn't get soft link value at index %d\n", 1); PART_ERROR(H5Lget_val_by_idx_soft_name_order_decreasing); } if (HDstrncmp(link_val_buf, link_target_b, strlen(link_target_b) + 1)) { H5_FAILED(); - HDprintf(" link value '%s' for link at index %d did not match expected value '%s'\n", - link_val_buf, 1, link_target_b); + printf(" link value '%s' for link at index %d did not match expected value '%s'\n", + link_val_buf, 1, link_target_b); PART_ERROR(H5Lget_val_by_idx_soft_name_order_decreasing); } - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 0, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve soft link's info at index %d\n", 0); + printf(" failed to retrieve soft link's info at index %d\n", 0); PART_ERROR(H5Lget_val_by_idx_soft_name_order_decreasing); } link_val_size = strlen(link_target_c) + 1; if (link_info.u.val_size != link_val_size) { H5_FAILED(); - HDprintf(" link value size %zu for link at index %d did not match expected size of %zu\n", - link_info.u.val_size, 0, link_val_size); + printf(" link value size %zu for link at index %d did not match expected size of %zu\n", + link_info.u.val_size, 0, link_val_size); PART_ERROR(H5Lget_val_by_idx_soft_name_order_decreasing); } - HDmemset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); + memset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); if (H5Lget_val_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 0, link_val_buf, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't get soft link value at index %d\n", 0); + printf(" couldn't get soft link value at index %d\n", 0); PART_ERROR(H5Lget_val_by_idx_soft_name_order_decreasing); } if (HDstrncmp(link_val_buf, link_target_c, strlen(link_target_c) + 1)) { H5_FAILED(); - HDprintf(" link value '%s' for link at index %d did not match expected value '%s'\n", - link_val_buf, 0, link_target_c); + printf(" link value '%s' for link at index %d did not match expected value '%s'\n", + link_val_buf, 0, link_target_c); PART_ERROR(H5Lget_val_by_idx_soft_name_order_decreasing); } if (H5Gclose(subgroup_id) < 0) { H5_FAILED(); - HDprintf(" failed to close group '%s'\n", GET_LINK_VAL_TEST_SUBGROUP7_NAME); + printf(" failed to close group '%s'\n", GET_LINK_VAL_TEST_SUBGROUP7_NAME); PART_ERROR(H5Lget_val_by_idx_soft_name_order_decreasing); } @@ -12657,7 +12539,7 @@ test_get_link_val(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" creation order tracking isn't supported with this VOL connector\n"); + printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Lget_val_by_idx_external_crt_order_increasing); } @@ -12666,20 +12548,20 @@ test_get_link_val(void) if ((ext_file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); + printf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); PART_ERROR(H5Lget_val_by_idx_external_crt_order_increasing); } if (H5Fclose(ext_file_id) < 0) { H5_FAILED(); - HDprintf(" couldn't close file '%s'\n", ext_link_filename); + printf(" couldn't close file '%s'\n", ext_link_filename); PART_ERROR(H5Lget_val_by_idx_external_crt_order_increasing); } if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_VAL_TEST_SUBGROUP8_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create subgroup '%s'\n", GET_LINK_VAL_TEST_SUBGROUP8_NAME); + printf(" couldn't create subgroup '%s'\n", GET_LINK_VAL_TEST_SUBGROUP8_NAME); PART_ERROR(H5Lget_val_by_idx_external_crt_order_increasing); } @@ -12687,200 +12569,200 @@ test_get_link_val(void) if (H5Lcreate_external(ext_link_filename, ext_obj_name_a, subgroup_id, GET_LINK_VAL_TEST_EXT_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create external link '%s'\n", GET_LINK_VAL_TEST_EXT_LINK_NAME); + printf(" couldn't create external link '%s'\n", GET_LINK_VAL_TEST_EXT_LINK_NAME); PART_ERROR(H5Lget_val_by_idx_external_crt_order_increasing); } if (H5Lcreate_external(ext_link_filename, ext_obj_name_b, subgroup_id, GET_LINK_VAL_TEST_EXT_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create external link '%s'\n", GET_LINK_VAL_TEST_EXT_LINK_NAME2); + printf(" couldn't create external link '%s'\n", GET_LINK_VAL_TEST_EXT_LINK_NAME2); PART_ERROR(H5Lget_val_by_idx_external_crt_order_increasing); } if (H5Lcreate_external(ext_link_filename, ext_obj_name_c, subgroup_id, GET_LINK_VAL_TEST_EXT_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create external link '%s'\n", GET_LINK_VAL_TEST_EXT_LINK_NAME3); + printf(" couldn't create external link '%s'\n", GET_LINK_VAL_TEST_EXT_LINK_NAME3); PART_ERROR(H5Lget_val_by_idx_external_crt_order_increasing); } /* Verify the links exist */ if ((link_exists = H5Lexists(subgroup_id, GET_LINK_VAL_TEST_EXT_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_EXT_LINK_NAME); + printf(" couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_EXT_LINK_NAME); PART_ERROR(H5Lget_val_by_idx_external_crt_order_increasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" link '%s' did not exist\n", GET_LINK_VAL_TEST_EXT_LINK_NAME); + printf(" link '%s' did not exist\n", GET_LINK_VAL_TEST_EXT_LINK_NAME); PART_ERROR(H5Lget_val_by_idx_external_crt_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_VAL_TEST_EXT_LINK_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_EXT_LINK_NAME2); + printf(" couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_EXT_LINK_NAME2); PART_ERROR(H5Lget_val_by_idx_external_crt_order_increasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" link '%s' did not exist\n", GET_LINK_VAL_TEST_EXT_LINK_NAME2); + printf(" link '%s' did not exist\n", GET_LINK_VAL_TEST_EXT_LINK_NAME2); PART_ERROR(H5Lget_val_by_idx_external_crt_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_VAL_TEST_EXT_LINK_NAME3, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_EXT_LINK_NAME3); + printf(" couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_EXT_LINK_NAME3); PART_ERROR(H5Lget_val_by_idx_external_crt_order_increasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" link '%s' did not exist\n", GET_LINK_VAL_TEST_EXT_LINK_NAME3); + printf(" link '%s' did not exist\n", GET_LINK_VAL_TEST_EXT_LINK_NAME3); PART_ERROR(H5Lget_val_by_idx_external_crt_order_increasing); } /* Retrieve the info and value of each link in turn */ - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 0, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve external link's info at index %d\n", 0); + printf(" failed to retrieve external link's info at index %d\n", 0); PART_ERROR(H5Lget_val_by_idx_external_crt_order_increasing); } link_val_size = 1 + strlen(ext_link_filename) + 1 + strlen(ext_obj_name_a) + 1; if (link_info.u.val_size != link_val_size) { H5_FAILED(); - HDprintf(" link value size %zu for link at index %d did not match expected size of %zu\n", - link_info.u.val_size, 0, link_val_size); + printf(" link value size %zu for link at index %d did not match expected size of %zu\n", + link_info.u.val_size, 0, link_val_size); PART_ERROR(H5Lget_val_by_idx_external_crt_order_increasing); } - HDmemset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); + memset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); if (H5Lget_val_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 0, link_val_buf, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't get external link value at index %d\n", 0); + printf(" couldn't get external link value at index %d\n", 0); PART_ERROR(H5Lget_val_by_idx_external_crt_order_increasing); } if (H5Lunpack_elink_val(link_val_buf, link_info.u.val_size, &ext_link_flags, &ext_link_filepath, &ext_link_val) < 0) { H5_FAILED(); - HDprintf(" couldn't unpack external link value buffer\n"); + printf(" couldn't unpack external link value buffer\n"); PART_ERROR(H5Lget_val_by_idx_external_crt_order_increasing); } if (HDstrncmp(ext_link_filepath, ext_link_filename, strlen(ext_link_filename) + 1)) { H5_FAILED(); - HDprintf(" external link target file '%s' did not match expected '%s'\n", - ext_link_filepath, ext_link_filename); + printf(" external link target file '%s' did not match expected '%s'\n", ext_link_filepath, + ext_link_filename); PART_ERROR(H5Lget_val_by_idx_external_crt_order_increasing); } if (HDstrncmp(ext_link_val, ext_obj_name_a, strlen(ext_obj_name_a) + 1)) { H5_FAILED(); - HDprintf(" external link value '%s' did not match expected '%s'\n", ext_link_val, - ext_obj_name_a); + printf(" external link value '%s' did not match expected '%s'\n", ext_link_val, + ext_obj_name_a); PART_ERROR(H5Lget_val_by_idx_external_crt_order_increasing); } - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 1, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve external link's info at index %d\n", 1); + printf(" failed to retrieve external link's info at index %d\n", 1); PART_ERROR(H5Lget_val_by_idx_external_crt_order_increasing); } link_val_size = 1 + strlen(ext_link_filename) + 1 + strlen(ext_obj_name_b) + 1; if (link_info.u.val_size != link_val_size) { H5_FAILED(); - HDprintf(" link value size %zu for link at index %d did not match expected size of %zu\n", - link_info.u.val_size, 1, link_val_size); + printf(" link value size %zu for link at index %d did not match expected size of %zu\n", + link_info.u.val_size, 1, link_val_size); PART_ERROR(H5Lget_val_by_idx_external_crt_order_increasing); } - HDmemset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); + memset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); if (H5Lget_val_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 1, link_val_buf, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't get external link value at index %d\n", 1); + printf(" couldn't get external link value at index %d\n", 1); PART_ERROR(H5Lget_val_by_idx_external_crt_order_increasing); } if (H5Lunpack_elink_val(link_val_buf, link_info.u.val_size, &ext_link_flags, &ext_link_filepath, &ext_link_val) < 0) { H5_FAILED(); - HDprintf(" couldn't unpack external link value buffer\n"); + printf(" couldn't unpack external link value buffer\n"); PART_ERROR(H5Lget_val_by_idx_external_crt_order_increasing); } if (HDstrncmp(ext_link_filepath, ext_link_filename, strlen(ext_link_filename) + 1)) { H5_FAILED(); - HDprintf(" external link target file '%s' did not match expected '%s'\n", - ext_link_filepath, ext_link_filename); + printf(" external link target file '%s' did not match expected '%s'\n", ext_link_filepath, + ext_link_filename); PART_ERROR(H5Lget_val_by_idx_external_crt_order_increasing); } if (HDstrncmp(ext_link_val, ext_obj_name_b, strlen(ext_obj_name_b) + 1)) { H5_FAILED(); - HDprintf(" external link value '%s' did not match expected '%s'\n", ext_link_val, - ext_obj_name_b); + printf(" external link value '%s' did not match expected '%s'\n", ext_link_val, + ext_obj_name_b); PART_ERROR(H5Lget_val_by_idx_external_crt_order_increasing); } - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 2, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve external link's info at index %d\n", 2); + printf(" failed to retrieve external link's info at index %d\n", 2); PART_ERROR(H5Lget_val_by_idx_external_crt_order_increasing); } link_val_size = 1 + strlen(ext_link_filename) + 1 + strlen(ext_obj_name_c) + 1; if (link_info.u.val_size != link_val_size) { H5_FAILED(); - HDprintf(" link value size %zu for link at index %d did not match expected size of %zu\n", - link_info.u.val_size, 2, link_val_size); + printf(" link value size %zu for link at index %d did not match expected size of %zu\n", + link_info.u.val_size, 2, link_val_size); PART_ERROR(H5Lget_val_by_idx_external_crt_order_increasing); } - HDmemset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); + memset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); if (H5Lget_val_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 2, link_val_buf, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't get external link value at index %d\n", 2); + printf(" couldn't get external link value at index %d\n", 2); PART_ERROR(H5Lget_val_by_idx_external_crt_order_increasing); } if (H5Lunpack_elink_val(link_val_buf, link_info.u.val_size, &ext_link_flags, &ext_link_filepath, &ext_link_val) < 0) { H5_FAILED(); - HDprintf(" couldn't unpack external link value buffer\n"); + printf(" couldn't unpack external link value buffer\n"); PART_ERROR(H5Lget_val_by_idx_external_crt_order_increasing); } if (HDstrncmp(ext_link_filepath, ext_link_filename, strlen(ext_link_filename) + 1)) { H5_FAILED(); - HDprintf(" external link target file '%s' did not match expected '%s'\n", - ext_link_filepath, ext_link_filename); + printf(" external link target file '%s' did not match expected '%s'\n", ext_link_filepath, + ext_link_filename); PART_ERROR(H5Lget_val_by_idx_external_crt_order_increasing); } if (HDstrncmp(ext_link_val, ext_obj_name_c, strlen(ext_obj_name_c) + 1)) { H5_FAILED(); - HDprintf(" external link value '%s' did not match expected '%s'\n", ext_link_val, - ext_obj_name_c); + printf(" external link value '%s' did not match expected '%s'\n", ext_link_val, + ext_obj_name_c); PART_ERROR(H5Lget_val_by_idx_external_crt_order_increasing); } if (H5Gclose(subgroup_id) < 0) { H5_FAILED(); - HDprintf(" failed to close group '%s'\n", GET_LINK_VAL_TEST_SUBGROUP8_NAME); + printf(" failed to close group '%s'\n", GET_LINK_VAL_TEST_SUBGROUP8_NAME); PART_ERROR(H5Lget_val_by_idx_external_crt_order_increasing); } @@ -12907,7 +12789,7 @@ test_get_link_val(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" creation order tracking isn't supported with this VOL connector\n"); + printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Lget_val_by_idx_external_crt_order_decreasing); } @@ -12916,20 +12798,20 @@ test_get_link_val(void) if ((ext_file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); + printf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); PART_ERROR(H5Lget_val_by_idx_external_crt_order_decreasing); } if (H5Fclose(ext_file_id) < 0) { H5_FAILED(); - HDprintf(" couldn't close file '%s'\n", ext_link_filename); + printf(" couldn't close file '%s'\n", ext_link_filename); PART_ERROR(H5Lget_val_by_idx_external_crt_order_decreasing); } if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_VAL_TEST_SUBGROUP9_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create subgroup '%s'\n", GET_LINK_VAL_TEST_SUBGROUP9_NAME); + printf(" couldn't create subgroup '%s'\n", GET_LINK_VAL_TEST_SUBGROUP9_NAME); PART_ERROR(H5Lget_val_by_idx_external_crt_order_decreasing); } @@ -12937,200 +12819,200 @@ test_get_link_val(void) if (H5Lcreate_external(ext_link_filename, ext_obj_name_a, subgroup_id, GET_LINK_VAL_TEST_EXT_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create external link '%s'\n", GET_LINK_VAL_TEST_EXT_LINK_NAME); + printf(" couldn't create external link '%s'\n", GET_LINK_VAL_TEST_EXT_LINK_NAME); PART_ERROR(H5Lget_val_by_idx_external_crt_order_decreasing); } if (H5Lcreate_external(ext_link_filename, ext_obj_name_b, subgroup_id, GET_LINK_VAL_TEST_EXT_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create external link '%s'\n", GET_LINK_VAL_TEST_EXT_LINK_NAME2); + printf(" couldn't create external link '%s'\n", GET_LINK_VAL_TEST_EXT_LINK_NAME2); PART_ERROR(H5Lget_val_by_idx_external_crt_order_decreasing); } if (H5Lcreate_external(ext_link_filename, ext_obj_name_c, subgroup_id, GET_LINK_VAL_TEST_EXT_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create external link '%s'\n", GET_LINK_VAL_TEST_EXT_LINK_NAME3); + printf(" couldn't create external link '%s'\n", GET_LINK_VAL_TEST_EXT_LINK_NAME3); PART_ERROR(H5Lget_val_by_idx_external_crt_order_decreasing); } /* Verify the links exist */ if ((link_exists = H5Lexists(subgroup_id, GET_LINK_VAL_TEST_EXT_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_EXT_LINK_NAME); + printf(" couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_EXT_LINK_NAME); PART_ERROR(H5Lget_val_by_idx_external_crt_order_decreasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" link '%s' did not exist\n", GET_LINK_VAL_TEST_EXT_LINK_NAME); + printf(" link '%s' did not exist\n", GET_LINK_VAL_TEST_EXT_LINK_NAME); PART_ERROR(H5Lget_val_by_idx_external_crt_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_VAL_TEST_EXT_LINK_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_EXT_LINK_NAME2); + printf(" couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_EXT_LINK_NAME2); PART_ERROR(H5Lget_val_by_idx_external_crt_order_decreasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" link '%s' did not exist\n", GET_LINK_VAL_TEST_EXT_LINK_NAME2); + printf(" link '%s' did not exist\n", GET_LINK_VAL_TEST_EXT_LINK_NAME2); PART_ERROR(H5Lget_val_by_idx_external_crt_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_VAL_TEST_EXT_LINK_NAME3, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_EXT_LINK_NAME3); + printf(" couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_EXT_LINK_NAME3); PART_ERROR(H5Lget_val_by_idx_external_crt_order_decreasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" link '%s' did not exist\n", GET_LINK_VAL_TEST_EXT_LINK_NAME3); + printf(" link '%s' did not exist\n", GET_LINK_VAL_TEST_EXT_LINK_NAME3); PART_ERROR(H5Lget_val_by_idx_external_crt_order_decreasing); } /* Retrieve the info and value of each link in turn */ - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 2, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve external link's info at index %d\n", 2); + printf(" failed to retrieve external link's info at index %d\n", 2); PART_ERROR(H5Lget_val_by_idx_external_crt_order_decreasing); } link_val_size = 1 + strlen(ext_link_filename) + 1 + strlen(ext_obj_name_a) + 1; if (link_info.u.val_size != link_val_size) { H5_FAILED(); - HDprintf(" link value size %zu for link at index %d not match expected size of %zu\n", - link_info.u.val_size, 2, link_val_size); + printf(" link value size %zu for link at index %d not match expected size of %zu\n", + link_info.u.val_size, 2, link_val_size); PART_ERROR(H5Lget_val_by_idx_external_crt_order_decreasing); } - HDmemset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); + memset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); if (H5Lget_val_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 2, link_val_buf, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't get external link value at index %d\n", 2); + printf(" couldn't get external link value at index %d\n", 2); PART_ERROR(H5Lget_val_by_idx_external_crt_order_decreasing); } if (H5Lunpack_elink_val(link_val_buf, link_info.u.val_size, &ext_link_flags, &ext_link_filepath, &ext_link_val) < 0) { H5_FAILED(); - HDprintf(" couldn't unpack external link value buffer\n"); + printf(" couldn't unpack external link value buffer\n"); PART_ERROR(H5Lget_val_by_idx_external_crt_order_decreasing); } if (HDstrncmp(ext_link_filepath, ext_link_filename, strlen(ext_link_filename) + 1)) { H5_FAILED(); - HDprintf(" external link target file '%s' did not match expected '%s'\n", - ext_link_filepath, ext_link_filename); + printf(" external link target file '%s' did not match expected '%s'\n", ext_link_filepath, + ext_link_filename); PART_ERROR(H5Lget_val_by_idx_external_crt_order_decreasing); } if (HDstrncmp(ext_link_val, ext_obj_name_a, strlen(ext_obj_name_a) + 1)) { H5_FAILED(); - HDprintf(" external link value '%s' did not match expected '%s'\n", ext_link_val, - ext_obj_name_a); + printf(" external link value '%s' did not match expected '%s'\n", ext_link_val, + ext_obj_name_a); PART_ERROR(H5Lget_val_by_idx_external_crt_order_decreasing); } - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 1, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve external link's info at index %d\n", 1); + printf(" failed to retrieve external link's info at index %d\n", 1); PART_ERROR(H5Lget_val_by_idx_external_crt_order_decreasing); } link_val_size = 1 + strlen(ext_link_filename) + 1 + strlen(ext_obj_name_b) + 1; if (link_info.u.val_size != link_val_size) { H5_FAILED(); - HDprintf(" link value size %zu for link at index %d did not match expected size of %zu\n", - link_info.u.val_size, 1, link_val_size); + printf(" link value size %zu for link at index %d did not match expected size of %zu\n", + link_info.u.val_size, 1, link_val_size); PART_ERROR(H5Lget_val_by_idx_external_crt_order_decreasing); } - HDmemset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); + memset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); if (H5Lget_val_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 1, link_val_buf, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't get external link value at index %d\n", 1); + printf(" couldn't get external link value at index %d\n", 1); PART_ERROR(H5Lget_val_by_idx_external_crt_order_decreasing); } if (H5Lunpack_elink_val(link_val_buf, link_info.u.val_size, &ext_link_flags, &ext_link_filepath, &ext_link_val) < 0) { H5_FAILED(); - HDprintf(" couldn't unpack external link value buffer\n"); + printf(" couldn't unpack external link value buffer\n"); PART_ERROR(H5Lget_val_by_idx_external_crt_order_decreasing); } if (HDstrncmp(ext_link_filepath, ext_link_filename, strlen(ext_link_filename) + 1)) { H5_FAILED(); - HDprintf(" external link target file '%s' did not match expected '%s'\n", - ext_link_filepath, ext_link_filename); + printf(" external link target file '%s' did not match expected '%s'\n", ext_link_filepath, + ext_link_filename); PART_ERROR(H5Lget_val_by_idx_external_crt_order_decreasing); } if (HDstrncmp(ext_link_val, ext_obj_name_b, strlen(ext_obj_name_b) + 1)) { H5_FAILED(); - HDprintf(" external link value '%s' did not match expected '%s'\n", ext_link_val, - ext_obj_name_b); + printf(" external link value '%s' did not match expected '%s'\n", ext_link_val, + ext_obj_name_b); PART_ERROR(H5Lget_val_by_idx_external_crt_order_decreasing); } - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 0, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve external link's info at index %d\n", 0); + printf(" failed to retrieve external link's info at index %d\n", 0); PART_ERROR(H5Lget_val_by_idx_external_crt_order_decreasing); } link_val_size = 1 + strlen(ext_link_filename) + 1 + strlen(ext_obj_name_c) + 1; if (link_info.u.val_size != link_val_size) { H5_FAILED(); - HDprintf(" link value size %zu for link at index %d did not match expected size of %zu\n", - link_info.u.val_size, 0, link_val_size); + printf(" link value size %zu for link at index %d did not match expected size of %zu\n", + link_info.u.val_size, 0, link_val_size); PART_ERROR(H5Lget_val_by_idx_external_crt_order_decreasing); } - HDmemset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); + memset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); if (H5Lget_val_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 0, link_val_buf, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't get external link value at index %d\n", 0); + printf(" couldn't get external link value at index %d\n", 0); PART_ERROR(H5Lget_val_by_idx_external_crt_order_decreasing); } if (H5Lunpack_elink_val(link_val_buf, link_info.u.val_size, &ext_link_flags, &ext_link_filepath, &ext_link_val) < 0) { H5_FAILED(); - HDprintf(" couldn't unpack external link value buffer\n"); + printf(" couldn't unpack external link value buffer\n"); PART_ERROR(H5Lget_val_by_idx_external_crt_order_decreasing); } if (HDstrncmp(ext_link_filepath, ext_link_filename, strlen(ext_link_filename) + 1)) { H5_FAILED(); - HDprintf(" external link target file '%s' did not match expected '%s'\n", - ext_link_filepath, ext_link_filename); + printf(" external link target file '%s' did not match expected '%s'\n", ext_link_filepath, + ext_link_filename); PART_ERROR(H5Lget_val_by_idx_external_crt_order_decreasing); } if (HDstrncmp(ext_link_val, ext_obj_name_c, strlen(ext_obj_name_c) + 1)) { H5_FAILED(); - HDprintf(" external link value '%s' did not match expected '%s'\n", ext_link_val, - ext_obj_name_c); + printf(" external link value '%s' did not match expected '%s'\n", ext_link_val, + ext_obj_name_c); PART_ERROR(H5Lget_val_by_idx_external_crt_order_decreasing); } if (H5Gclose(subgroup_id) < 0) { H5_FAILED(); - HDprintf(" failed to close group '%s'\n", GET_LINK_VAL_TEST_SUBGROUP9_NAME); + printf(" failed to close group '%s'\n", GET_LINK_VAL_TEST_SUBGROUP9_NAME); PART_ERROR(H5Lget_val_by_idx_external_crt_order_decreasing); } @@ -13160,20 +13042,20 @@ test_get_link_val(void) if ((ext_file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); + printf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); PART_ERROR(H5Lget_val_by_idx_external_name_order_increasing); } if (H5Fclose(ext_file_id) < 0) { H5_FAILED(); - HDprintf(" couldn't close file '%s'\n", ext_link_filename); + printf(" couldn't close file '%s'\n", ext_link_filename); PART_ERROR(H5Lget_val_by_idx_external_name_order_increasing); } if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_VAL_TEST_SUBGROUP10_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create subgroup '%s'\n", GET_LINK_VAL_TEST_SUBGROUP10_NAME); + printf(" couldn't create subgroup '%s'\n", GET_LINK_VAL_TEST_SUBGROUP10_NAME); PART_ERROR(H5Lget_val_by_idx_external_name_order_increasing); } @@ -13181,200 +13063,200 @@ test_get_link_val(void) if (H5Lcreate_external(ext_link_filename, ext_obj_name_a, subgroup_id, GET_LINK_VAL_TEST_EXT_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create external link '%s'\n", GET_LINK_VAL_TEST_EXT_LINK_NAME); + printf(" couldn't create external link '%s'\n", GET_LINK_VAL_TEST_EXT_LINK_NAME); PART_ERROR(H5Lget_val_by_idx_external_name_order_increasing); } if (H5Lcreate_external(ext_link_filename, ext_obj_name_b, subgroup_id, GET_LINK_VAL_TEST_EXT_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create external link '%s'\n", GET_LINK_VAL_TEST_EXT_LINK_NAME2); + printf(" couldn't create external link '%s'\n", GET_LINK_VAL_TEST_EXT_LINK_NAME2); PART_ERROR(H5Lget_val_by_idx_external_name_order_increasing); } if (H5Lcreate_external(ext_link_filename, ext_obj_name_c, subgroup_id, GET_LINK_VAL_TEST_EXT_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create external link '%s'\n", GET_LINK_VAL_TEST_EXT_LINK_NAME3); + printf(" couldn't create external link '%s'\n", GET_LINK_VAL_TEST_EXT_LINK_NAME3); PART_ERROR(H5Lget_val_by_idx_external_name_order_increasing); } /* Verify the links exist */ if ((link_exists = H5Lexists(subgroup_id, GET_LINK_VAL_TEST_EXT_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_EXT_LINK_NAME); + printf(" couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_EXT_LINK_NAME); PART_ERROR(H5Lget_val_by_idx_external_name_order_increasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" link '%s' did not exist\n", GET_LINK_VAL_TEST_EXT_LINK_NAME); + printf(" link '%s' did not exist\n", GET_LINK_VAL_TEST_EXT_LINK_NAME); PART_ERROR(H5Lget_val_by_idx_external_name_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_VAL_TEST_EXT_LINK_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_EXT_LINK_NAME2); + printf(" couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_EXT_LINK_NAME2); PART_ERROR(H5Lget_val_by_idx_external_name_order_increasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" link '%s' did not exist\n", GET_LINK_VAL_TEST_EXT_LINK_NAME2); + printf(" link '%s' did not exist\n", GET_LINK_VAL_TEST_EXT_LINK_NAME2); PART_ERROR(H5Lget_val_by_idx_external_name_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_VAL_TEST_EXT_LINK_NAME3, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_EXT_LINK_NAME3); + printf(" couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_EXT_LINK_NAME3); PART_ERROR(H5Lget_val_by_idx_external_name_order_increasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" link '%s' did not exist\n", GET_LINK_VAL_TEST_EXT_LINK_NAME3); + printf(" link '%s' did not exist\n", GET_LINK_VAL_TEST_EXT_LINK_NAME3); PART_ERROR(H5Lget_val_by_idx_external_name_order_increasing); } /* Retrieve the info and value of each link in turn */ - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 0, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve external link's info at index %d\n", 0); + printf(" failed to retrieve external link's info at index %d\n", 0); PART_ERROR(H5Lget_val_by_idx_external_name_order_increasing); } link_val_size = 1 + strlen(ext_link_filename) + 1 + strlen(ext_obj_name_a) + 1; if (link_info.u.val_size != link_val_size) { H5_FAILED(); - HDprintf(" link value size %zu for link at index %d did not match expected size of %zu\n", - link_info.u.val_size, 0, link_val_size); + printf(" link value size %zu for link at index %d did not match expected size of %zu\n", + link_info.u.val_size, 0, link_val_size); PART_ERROR(H5Lget_val_by_idx_external_name_order_increasing); } - HDmemset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); + memset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); if (H5Lget_val_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 0, link_val_buf, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't get external link value at index %d\n", 0); + printf(" couldn't get external link value at index %d\n", 0); PART_ERROR(H5Lget_val_by_idx_external_name_order_increasing); } if (H5Lunpack_elink_val(link_val_buf, link_info.u.val_size, &ext_link_flags, &ext_link_filepath, &ext_link_val) < 0) { H5_FAILED(); - HDprintf(" couldn't unpack external link value buffer\n"); + printf(" couldn't unpack external link value buffer\n"); PART_ERROR(H5Lget_val_by_idx_external_name_order_increasing); } if (HDstrncmp(ext_link_filepath, ext_link_filename, strlen(ext_link_filename) + 1)) { H5_FAILED(); - HDprintf(" external link target file '%s' did not match expected '%s'\n", - ext_link_filepath, ext_link_filename); + printf(" external link target file '%s' did not match expected '%s'\n", ext_link_filepath, + ext_link_filename); PART_ERROR(H5Lget_val_by_idx_external_name_order_increasing); } if (HDstrncmp(ext_link_val, ext_obj_name_a, strlen(ext_obj_name_a) + 1)) { H5_FAILED(); - HDprintf(" external link value '%s' did not match expected '%s'\n", ext_link_val, - ext_obj_name_a); + printf(" external link value '%s' did not match expected '%s'\n", ext_link_val, + ext_obj_name_a); PART_ERROR(H5Lget_val_by_idx_external_name_order_increasing); } - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 1, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve external link's info at index %d\n", 1); + printf(" failed to retrieve external link's info at index %d\n", 1); PART_ERROR(H5Lget_val_by_idx_external_name_order_increasing); } link_val_size = 1 + strlen(ext_link_filename) + 1 + strlen(ext_obj_name_b) + 1; if (link_info.u.val_size != link_val_size) { H5_FAILED(); - HDprintf(" link value size %zu for link at index %d did not match expected size of %zu\n", - link_info.u.val_size, 1, link_val_size); + printf(" link value size %zu for link at index %d did not match expected size of %zu\n", + link_info.u.val_size, 1, link_val_size); PART_ERROR(H5Lget_val_by_idx_external_name_order_increasing); } - HDmemset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); + memset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); if (H5Lget_val_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 1, link_val_buf, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't get external link value at index %d\n", 1); + printf(" couldn't get external link value at index %d\n", 1); PART_ERROR(H5Lget_val_by_idx_external_name_order_increasing); } if (H5Lunpack_elink_val(link_val_buf, link_info.u.val_size, &ext_link_flags, &ext_link_filepath, &ext_link_val) < 0) { H5_FAILED(); - HDprintf(" couldn't unpack external link value buffer\n"); + printf(" couldn't unpack external link value buffer\n"); PART_ERROR(H5Lget_val_by_idx_external_name_order_increasing); } if (HDstrncmp(ext_link_filepath, ext_link_filename, strlen(ext_link_filename) + 1)) { H5_FAILED(); - HDprintf(" external link target file '%s' did not match expected '%s'\n", - ext_link_filepath, ext_link_filename); + printf(" external link target file '%s' did not match expected '%s'\n", ext_link_filepath, + ext_link_filename); PART_ERROR(H5Lget_val_by_idx_external_name_order_increasing); } if (HDstrncmp(ext_link_val, ext_obj_name_b, strlen(ext_obj_name_b) + 1)) { H5_FAILED(); - HDprintf(" external link value '%s' did not match expected '%s'\n", ext_link_val, - ext_obj_name_b); + printf(" external link value '%s' did not match expected '%s'\n", ext_link_val, + ext_obj_name_b); PART_ERROR(H5Lget_val_by_idx_external_name_order_increasing); } - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 2, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve external link's info at index %d\n", 2); + printf(" failed to retrieve external link's info at index %d\n", 2); PART_ERROR(H5Lget_val_by_idx_external_name_order_increasing); } link_val_size = 1 + strlen(ext_link_filename) + 1 + strlen(ext_obj_name_c) + 1; if (link_info.u.val_size != link_val_size) { H5_FAILED(); - HDprintf(" link value size %zu for link at index %d did not match expected size of %zu\n", - link_info.u.val_size, 2, link_val_size); + printf(" link value size %zu for link at index %d did not match expected size of %zu\n", + link_info.u.val_size, 2, link_val_size); PART_ERROR(H5Lget_val_by_idx_external_name_order_increasing); } - HDmemset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); + memset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); if (H5Lget_val_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 2, link_val_buf, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't get external link value at index %d\n", 2); + printf(" couldn't get external link value at index %d\n", 2); PART_ERROR(H5Lget_val_by_idx_external_name_order_increasing); } if (H5Lunpack_elink_val(link_val_buf, link_info.u.val_size, &ext_link_flags, &ext_link_filepath, &ext_link_val) < 0) { H5_FAILED(); - HDprintf(" couldn't unpack external link value buffer\n"); + printf(" couldn't unpack external link value buffer\n"); PART_ERROR(H5Lget_val_by_idx_external_name_order_increasing); } if (HDstrncmp(ext_link_filepath, ext_link_filename, strlen(ext_link_filename) + 1)) { H5_FAILED(); - HDprintf(" external link target file '%s' did not match expected '%s'\n", - ext_link_filepath, ext_link_filename); + printf(" external link target file '%s' did not match expected '%s'\n", ext_link_filepath, + ext_link_filename); PART_ERROR(H5Lget_val_by_idx_external_name_order_increasing); } if (HDstrncmp(ext_link_val, ext_obj_name_c, strlen(ext_obj_name_c) + 1)) { H5_FAILED(); - HDprintf(" external link value '%s' did not match expected '%s'\n", ext_link_val, - ext_obj_name_c); + printf(" external link value '%s' did not match expected '%s'\n", ext_link_val, + ext_obj_name_c); PART_ERROR(H5Lget_val_by_idx_external_name_order_increasing); } if (H5Gclose(subgroup_id) < 0) { H5_FAILED(); - HDprintf(" failed to close group '%s'\n", GET_LINK_VAL_TEST_SUBGROUP10_NAME); + printf(" failed to close group '%s'\n", GET_LINK_VAL_TEST_SUBGROUP10_NAME); PART_ERROR(H5Lget_val_by_idx_external_name_order_increasing); } @@ -13404,20 +13286,20 @@ test_get_link_val(void) if ((ext_file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); + printf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); PART_ERROR(H5Lget_val_by_idx_external_name_order_decreasing); } if (H5Fclose(ext_file_id) < 0) { H5_FAILED(); - HDprintf(" couldn't close file '%s'\n", ext_link_filename); + printf(" couldn't close file '%s'\n", ext_link_filename); PART_ERROR(H5Lget_val_by_idx_external_name_order_decreasing); } if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_VAL_TEST_SUBGROUP11_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create subgroup '%s'\n", GET_LINK_VAL_TEST_SUBGROUP11_NAME); + printf(" couldn't create subgroup '%s'\n", GET_LINK_VAL_TEST_SUBGROUP11_NAME); PART_ERROR(H5Lget_val_by_idx_external_name_order_decreasing); } @@ -13425,200 +13307,200 @@ test_get_link_val(void) if (H5Lcreate_external(ext_link_filename, ext_obj_name_a, subgroup_id, GET_LINK_VAL_TEST_EXT_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create external link '%s'\n", GET_LINK_VAL_TEST_EXT_LINK_NAME); + printf(" couldn't create external link '%s'\n", GET_LINK_VAL_TEST_EXT_LINK_NAME); PART_ERROR(H5Lget_val_by_idx_external_name_order_decreasing); } if (H5Lcreate_external(ext_link_filename, ext_obj_name_b, subgroup_id, GET_LINK_VAL_TEST_EXT_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create external link '%s'\n", GET_LINK_VAL_TEST_EXT_LINK_NAME2); + printf(" couldn't create external link '%s'\n", GET_LINK_VAL_TEST_EXT_LINK_NAME2); PART_ERROR(H5Lget_val_by_idx_external_name_order_decreasing); } if (H5Lcreate_external(ext_link_filename, ext_obj_name_c, subgroup_id, GET_LINK_VAL_TEST_EXT_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create external link '%s'\n", GET_LINK_VAL_TEST_EXT_LINK_NAME3); + printf(" couldn't create external link '%s'\n", GET_LINK_VAL_TEST_EXT_LINK_NAME3); PART_ERROR(H5Lget_val_by_idx_external_name_order_decreasing); } /* Verify the links exist */ if ((link_exists = H5Lexists(subgroup_id, GET_LINK_VAL_TEST_EXT_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_EXT_LINK_NAME); + printf(" couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_EXT_LINK_NAME); PART_ERROR(H5Lget_val_by_idx_external_name_order_decreasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" link '%s' did not exist\n", GET_LINK_VAL_TEST_EXT_LINK_NAME); + printf(" link '%s' did not exist\n", GET_LINK_VAL_TEST_EXT_LINK_NAME); PART_ERROR(H5Lget_val_by_idx_external_name_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_VAL_TEST_EXT_LINK_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_EXT_LINK_NAME2); + printf(" couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_EXT_LINK_NAME2); PART_ERROR(H5Lget_val_by_idx_external_name_order_decreasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" link '%s' did not exist\n", GET_LINK_VAL_TEST_EXT_LINK_NAME2); + printf(" link '%s' did not exist\n", GET_LINK_VAL_TEST_EXT_LINK_NAME2); PART_ERROR(H5Lget_val_by_idx_external_name_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_VAL_TEST_EXT_LINK_NAME3, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_EXT_LINK_NAME3); + printf(" couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_EXT_LINK_NAME3); PART_ERROR(H5Lget_val_by_idx_external_name_order_decreasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" link '%s' did not exist\n", GET_LINK_VAL_TEST_EXT_LINK_NAME3); + printf(" link '%s' did not exist\n", GET_LINK_VAL_TEST_EXT_LINK_NAME3); PART_ERROR(H5Lget_val_by_idx_external_name_order_decreasing); } /* Retrieve the info and value of each link in turn */ - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 2, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve external link's info at index %d\n", 2); + printf(" failed to retrieve external link's info at index %d\n", 2); PART_ERROR(H5Lget_val_by_idx_external_name_order_decreasing); } link_val_size = 1 + strlen(ext_link_filename) + 1 + strlen(ext_obj_name_a) + 1; if (link_info.u.val_size != link_val_size) { H5_FAILED(); - HDprintf(" link value size %zu for link at index %d did not match expected size of %zu\n", - link_info.u.val_size, 2, link_val_size); + printf(" link value size %zu for link at index %d did not match expected size of %zu\n", + link_info.u.val_size, 2, link_val_size); PART_ERROR(H5Lget_val_by_idx_external_name_order_decreasing); } - HDmemset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); + memset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); if (H5Lget_val_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 2, link_val_buf, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't get external link value at index %d\n", 2); + printf(" couldn't get external link value at index %d\n", 2); PART_ERROR(H5Lget_val_by_idx_external_name_order_decreasing); } if (H5Lunpack_elink_val(link_val_buf, link_info.u.val_size, &ext_link_flags, &ext_link_filepath, &ext_link_val) < 0) { H5_FAILED(); - HDprintf(" couldn't unpack external link value buffer\n"); + printf(" couldn't unpack external link value buffer\n"); PART_ERROR(H5Lget_val_by_idx_external_name_order_decreasing); } if (HDstrncmp(ext_link_filepath, ext_link_filename, strlen(ext_link_filename) + 1)) { H5_FAILED(); - HDprintf(" external link target file '%s' did not match expected '%s'\n", - ext_link_filepath, ext_link_filename); + printf(" external link target file '%s' did not match expected '%s'\n", ext_link_filepath, + ext_link_filename); PART_ERROR(H5Lget_val_by_idx_external_name_order_decreasing); } if (HDstrncmp(ext_link_val, ext_obj_name_a, strlen(ext_obj_name_a) + 1)) { H5_FAILED(); - HDprintf(" external link value '%s' did not match expected '%s'\n", ext_link_val, - ext_obj_name_a); + printf(" external link value '%s' did not match expected '%s'\n", ext_link_val, + ext_obj_name_a); PART_ERROR(H5Lget_val_by_idx_external_name_order_decreasing); } - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 1, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve external link's info at index %d\n", 1); + printf(" failed to retrieve external link's info at index %d\n", 1); PART_ERROR(H5Lget_val_by_idx_external_name_order_decreasing); } link_val_size = 1 + strlen(ext_link_filename) + 1 + strlen(ext_obj_name_b) + 1; if (link_info.u.val_size != link_val_size) { H5_FAILED(); - HDprintf(" link value size %zu for link at index %d did not match expected size of %zu\n", - link_info.u.val_size, 1, link_val_size); + printf(" link value size %zu for link at index %d did not match expected size of %zu\n", + link_info.u.val_size, 1, link_val_size); PART_ERROR(H5Lget_val_by_idx_external_name_order_decreasing); } - HDmemset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); + memset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); if (H5Lget_val_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 1, link_val_buf, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't get external link value at index %d\n", 1); + printf(" couldn't get external link value at index %d\n", 1); PART_ERROR(H5Lget_val_by_idx_external_name_order_decreasing); } if (H5Lunpack_elink_val(link_val_buf, link_info.u.val_size, &ext_link_flags, &ext_link_filepath, &ext_link_val) < 0) { H5_FAILED(); - HDprintf(" couldn't unpack external link value buffer\n"); + printf(" couldn't unpack external link value buffer\n"); PART_ERROR(H5Lget_val_by_idx_external_name_order_decreasing); } if (HDstrncmp(ext_link_filepath, ext_link_filename, strlen(ext_link_filename) + 1)) { H5_FAILED(); - HDprintf(" external link target file '%s' did not match expected '%s'\n", - ext_link_filepath, ext_link_filename); + printf(" external link target file '%s' did not match expected '%s'\n", ext_link_filepath, + ext_link_filename); PART_ERROR(H5Lget_val_by_idx_external_name_order_decreasing); } if (HDstrncmp(ext_link_val, ext_obj_name_b, strlen(ext_obj_name_b) + 1)) { H5_FAILED(); - HDprintf(" external link value '%s' did not match expected '%s'\n", ext_link_val, - ext_obj_name_b); + printf(" external link value '%s' did not match expected '%s'\n", ext_link_val, + ext_obj_name_b); PART_ERROR(H5Lget_val_by_idx_external_name_order_decreasing); } - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 0, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve external link's info at index %d\n", 0); + printf(" failed to retrieve external link's info at index %d\n", 0); PART_ERROR(H5Lget_val_by_idx_external_name_order_decreasing); } link_val_size = 1 + strlen(ext_link_filename) + 1 + strlen(ext_obj_name_c) + 1; if (link_info.u.val_size != link_val_size) { H5_FAILED(); - HDprintf(" link value size %zu for link at index %d did not match expected size of %zu\n", - link_info.u.val_size, 0, link_val_size); + printf(" link value size %zu for link at index %d did not match expected size of %zu\n", + link_info.u.val_size, 0, link_val_size); PART_ERROR(H5Lget_val_by_idx_external_name_order_decreasing); } - HDmemset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); + memset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); if (H5Lget_val_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 0, link_val_buf, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't get external link value at index %d\n", 0); + printf(" couldn't get external link value at index %d\n", 0); PART_ERROR(H5Lget_val_by_idx_external_name_order_decreasing); } if (H5Lunpack_elink_val(link_val_buf, link_info.u.val_size, &ext_link_flags, &ext_link_filepath, &ext_link_val) < 0) { H5_FAILED(); - HDprintf(" couldn't unpack external link value buffer\n"); + printf(" couldn't unpack external link value buffer\n"); PART_ERROR(H5Lget_val_by_idx_external_name_order_decreasing); } if (HDstrncmp(ext_link_filepath, ext_link_filename, strlen(ext_link_filename) + 1)) { H5_FAILED(); - HDprintf(" external link target file '%s' did not match expected '%s'\n", - ext_link_filepath, ext_link_filename); + printf(" external link target file '%s' did not match expected '%s'\n", ext_link_filepath, + ext_link_filename); PART_ERROR(H5Lget_val_by_idx_external_name_order_decreasing); } if (HDstrncmp(ext_link_val, ext_obj_name_c, strlen(ext_obj_name_c) + 1)) { H5_FAILED(); - HDprintf(" external link value '%s' did not match expected '%s'\n", ext_link_val, - ext_obj_name_c); + printf(" external link value '%s' did not match expected '%s'\n", ext_link_val, + ext_obj_name_c); PART_ERROR(H5Lget_val_by_idx_external_name_order_decreasing); } if (H5Gclose(subgroup_id) < 0) { H5_FAILED(); - HDprintf(" failed to close group '%s'\n", GET_LINK_VAL_TEST_SUBGROUP11_NAME); + printf(" failed to close group '%s'\n", GET_LINK_VAL_TEST_SUBGROUP11_NAME); PART_ERROR(H5Lget_val_by_idx_external_name_order_decreasing); } @@ -13754,8 +13636,8 @@ test_get_link_val_invalid_params(void) !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_MORE) || !(vol_cap_flags_g & H5VL_CAP_FLAG_SOFT_LINKS)) { SKIPPED(); - HDprintf(" API functions for basic file, group, link, soft link, external link, or creation " - "order aren't supported with this connector\n"); + printf(" API functions for basic file, group, link, soft link, external link, or creation " + "order aren't supported with this connector\n"); return 0; } @@ -13763,34 +13645,33 @@ test_get_link_val_invalid_params(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); goto error; } if ((gcpl_id = H5Pcreate(H5P_GROUP_CREATE)) < 0) { H5_FAILED(); - HDprintf(" couldn't create a GCPL\n"); + printf(" couldn't create a GCPL\n"); goto error; } if ((group_id = H5Gcreate2(container_group, GET_LINK_VAL_INVALID_PARAMS_TEST_GROUP_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container subgroup '%s'\n", - GET_LINK_VAL_INVALID_PARAMS_TEST_GROUP_NAME); + printf(" couldn't create container subgroup '%s'\n", GET_LINK_VAL_INVALID_PARAMS_TEST_GROUP_NAME); goto error; } if (H5Lcreate_soft("/" LINK_TEST_GROUP_NAME "/" GET_LINK_VAL_INVALID_PARAMS_TEST_GROUP_NAME, group_id, GET_LINK_VAL_INVALID_PARAMS_TEST_SOFT_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create soft link '%s'\n", GET_LINK_VAL_INVALID_PARAMS_TEST_SOFT_LINK_NAME); + printf(" couldn't create soft link '%s'\n", GET_LINK_VAL_INVALID_PARAMS_TEST_SOFT_LINK_NAME); goto error; } @@ -13798,21 +13679,21 @@ test_get_link_val_invalid_params(void) if ((link_exists = H5Lexists(group_id, GET_LINK_VAL_INVALID_PARAMS_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if link '%s' exists\n", - GET_LINK_VAL_INVALID_PARAMS_TEST_SOFT_LINK_NAME); + printf(" couldn't determine if link '%s' exists\n", + GET_LINK_VAL_INVALID_PARAMS_TEST_SOFT_LINK_NAME); goto error; } if (!link_exists) { H5_FAILED(); - HDprintf(" link did not exist\n"); + printf(" link did not exist\n"); goto error; } link_val_buf_size = 100; - if (NULL == (link_val_buf = (char *)HDmalloc(link_val_buf_size))) { + if (NULL == (link_val_buf = (char *)malloc(link_val_buf_size))) { H5_FAILED(); - HDprintf(" couldn't allocate buffer for storing link value\n"); + printf(" couldn't allocate buffer for storing link value\n"); goto error; } @@ -13824,7 +13705,7 @@ test_get_link_val_invalid_params(void) { TESTING_2("H5Lget_val with an invalid location ID"); - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); H5E_BEGIN_TRY { @@ -13835,7 +13716,7 @@ test_get_link_val_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Lget_val succeeded with an invalid location ID\n"); + printf(" H5Lget_val succeeded with an invalid location ID\n"); PART_ERROR(H5Lget_val_invalid_loc_id); } @@ -13855,7 +13736,7 @@ test_get_link_val_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Lget_val succeeded with a NULL link name\n"); + printf(" H5Lget_val succeeded with a NULL link name\n"); PART_ERROR(H5Lget_val_invalid_link_name); } @@ -13867,7 +13748,7 @@ test_get_link_val_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Lget_val succeeded with an invalid link name of ''\n"); + printf(" H5Lget_val succeeded with an invalid link name of ''\n"); PART_ERROR(H5Lget_val_invalid_link_name); } @@ -13888,7 +13769,7 @@ test_get_link_val_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Lget_val succeeded with an invalid LAPL\n"); + printf(" H5Lget_val succeeded with an invalid LAPL\n"); PART_ERROR(H5Lget_val_invalid_lapl); } @@ -13900,7 +13781,7 @@ test_get_link_val_invalid_params(void) { TESTING_2("H5Lget_val_by_idx with an invalid location ID"); - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); H5E_BEGIN_TRY { @@ -13911,7 +13792,7 @@ test_get_link_val_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Lget_val_by_idx succeeded with an invalid location ID!\n"); + printf(" H5Lget_val_by_idx succeeded with an invalid location ID!\n"); PART_ERROR(H5Lget_val_by_idx_invalid_loc_id); } @@ -13932,7 +13813,7 @@ test_get_link_val_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Lget_val_by_idx succeeded with a NULL group name!\n"); + printf(" H5Lget_val_by_idx succeeded with a NULL group name!\n"); PART_ERROR(H5Lget_val_by_idx_invalid_grp_name); } @@ -13945,7 +13826,7 @@ test_get_link_val_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Lget_val_by_idx succeeded with an invalid group name of ''!\n"); + printf(" H5Lget_val_by_idx succeeded with an invalid group name of ''!\n"); PART_ERROR(H5Lget_val_by_idx_invalid_grp_name); } @@ -13966,7 +13847,7 @@ test_get_link_val_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Lget_val_by_idx succeeded with invalid index type H5_INDEX_UNKNOWN!\n"); + printf(" H5Lget_val_by_idx succeeded with invalid index type H5_INDEX_UNKNOWN!\n"); PART_ERROR(H5Lget_val_by_idx_invalid_index_type); } @@ -13979,7 +13860,7 @@ test_get_link_val_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Lget_val_by_idx succeeded with invalid index type H5_INDEX_N!\n"); + printf(" H5Lget_val_by_idx succeeded with invalid index type H5_INDEX_N!\n"); PART_ERROR(H5Lget_val_by_idx_invalid_index_type); } @@ -14000,8 +13881,7 @@ test_get_link_val_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf( - " H5Lget_val_by_idx succeeded with invalid iteration ordering H5_ITER_UNKNOWN!\n"); + printf(" H5Lget_val_by_idx succeeded with invalid iteration ordering H5_ITER_UNKNOWN!\n"); PART_ERROR(H5Lget_val_by_idx_invalid_iter_order); } @@ -14014,7 +13894,7 @@ test_get_link_val_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Lget_val_by_idx succeeded with invalid iteration ordering H5_ITER_N!\n"); + printf(" H5Lget_val_by_idx succeeded with invalid iteration ordering H5_ITER_N!\n"); PART_ERROR(H5Lget_val_by_idx_invalid_iter_order); } @@ -14035,7 +13915,7 @@ test_get_link_val_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Lget_val_by_idx succeeded with an invalid LAPL!\n"); + printf(" H5Lget_val_by_idx succeeded with an invalid LAPL!\n"); PART_ERROR(H5Lget_val_by_idx_invalid_lapl); } @@ -14048,7 +13928,7 @@ test_get_link_val_invalid_params(void) TESTING_2("test cleanup"); if (link_val_buf) { - HDfree(link_val_buf); + free(link_val_buf); link_val_buf = NULL; } @@ -14069,7 +13949,7 @@ error: H5E_BEGIN_TRY { if (link_val_buf) - HDfree(link_val_buf); + free(link_val_buf); H5Pclose(gcpl_id); H5Gclose(group_id); H5Gclose(container_group); @@ -14105,8 +13985,8 @@ test_get_link_info(void) !(vol_cap_flags_g & H5VL_CAP_FLAG_HARD_LINKS) || !(vol_cap_flags_g & H5VL_CAP_FLAG_EXTERNAL_LINKS) || !(vol_cap_flags_g & H5VL_CAP_FLAG_SOFT_LINKS)) { SKIPPED(); - HDprintf(" API functions for basic file, group, link, soft link, hard link, or external link " - "aren't supported with this connector\n"); + printf(" API functions for basic file, group, link, soft link, hard link, or external link " + "aren't supported with this connector\n"); return 0; } @@ -14114,26 +13994,26 @@ test_get_link_info(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); goto error; } if ((gcpl_id = H5Pcreate(H5P_GROUP_CREATE)) < 0) { H5_FAILED(); - HDprintf(" couldn't create GCPL for link creation order tracking\n"); + printf(" couldn't create GCPL for link creation order tracking\n"); goto error; } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (H5Pset_link_creation_order(gcpl_id, H5P_CRT_ORDER_TRACKED) < 0) { H5_FAILED(); - HDprintf(" couldn't set link creation order tracking\n"); + printf(" couldn't set link creation order tracking\n"); goto error; } } @@ -14141,7 +14021,7 @@ test_get_link_info(void) if ((group_id = H5Gcreate2(container_group, GET_LINK_INFO_TEST_GROUP_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container subgroup '%s'\n", GET_LINK_INFO_TEST_GROUP_NAME); + printf(" couldn't create container subgroup '%s'\n", GET_LINK_INFO_TEST_GROUP_NAME); goto error; } @@ -14153,59 +14033,59 @@ test_get_link_info(void) { TESTING_2("H5Lget_info2 on hard link"); - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_INFO_TEST_SUBGROUP1_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create subgroup '%s'\n", GET_LINK_INFO_TEST_SUBGROUP1_NAME); + printf(" couldn't create subgroup '%s'\n", GET_LINK_INFO_TEST_SUBGROUP1_NAME); PART_ERROR(H5Lget_info_hard); } if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, GET_LINK_INFO_TEST_HARD_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create hard link '%s'\n", GET_LINK_INFO_TEST_HARD_LINK_NAME); + printf(" couldn't create hard link '%s'\n", GET_LINK_INFO_TEST_HARD_LINK_NAME); PART_ERROR(H5Lget_info_hard); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if hard link '%s' exists\n", - GET_LINK_INFO_TEST_HARD_LINK_NAME); + printf(" couldn't determine if hard link '%s' exists\n", + GET_LINK_INFO_TEST_HARD_LINK_NAME); PART_ERROR(H5Lget_info_hard); } if (!link_exists) { H5_FAILED(); - HDprintf(" hard link did not exist\n"); + printf(" hard link did not exist\n"); PART_ERROR(H5Lget_info_hard); } if (H5Lget_info2(subgroup_id, GET_LINK_INFO_TEST_HARD_LINK_NAME, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't get hard link info\n"); + printf(" couldn't get hard link info\n"); PART_ERROR(H5Lget_info_hard); } if (link_info.type != H5L_TYPE_HARD) { H5_FAILED(); - HDprintf(" incorrect link type returned\n"); + printf(" incorrect link type returned\n"); PART_ERROR(H5Lget_info_hard); } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (link_info.corder_valid && (link_info.corder != 0)) { H5_FAILED(); - HDprintf(" link's creation order value '%lld' did not match expected value '%lld'\n", - (long long)link_info.corder, (long long)0); + printf(" link's creation order value '%lld' did not match expected value '%lld'\n", + (long long)link_info.corder, (long long)0); PART_ERROR(H5Lget_info_hard); } } if (H5Gclose(subgroup_id) < 0) { H5_FAILED(); - HDprintf(" failed to close group '%s'\n", GET_LINK_INFO_TEST_SUBGROUP1_NAME); + printf(" failed to close group '%s'\n", GET_LINK_INFO_TEST_SUBGROUP1_NAME); PART_ERROR(H5Lget_info_hard); } @@ -14224,12 +14104,12 @@ test_get_link_info(void) { TESTING_2("H5Lget_info2 on soft link"); - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_INFO_TEST_SUBGROUP2_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create subgroup '%s'\n", GET_LINK_INFO_TEST_SUBGROUP2_NAME); + printf(" couldn't create subgroup '%s'\n", GET_LINK_INFO_TEST_SUBGROUP2_NAME); PART_ERROR(H5Lget_info_soft); } @@ -14238,32 +14118,32 @@ test_get_link_info(void) subgroup_id, GET_LINK_INFO_TEST_SOFT_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create soft link '%s'\n", GET_LINK_INFO_TEST_SOFT_LINK_NAME); + printf(" couldn't create soft link '%s'\n", GET_LINK_INFO_TEST_SOFT_LINK_NAME); PART_ERROR(H5Lget_info_soft); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if soft link '%s' exists\n", - GET_LINK_INFO_TEST_SOFT_LINK_NAME); + printf(" couldn't determine if soft link '%s' exists\n", + GET_LINK_INFO_TEST_SOFT_LINK_NAME); PART_ERROR(H5Lget_info_soft); } if (!link_exists) { H5_FAILED(); - HDprintf(" soft link did not exist\n"); + printf(" soft link did not exist\n"); PART_ERROR(H5Lget_info_soft); } if (H5Lget_info2(subgroup_id, GET_LINK_INFO_TEST_SOFT_LINK_NAME, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't get soft link info\n"); + printf(" couldn't get soft link info\n"); PART_ERROR(H5Lget_info_soft); } if (link_info.type != H5L_TYPE_SOFT) { H5_FAILED(); - HDprintf(" incorrect link type returned\n"); + printf(" incorrect link type returned\n"); PART_ERROR(H5Lget_info_soft); } @@ -14272,23 +14152,23 @@ test_get_link_info(void) 1; if (link_info.u.val_size != link_val_size) { H5_FAILED(); - HDprintf(" link's value size '%zu' did not match expected value '%zu'\n", - link_info.u.val_size, link_val_size); + printf(" link's value size '%zu' did not match expected value '%zu'\n", + link_info.u.val_size, link_val_size); PART_ERROR(H5Lget_info_soft); } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (link_info.corder_valid && (link_info.corder != 0)) { H5_FAILED(); - HDprintf(" link's creation order value '%lld' did not match expected value '%lld'\n", - (long long)link_info.corder, (long long)0); + printf(" link's creation order value '%lld' did not match expected value '%lld'\n", + (long long)link_info.corder, (long long)0); PART_ERROR(H5Lget_info_soft); } } if (H5Gclose(subgroup_id) < 0) { H5_FAILED(); - HDprintf(" failed to close group '%s'\n", GET_LINK_INFO_TEST_SUBGROUP2_NAME); + printf(" failed to close group '%s'\n", GET_LINK_INFO_TEST_SUBGROUP2_NAME); PART_ERROR(H5Lget_info_soft); } @@ -14307,82 +14187,82 @@ test_get_link_info(void) { TESTING_2("H5Lget_info2 on external link"); - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); HDsnprintf(ext_link_filename, H5_API_TEST_FILENAME_MAX_LENGTH, "%s", EXTERNAL_LINK_TEST_FILE_NAME); if ((ext_file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); + printf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); PART_ERROR(H5Lget_info_external); } if (H5Fclose(ext_file_id) < 0) { H5_FAILED(); - HDprintf(" couldn't close file '%s'\n", ext_link_filename); + printf(" couldn't close file '%s'\n", ext_link_filename); PART_ERROR(H5Lget_info_external); } if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_INFO_TEST_SUBGROUP3_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create subgroup '%s'\n", GET_LINK_INFO_TEST_SUBGROUP3_NAME); + printf(" couldn't create subgroup '%s'\n", GET_LINK_INFO_TEST_SUBGROUP3_NAME); PART_ERROR(H5Lget_info_external); } if (H5Lcreate_external(ext_link_filename, ext_objname, subgroup_id, GET_LINK_INFO_TEST_EXT_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create external link '%s'\n", GET_LINK_INFO_TEST_EXT_LINK_NAME); + printf(" couldn't create external link '%s'\n", GET_LINK_INFO_TEST_EXT_LINK_NAME); PART_ERROR(H5Lget_info_external); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_EXT_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if external link '%s' exists\n", - GET_LINK_INFO_TEST_EXT_LINK_NAME); + printf(" couldn't determine if external link '%s' exists\n", + GET_LINK_INFO_TEST_EXT_LINK_NAME); PART_ERROR(H5Lget_info_external); } if (!link_exists) { H5_FAILED(); - HDprintf(" external link did not exist\n"); + printf(" external link did not exist\n"); PART_ERROR(H5Lget_info_external); } if (H5Lget_info2(subgroup_id, GET_LINK_INFO_TEST_EXT_LINK_NAME, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't get external link info\n"); + printf(" couldn't get external link info\n"); PART_ERROR(H5Lget_info_external); } if (link_info.type != H5L_TYPE_EXTERNAL) { H5_FAILED(); - HDprintf(" incorrect link type returned\n"); + printf(" incorrect link type returned\n"); PART_ERROR(H5Lget_info_external); } link_val_size = 1 + strlen(ext_link_filename) + 1 + strlen(ext_objname) + 1; if (link_info.u.val_size != link_val_size) { H5_FAILED(); - HDprintf(" link's value size '%lld' did not match expected value '%zu'\n", - (long long)link_info.u.val_size, link_val_size); + printf(" link's value size '%lld' did not match expected value '%zu'\n", + (long long)link_info.u.val_size, link_val_size); PART_ERROR(H5Lget_info_external); } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (link_info.corder_valid && (link_info.corder != 0)) { H5_FAILED(); - HDprintf(" link's creation order value '%lld' did not match expected value '%lld'\n", - (long long)link_info.corder, (long long)0); + printf(" link's creation order value '%lld' did not match expected value '%lld'\n", + (long long)link_info.corder, (long long)0); PART_ERROR(H5Lget_info_external); } } if (H5Gclose(subgroup_id) < 0) { H5_FAILED(); - HDprintf(" failed to close group '%s'\n", GET_LINK_INFO_TEST_SUBGROUP3_NAME); + printf(" failed to close group '%s'\n", GET_LINK_INFO_TEST_SUBGROUP3_NAME); PART_ERROR(H5Lget_info_external); } @@ -14423,14 +14303,14 @@ test_get_link_info(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" creation order tracking isn't supported with this VOL connector\n"); + printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Lget_info_by_idx_hard_crt_order_increasing); } if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_INFO_TEST_SUBGROUP5_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create subgroup '%s'\n", GET_LINK_INFO_TEST_SUBGROUP5_NAME); + printf(" couldn't create subgroup '%s'\n", GET_LINK_INFO_TEST_SUBGROUP5_NAME); PART_ERROR(H5Lget_info_by_idx_hard_crt_order_increasing); } @@ -14438,134 +14318,134 @@ test_get_link_info(void) if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, GET_LINK_INFO_TEST_HARD_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create hard link '%s'\n", GET_LINK_INFO_TEST_HARD_LINK_NAME); + printf(" couldn't create hard link '%s'\n", GET_LINK_INFO_TEST_HARD_LINK_NAME); PART_ERROR(H5Lget_info_by_idx_hard_crt_order_increasing); } if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, GET_LINK_INFO_TEST_HARD_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create hard link '%s'\n", GET_LINK_INFO_TEST_HARD_LINK_NAME2); + printf(" couldn't create hard link '%s'\n", GET_LINK_INFO_TEST_HARD_LINK_NAME2); PART_ERROR(H5Lget_info_by_idx_hard_crt_order_increasing); } if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, GET_LINK_INFO_TEST_HARD_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create hard link '%s'\n", GET_LINK_INFO_TEST_HARD_LINK_NAME3); + printf(" couldn't create hard link '%s'\n", GET_LINK_INFO_TEST_HARD_LINK_NAME3); PART_ERROR(H5Lget_info_by_idx_hard_crt_order_increasing); } /* Verify the links have been created */ if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if hard link '%s' exists\n", - GET_LINK_INFO_TEST_HARD_LINK_NAME); + printf(" couldn't determine if hard link '%s' exists\n", + GET_LINK_INFO_TEST_HARD_LINK_NAME); PART_ERROR(H5Lget_info_by_idx_hard_crt_order_increasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" hard link '%s' did not exist before deletion\n", - GET_LINK_INFO_TEST_HARD_LINK_NAME); + printf(" hard link '%s' did not exist before deletion\n", + GET_LINK_INFO_TEST_HARD_LINK_NAME); PART_ERROR(H5Lget_info_by_idx_hard_crt_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_HARD_LINK_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if hard link '%s' exists\n", - GET_LINK_INFO_TEST_HARD_LINK_NAME2); + printf(" couldn't determine if hard link '%s' exists\n", + GET_LINK_INFO_TEST_HARD_LINK_NAME2); PART_ERROR(H5Lget_info_by_idx_hard_crt_order_increasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" hard link '%s' did not exist before deletion\n", - GET_LINK_INFO_TEST_HARD_LINK_NAME2); + printf(" hard link '%s' did not exist before deletion\n", + GET_LINK_INFO_TEST_HARD_LINK_NAME2); PART_ERROR(H5Lget_info_by_idx_hard_crt_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_HARD_LINK_NAME3, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if hard link '%s' exists\n", - GET_LINK_INFO_TEST_HARD_LINK_NAME3); + printf(" couldn't determine if hard link '%s' exists\n", + GET_LINK_INFO_TEST_HARD_LINK_NAME3); PART_ERROR(H5Lget_info_by_idx_hard_crt_order_increasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" hard link '%s' did not exist before deletion\n", - GET_LINK_INFO_TEST_HARD_LINK_NAME3); + printf(" hard link '%s' did not exist before deletion\n", + GET_LINK_INFO_TEST_HARD_LINK_NAME3); PART_ERROR(H5Lget_info_by_idx_hard_crt_order_increasing); } /* Retrieve info of links in turn */ - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 0, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't get hard link info for index %d\n", 0); + printf(" couldn't get hard link info for index %d\n", 0); PART_ERROR(H5Lget_info_by_idx_hard_crt_order_increasing); } if (link_info.type != H5L_TYPE_HARD) { H5_FAILED(); - HDprintf(" incorrect link type returned\n"); + printf(" incorrect link type returned\n"); PART_ERROR(H5Lget_info_by_idx_hard_crt_order_increasing); } if (link_info.corder_valid && (link_info.corder != 0)) { H5_FAILED(); - HDprintf(" link's creation order value '%lld' did not match expected value '%lld'\n", - (long long)link_info.corder, (long long)0); + printf(" link's creation order value '%lld' did not match expected value '%lld'\n", + (long long)link_info.corder, (long long)0); PART_ERROR(H5Lget_info_by_idx_hard_crt_order_increasing); } - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 1, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't get hard link info for index %d\n", 1); + printf(" couldn't get hard link info for index %d\n", 1); PART_ERROR(H5Lget_info_by_idx_hard_crt_order_increasing); } if (link_info.type != H5L_TYPE_HARD) { H5_FAILED(); - HDprintf(" incorrect link type returned\n"); + printf(" incorrect link type returned\n"); PART_ERROR(H5Lget_info_by_idx_hard_crt_order_increasing); } if (link_info.corder_valid && (link_info.corder != 1)) { H5_FAILED(); - HDprintf(" link's creation order value '%lld' did not match expected value '%lld'\n", - (long long)link_info.corder, (long long)1); + printf(" link's creation order value '%lld' did not match expected value '%lld'\n", + (long long)link_info.corder, (long long)1); PART_ERROR(H5Lget_info_by_idx_hard_crt_order_increasing); } - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 2, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't get hard link info for index %d\n", 2); + printf(" couldn't get hard link info for index %d\n", 2); PART_ERROR(H5Lget_info_by_idx_hard_crt_order_increasing); } if (link_info.type != H5L_TYPE_HARD) { H5_FAILED(); - HDprintf(" incorrect link type returned\n"); + printf(" incorrect link type returned\n"); PART_ERROR(H5Lget_info_by_idx_hard_crt_order_increasing); } if (link_info.corder_valid && (link_info.corder != 2)) { H5_FAILED(); - HDprintf(" link's creation order value '%lld' did not match expected value '%lld'\n", - (long long)link_info.corder, (long long)2); + printf(" link's creation order value '%lld' did not match expected value '%lld'\n", + (long long)link_info.corder, (long long)2); PART_ERROR(H5Lget_info_by_idx_hard_crt_order_increasing); } if (H5Gclose(subgroup_id) < 0) { H5_FAILED(); - HDprintf(" failed to close group '%s'\n", GET_LINK_INFO_TEST_SUBGROUP5_NAME); + printf(" failed to close group '%s'\n", GET_LINK_INFO_TEST_SUBGROUP5_NAME); PART_ERROR(H5Lget_info_by_idx_hard_crt_order_increasing); } @@ -14586,14 +14466,14 @@ test_get_link_info(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" creation order tracking isn't supported with this VOL connector\n"); + printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Lget_info_by_idx_hard_crt_order_decreasing); } if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_INFO_TEST_SUBGROUP6_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create subgroup '%s'\n", GET_LINK_INFO_TEST_SUBGROUP6_NAME); + printf(" couldn't create subgroup '%s'\n", GET_LINK_INFO_TEST_SUBGROUP6_NAME); PART_ERROR(H5Lget_info_by_idx_hard_crt_order_decreasing); } @@ -14601,134 +14481,134 @@ test_get_link_info(void) if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, GET_LINK_INFO_TEST_HARD_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create hard link '%s'\n", GET_LINK_INFO_TEST_HARD_LINK_NAME); + printf(" couldn't create hard link '%s'\n", GET_LINK_INFO_TEST_HARD_LINK_NAME); PART_ERROR(H5Lget_info_by_idx_hard_crt_order_decreasing); } if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, GET_LINK_INFO_TEST_HARD_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create hard link '%s'\n", GET_LINK_INFO_TEST_HARD_LINK_NAME2); + printf(" couldn't create hard link '%s'\n", GET_LINK_INFO_TEST_HARD_LINK_NAME2); PART_ERROR(H5Lget_info_by_idx_hard_crt_order_decreasing); } if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, GET_LINK_INFO_TEST_HARD_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create hard link '%s'\n", GET_LINK_INFO_TEST_HARD_LINK_NAME3); + printf(" couldn't create hard link '%s'\n", GET_LINK_INFO_TEST_HARD_LINK_NAME3); PART_ERROR(H5Lget_info_by_idx_hard_crt_order_decreasing); } /* Verify the links have been created */ if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if hard link '%s' exists\n", - GET_LINK_INFO_TEST_HARD_LINK_NAME); + printf(" couldn't determine if hard link '%s' exists\n", + GET_LINK_INFO_TEST_HARD_LINK_NAME); PART_ERROR(H5Lget_info_by_idx_hard_crt_order_decreasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" hard link '%s' did not exist before deletion\n", - GET_LINK_INFO_TEST_HARD_LINK_NAME); + printf(" hard link '%s' did not exist before deletion\n", + GET_LINK_INFO_TEST_HARD_LINK_NAME); PART_ERROR(H5Lget_info_by_idx_hard_crt_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_HARD_LINK_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if hard link '%s' exists\n", - GET_LINK_INFO_TEST_HARD_LINK_NAME2); + printf(" couldn't determine if hard link '%s' exists\n", + GET_LINK_INFO_TEST_HARD_LINK_NAME2); PART_ERROR(H5Lget_info_by_idx_hard_crt_order_decreasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" hard link '%s' did not exist before deletion\n", - GET_LINK_INFO_TEST_HARD_LINK_NAME2); + printf(" hard link '%s' did not exist before deletion\n", + GET_LINK_INFO_TEST_HARD_LINK_NAME2); PART_ERROR(H5Lget_info_by_idx_hard_crt_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_HARD_LINK_NAME3, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if hard link '%s' exists\n", - GET_LINK_INFO_TEST_HARD_LINK_NAME3); + printf(" couldn't determine if hard link '%s' exists\n", + GET_LINK_INFO_TEST_HARD_LINK_NAME3); PART_ERROR(H5Lget_info_by_idx_hard_crt_order_decreasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" hard link '%s' did not exist before deletion\n", - GET_LINK_INFO_TEST_HARD_LINK_NAME3); + printf(" hard link '%s' did not exist before deletion\n", + GET_LINK_INFO_TEST_HARD_LINK_NAME3); PART_ERROR(H5Lget_info_by_idx_hard_crt_order_decreasing); } /* Retrieve info of links in turn */ - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 2, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't get hard link info for index %d\n", 2); + printf(" couldn't get hard link info for index %d\n", 2); PART_ERROR(H5Lget_info_by_idx_hard_crt_order_decreasing); } if (link_info.type != H5L_TYPE_HARD) { H5_FAILED(); - HDprintf(" incorrect link type returned\n"); + printf(" incorrect link type returned\n"); PART_ERROR(H5Lget_info_by_idx_hard_crt_order_decreasing); } if (link_info.corder_valid && (link_info.corder != 0)) { H5_FAILED(); - HDprintf(" link's creation order value '%lld' did not match expected value '%lld'\n", - (long long)link_info.corder, (long long)0); + printf(" link's creation order value '%lld' did not match expected value '%lld'\n", + (long long)link_info.corder, (long long)0); PART_ERROR(H5Lget_info_by_idx_hard_crt_order_decreasing); } - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 1, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't get hard link info for index %d\n", 1); + printf(" couldn't get hard link info for index %d\n", 1); PART_ERROR(H5Lget_info_by_idx_hard_crt_order_decreasing); } if (link_info.type != H5L_TYPE_HARD) { H5_FAILED(); - HDprintf(" incorrect link type returned\n"); + printf(" incorrect link type returned\n"); PART_ERROR(H5Lget_info_by_idx_hard_crt_order_decreasing); } if (link_info.corder_valid && (link_info.corder != 1)) { H5_FAILED(); - HDprintf(" link's creation order value '%lld' did not match expected value '%lld'\n", - (long long)link_info.corder, (long long)1); + printf(" link's creation order value '%lld' did not match expected value '%lld'\n", + (long long)link_info.corder, (long long)1); PART_ERROR(H5Lget_info_by_idx_hard_crt_order_decreasing); } - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 0, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't get hard link info for index %d\n", 0); + printf(" couldn't get hard link info for index %d\n", 0); PART_ERROR(H5Lget_info_by_idx_hard_crt_order_decreasing); } if (link_info.type != H5L_TYPE_HARD) { H5_FAILED(); - HDprintf(" incorrect link type returned\n"); + printf(" incorrect link type returned\n"); PART_ERROR(H5Lget_info_by_idx_hard_crt_order_decreasing); } if (link_info.corder_valid && (link_info.corder != 2)) { H5_FAILED(); - HDprintf(" link's creation order value '%lld' did not match expected value '%lld'\n", - (long long)link_info.corder, (long long)2); + printf(" link's creation order value '%lld' did not match expected value '%lld'\n", + (long long)link_info.corder, (long long)2); PART_ERROR(H5Lget_info_by_idx_hard_crt_order_decreasing); } if (H5Gclose(subgroup_id) < 0) { H5_FAILED(); - HDprintf(" failed to close group '%s'\n", GET_LINK_INFO_TEST_SUBGROUP6_NAME); + printf(" failed to close group '%s'\n", GET_LINK_INFO_TEST_SUBGROUP6_NAME); PART_ERROR(H5Lget_info_by_idx_hard_crt_order_decreasing); } @@ -14750,7 +14630,7 @@ test_get_link_info(void) if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_INFO_TEST_SUBGROUP7_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create subgroup '%s'\n", GET_LINK_INFO_TEST_SUBGROUP7_NAME); + printf(" couldn't create subgroup '%s'\n", GET_LINK_INFO_TEST_SUBGROUP7_NAME); PART_ERROR(H5Lget_info_by_idx_hard_name_order_increasing); } @@ -14758,140 +14638,140 @@ test_get_link_info(void) if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, GET_LINK_INFO_TEST_HARD_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create hard link '%s'\n", GET_LINK_INFO_TEST_HARD_LINK_NAME); + printf(" couldn't create hard link '%s'\n", GET_LINK_INFO_TEST_HARD_LINK_NAME); PART_ERROR(H5Lget_info_by_idx_hard_name_order_increasing); } if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, GET_LINK_INFO_TEST_HARD_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create hard link '%s'\n", GET_LINK_INFO_TEST_HARD_LINK_NAME2); + printf(" couldn't create hard link '%s'\n", GET_LINK_INFO_TEST_HARD_LINK_NAME2); PART_ERROR(H5Lget_info_by_idx_hard_name_order_increasing); } if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, GET_LINK_INFO_TEST_HARD_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create hard link '%s'\n", GET_LINK_INFO_TEST_HARD_LINK_NAME3); + printf(" couldn't create hard link '%s'\n", GET_LINK_INFO_TEST_HARD_LINK_NAME3); PART_ERROR(H5Lget_info_by_idx_hard_name_order_increasing); } /* Verify the links have been created */ if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if hard link '%s' exists\n", - GET_LINK_INFO_TEST_HARD_LINK_NAME); + printf(" couldn't determine if hard link '%s' exists\n", + GET_LINK_INFO_TEST_HARD_LINK_NAME); PART_ERROR(H5Lget_info_by_idx_hard_name_order_increasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" hard link '%s' did not exist before deletion\n", - GET_LINK_INFO_TEST_HARD_LINK_NAME); + printf(" hard link '%s' did not exist before deletion\n", + GET_LINK_INFO_TEST_HARD_LINK_NAME); PART_ERROR(H5Lget_info_by_idx_hard_name_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_HARD_LINK_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if hard link '%s' exists\n", - GET_LINK_INFO_TEST_HARD_LINK_NAME2); + printf(" couldn't determine if hard link '%s' exists\n", + GET_LINK_INFO_TEST_HARD_LINK_NAME2); PART_ERROR(H5Lget_info_by_idx_hard_name_order_increasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" hard link '%s' did not exist before deletion\n", - GET_LINK_INFO_TEST_HARD_LINK_NAME2); + printf(" hard link '%s' did not exist before deletion\n", + GET_LINK_INFO_TEST_HARD_LINK_NAME2); PART_ERROR(H5Lget_info_by_idx_hard_name_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_HARD_LINK_NAME3, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if hard link '%s' exists\n", - GET_LINK_INFO_TEST_HARD_LINK_NAME3); + printf(" couldn't determine if hard link '%s' exists\n", + GET_LINK_INFO_TEST_HARD_LINK_NAME3); PART_ERROR(H5Lget_info_by_idx_hard_name_order_increasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" hard link '%s' did not exist before deletion\n", - GET_LINK_INFO_TEST_HARD_LINK_NAME3); + printf(" hard link '%s' did not exist before deletion\n", + GET_LINK_INFO_TEST_HARD_LINK_NAME3); PART_ERROR(H5Lget_info_by_idx_hard_name_order_increasing); } /* Retrieve info of links in turn */ - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 0, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't get hard link info for index %d\n", 0); + printf(" couldn't get hard link info for index %d\n", 0); PART_ERROR(H5Lget_info_by_idx_hard_name_order_increasing); } if (link_info.type != H5L_TYPE_HARD) { H5_FAILED(); - HDprintf(" incorrect link type returned\n"); + printf(" incorrect link type returned\n"); PART_ERROR(H5Lget_info_by_idx_hard_name_order_increasing); } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (link_info.corder_valid && (link_info.corder != 0)) { H5_FAILED(); - HDprintf(" link's creation order value '%lld' did not match expected value '%lld'\n", - (long long)link_info.corder, (long long)0); + printf(" link's creation order value '%lld' did not match expected value '%lld'\n", + (long long)link_info.corder, (long long)0); PART_ERROR(H5Lget_info_by_idx_hard_name_order_increasing); } } - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 1, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't get hard link info for index %d\n", 1); + printf(" couldn't get hard link info for index %d\n", 1); PART_ERROR(H5Lget_info_by_idx_hard_name_order_increasing); } if (link_info.type != H5L_TYPE_HARD) { H5_FAILED(); - HDprintf(" incorrect link type returned\n"); + printf(" incorrect link type returned\n"); PART_ERROR(H5Lget_info_by_idx_hard_name_order_increasing); } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (link_info.corder_valid && (link_info.corder != 1)) { H5_FAILED(); - HDprintf(" link's creation order value '%lld' did not match expected value '%lld'\n", - (long long)link_info.corder, (long long)1); + printf(" link's creation order value '%lld' did not match expected value '%lld'\n", + (long long)link_info.corder, (long long)1); PART_ERROR(H5Lget_info_by_idx_hard_name_order_increasing); } } - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 2, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't get hard link info for index %d\n", 2); + printf(" couldn't get hard link info for index %d\n", 2); PART_ERROR(H5Lget_info_by_idx_hard_name_order_increasing); } if (link_info.type != H5L_TYPE_HARD) { H5_FAILED(); - HDprintf(" incorrect link type returned\n"); + printf(" incorrect link type returned\n"); PART_ERROR(H5Lget_info_by_idx_hard_name_order_increasing); } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (link_info.corder_valid && (link_info.corder != 2)) { H5_FAILED(); - HDprintf(" link's creation order value '%lld' did not match expected value '%lld'\n", - (long long)link_info.corder, (long long)2); + printf(" link's creation order value '%lld' did not match expected value '%lld'\n", + (long long)link_info.corder, (long long)2); PART_ERROR(H5Lget_info_by_idx_hard_name_order_increasing); } } if (H5Gclose(subgroup_id) < 0) { H5_FAILED(); - HDprintf(" failed to close group '%s'\n", GET_LINK_INFO_TEST_SUBGROUP7_NAME); + printf(" failed to close group '%s'\n", GET_LINK_INFO_TEST_SUBGROUP7_NAME); PART_ERROR(H5Lget_info_by_idx_hard_name_order_increasing); } @@ -14913,7 +14793,7 @@ test_get_link_info(void) if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_INFO_TEST_SUBGROUP8_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create subgroup '%s'\n", GET_LINK_INFO_TEST_SUBGROUP8_NAME); + printf(" couldn't create subgroup '%s'\n", GET_LINK_INFO_TEST_SUBGROUP8_NAME); PART_ERROR(H5Lget_info_by_idx_hard_name_order_decreasing); } @@ -14921,140 +14801,140 @@ test_get_link_info(void) if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, GET_LINK_INFO_TEST_HARD_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create hard link '%s'\n", GET_LINK_INFO_TEST_HARD_LINK_NAME); + printf(" couldn't create hard link '%s'\n", GET_LINK_INFO_TEST_HARD_LINK_NAME); PART_ERROR(H5Lget_info_by_idx_hard_name_order_decreasing); } if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, GET_LINK_INFO_TEST_HARD_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create hard link '%s'\n", GET_LINK_INFO_TEST_HARD_LINK_NAME2); + printf(" couldn't create hard link '%s'\n", GET_LINK_INFO_TEST_HARD_LINK_NAME2); PART_ERROR(H5Lget_info_by_idx_hard_name_order_decreasing); } if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, GET_LINK_INFO_TEST_HARD_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create hard link '%s'\n", GET_LINK_INFO_TEST_HARD_LINK_NAME3); + printf(" couldn't create hard link '%s'\n", GET_LINK_INFO_TEST_HARD_LINK_NAME3); PART_ERROR(H5Lget_info_by_idx_hard_name_order_decreasing); } /* Verify the links have been created */ if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if hard link '%s' exists\n", - GET_LINK_INFO_TEST_HARD_LINK_NAME); + printf(" couldn't determine if hard link '%s' exists\n", + GET_LINK_INFO_TEST_HARD_LINK_NAME); PART_ERROR(H5Lget_info_by_idx_hard_name_order_decreasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" hard link '%s' did not exist before deletion\n", - GET_LINK_INFO_TEST_HARD_LINK_NAME); + printf(" hard link '%s' did not exist before deletion\n", + GET_LINK_INFO_TEST_HARD_LINK_NAME); PART_ERROR(H5Lget_info_by_idx_hard_name_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_HARD_LINK_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if hard link '%s' exists\n", - GET_LINK_INFO_TEST_HARD_LINK_NAME2); + printf(" couldn't determine if hard link '%s' exists\n", + GET_LINK_INFO_TEST_HARD_LINK_NAME2); PART_ERROR(H5Lget_info_by_idx_hard_name_order_decreasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" hard link '%s' did not exist before deletion\n", - GET_LINK_INFO_TEST_HARD_LINK_NAME2); + printf(" hard link '%s' did not exist before deletion\n", + GET_LINK_INFO_TEST_HARD_LINK_NAME2); PART_ERROR(H5Lget_info_by_idx_hard_name_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_HARD_LINK_NAME3, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if hard link '%s' exists\n", - GET_LINK_INFO_TEST_HARD_LINK_NAME3); + printf(" couldn't determine if hard link '%s' exists\n", + GET_LINK_INFO_TEST_HARD_LINK_NAME3); PART_ERROR(H5Lget_info_by_idx_hard_name_order_decreasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" hard link '%s' did not exist before deletion\n", - GET_LINK_INFO_TEST_HARD_LINK_NAME3); + printf(" hard link '%s' did not exist before deletion\n", + GET_LINK_INFO_TEST_HARD_LINK_NAME3); PART_ERROR(H5Lget_info_by_idx_hard_name_order_decreasing); } /* Retrieve info of links in turn */ - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 2, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't get hard link info for index %d\n", 2); + printf(" couldn't get hard link info for index %d\n", 2); PART_ERROR(H5Lget_info_by_idx_hard_name_order_decreasing); } if (link_info.type != H5L_TYPE_HARD) { H5_FAILED(); - HDprintf(" incorrect link type returned\n"); + printf(" incorrect link type returned\n"); PART_ERROR(H5Lget_info_by_idx_hard_name_order_decreasing); } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (link_info.corder_valid && (link_info.corder != 0)) { H5_FAILED(); - HDprintf(" link's creation order value '%lld' did not match expected value '%lld'\n", - (long long)link_info.corder, (long long)0); + printf(" link's creation order value '%lld' did not match expected value '%lld'\n", + (long long)link_info.corder, (long long)0); PART_ERROR(H5Lget_info_by_idx_hard_name_order_decreasing); } } - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 1, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't get hard link info for index %d\n", 1); + printf(" couldn't get hard link info for index %d\n", 1); PART_ERROR(H5Lget_info_by_idx_hard_name_order_decreasing); } if (link_info.type != H5L_TYPE_HARD) { H5_FAILED(); - HDprintf(" incorrect link type returned\n"); + printf(" incorrect link type returned\n"); PART_ERROR(H5Lget_info_by_idx_hard_name_order_decreasing); } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (link_info.corder_valid && (link_info.corder != 1)) { H5_FAILED(); - HDprintf(" link's creation order value '%lld' did not match expected value '%lld'\n", - (long long)link_info.corder, (long long)1); + printf(" link's creation order value '%lld' did not match expected value '%lld'\n", + (long long)link_info.corder, (long long)1); PART_ERROR(H5Lget_info_by_idx_hard_name_order_decreasing); } } - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 0, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't get hard link info for index %d\n", 0); + printf(" couldn't get hard link info for index %d\n", 0); PART_ERROR(H5Lget_info_by_idx_hard_name_order_decreasing); } if (link_info.type != H5L_TYPE_HARD) { H5_FAILED(); - HDprintf(" incorrect link type returned\n"); + printf(" incorrect link type returned\n"); PART_ERROR(H5Lget_info_by_idx_hard_name_order_decreasing); } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (link_info.corder_valid && (link_info.corder != 2)) { H5_FAILED(); - HDprintf(" link's creation order value '%lld' did not match expected value '%lld'\n", - (long long)link_info.corder, (long long)2); + printf(" link's creation order value '%lld' did not match expected value '%lld'\n", + (long long)link_info.corder, (long long)2); PART_ERROR(H5Lget_info_by_idx_hard_name_order_decreasing); } } if (H5Gclose(subgroup_id) < 0) { H5_FAILED(); - HDprintf(" failed to close group '%s'\n", GET_LINK_INFO_TEST_SUBGROUP8_NAME); + printf(" failed to close group '%s'\n", GET_LINK_INFO_TEST_SUBGROUP8_NAME); PART_ERROR(H5Lget_info_by_idx_hard_name_order_decreasing); } @@ -15075,14 +14955,14 @@ test_get_link_info(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" creation order tracking isn't supported with this VOL connector\n"); + printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Lget_info_by_idx_soft_crt_order_increasing); } if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_INFO_TEST_SUBGROUP9_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create subgroup '%s'\n", GET_LINK_INFO_TEST_SUBGROUP9_NAME); + printf(" couldn't create subgroup '%s'\n", GET_LINK_INFO_TEST_SUBGROUP9_NAME); PART_ERROR(H5Lget_info_by_idx_soft_crt_order_increasing); } @@ -15092,7 +14972,7 @@ test_get_link_info(void) subgroup_id, GET_LINK_INFO_TEST_SOFT_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create soft link '%s'\n", GET_LINK_INFO_TEST_SOFT_LINK_NAME); + printf(" couldn't create soft link '%s'\n", GET_LINK_INFO_TEST_SOFT_LINK_NAME); PART_ERROR(H5Lget_info_by_idx_soft_crt_order_increasing); } @@ -15101,7 +14981,7 @@ test_get_link_info(void) subgroup_id, GET_LINK_INFO_TEST_SOFT_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create soft link '%s'\n", GET_LINK_INFO_TEST_SOFT_LINK_NAME2); + printf(" couldn't create soft link '%s'\n", GET_LINK_INFO_TEST_SOFT_LINK_NAME2); PART_ERROR(H5Lget_info_by_idx_soft_crt_order_increasing); } @@ -15110,65 +14990,65 @@ test_get_link_info(void) subgroup_id, GET_LINK_INFO_TEST_SOFT_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create soft link '%s'\n", GET_LINK_INFO_TEST_SOFT_LINK_NAME3); + printf(" couldn't create soft link '%s'\n", GET_LINK_INFO_TEST_SOFT_LINK_NAME3); PART_ERROR(H5Lget_info_by_idx_soft_crt_order_increasing); } /* Verify the links have been created */ if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if soft link '%s' exists\n", - GET_LINK_INFO_TEST_SOFT_LINK_NAME); + printf(" couldn't determine if soft link '%s' exists\n", + GET_LINK_INFO_TEST_SOFT_LINK_NAME); PART_ERROR(H5Lget_info_by_idx_soft_crt_order_increasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" soft link '%s' did not exist before deletion\n", - GET_LINK_INFO_TEST_SOFT_LINK_NAME); + printf(" soft link '%s' did not exist before deletion\n", + GET_LINK_INFO_TEST_SOFT_LINK_NAME); PART_ERROR(H5Lget_info_by_idx_soft_crt_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_SOFT_LINK_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if soft link '%s' exists\n", - GET_LINK_INFO_TEST_SOFT_LINK_NAME2); + printf(" couldn't determine if soft link '%s' exists\n", + GET_LINK_INFO_TEST_SOFT_LINK_NAME2); PART_ERROR(H5Lget_info_by_idx_soft_crt_order_increasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" soft link '%s' did not exist before deletion\n", - GET_LINK_INFO_TEST_SOFT_LINK_NAME2); + printf(" soft link '%s' did not exist before deletion\n", + GET_LINK_INFO_TEST_SOFT_LINK_NAME2); PART_ERROR(H5Lget_info_by_idx_soft_crt_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_SOFT_LINK_NAME3, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if soft link '%s' exists\n", - GET_LINK_INFO_TEST_SOFT_LINK_NAME3); + printf(" couldn't determine if soft link '%s' exists\n", + GET_LINK_INFO_TEST_SOFT_LINK_NAME3); PART_ERROR(H5Lget_info_by_idx_soft_crt_order_increasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" soft link '%s' did not exist before deletion\n", - GET_LINK_INFO_TEST_SOFT_LINK_NAME3); + printf(" soft link '%s' did not exist before deletion\n", + GET_LINK_INFO_TEST_SOFT_LINK_NAME3); PART_ERROR(H5Lget_info_by_idx_soft_crt_order_increasing); } /* Retrieve info of links in turn */ - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 0, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't get soft link info for index %d\n", 0); + printf(" couldn't get soft link info for index %d\n", 0); PART_ERROR(H5Lget_info_by_idx_soft_crt_order_increasing); } if (link_info.type != H5L_TYPE_SOFT) { H5_FAILED(); - HDprintf(" incorrect link type returned\n"); + printf(" incorrect link type returned\n"); PART_ERROR(H5Lget_info_by_idx_soft_crt_order_increasing); } @@ -15177,29 +15057,29 @@ test_get_link_info(void) 1; if (link_info.u.val_size != link_val_size) { H5_FAILED(); - HDprintf(" link's value size '%zu' did not match expected value '%zu'\n", - link_info.u.val_size, link_val_size); + printf(" link's value size '%zu' did not match expected value '%zu'\n", + link_info.u.val_size, link_val_size); PART_ERROR(H5Lget_info_by_idx_soft_crt_order_increasing); } if (link_info.corder_valid && (link_info.corder != 0)) { H5_FAILED(); - HDprintf(" link's creation order value '%lld' did not match expected value '%lld'\n", - (long long)link_info.corder, (long long)0); + printf(" link's creation order value '%lld' did not match expected value '%lld'\n", + (long long)link_info.corder, (long long)0); PART_ERROR(H5Lget_info_by_idx_soft_crt_order_increasing); } - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 1, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't get soft link info for index %d\n", 1); + printf(" couldn't get soft link info for index %d\n", 1); PART_ERROR(H5Lget_info_by_idx_soft_crt_order_increasing); } if (link_info.type != H5L_TYPE_SOFT) { H5_FAILED(); - HDprintf(" incorrect link type returned\n"); + printf(" incorrect link type returned\n"); PART_ERROR(H5Lget_info_by_idx_soft_crt_order_increasing); } @@ -15208,29 +15088,29 @@ test_get_link_info(void) 1; if (link_info.u.val_size != link_val_size) { H5_FAILED(); - HDprintf(" link's value size '%zu' did not match expected value '%zu'\n", - link_info.u.val_size, link_val_size); + printf(" link's value size '%zu' did not match expected value '%zu'\n", + link_info.u.val_size, link_val_size); PART_ERROR(H5Lget_info_by_idx_soft_crt_order_increasing); } if (link_info.corder_valid && (link_info.corder != 1)) { H5_FAILED(); - HDprintf(" link's creation order value '%lld' did not match expected value '%lld'\n", - (long long)link_info.corder, (long long)1); + printf(" link's creation order value '%lld' did not match expected value '%lld'\n", + (long long)link_info.corder, (long long)1); PART_ERROR(H5Lget_info_by_idx_soft_crt_order_increasing); } - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 2, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't get soft link info for index %d\n", 2); + printf(" couldn't get soft link info for index %d\n", 2); PART_ERROR(H5Lget_info_by_idx_soft_crt_order_increasing); } if (link_info.type != H5L_TYPE_SOFT) { H5_FAILED(); - HDprintf(" incorrect link type returned\n"); + printf(" incorrect link type returned\n"); PART_ERROR(H5Lget_info_by_idx_soft_crt_order_increasing); } @@ -15239,21 +15119,21 @@ test_get_link_info(void) 1; if (link_info.u.val_size != link_val_size) { H5_FAILED(); - HDprintf(" link's value size '%zu' did not match expected value '%zu'\n", - link_info.u.val_size, link_val_size); + printf(" link's value size '%zu' did not match expected value '%zu'\n", + link_info.u.val_size, link_val_size); PART_ERROR(H5Lget_info_by_idx_soft_crt_order_increasing); } if (link_info.corder_valid && (link_info.corder != 2)) { H5_FAILED(); - HDprintf(" link's creation order value '%lld' did not match expected value '%lld'\n", - (long long)link_info.corder, (long long)2); + printf(" link's creation order value '%lld' did not match expected value '%lld'\n", + (long long)link_info.corder, (long long)2); PART_ERROR(H5Lget_info_by_idx_soft_crt_order_increasing); } if (H5Gclose(subgroup_id) < 0) { H5_FAILED(); - HDprintf(" failed to close group '%s'\n", GET_LINK_INFO_TEST_SUBGROUP9_NAME); + printf(" failed to close group '%s'\n", GET_LINK_INFO_TEST_SUBGROUP9_NAME); PART_ERROR(H5Lget_info_by_idx_soft_crt_order_increasing); } @@ -15274,14 +15154,14 @@ test_get_link_info(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" creation order tracking isn't supported with this VOL connector\n"); + printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Lget_info_by_idx_soft_crt_order_decreasing); } if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_INFO_TEST_SUBGROUP10_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create subgroup '%s'\n", GET_LINK_INFO_TEST_SUBGROUP10_NAME); + printf(" couldn't create subgroup '%s'\n", GET_LINK_INFO_TEST_SUBGROUP10_NAME); PART_ERROR(H5Lget_info_by_idx_soft_crt_order_decreasing); } @@ -15291,7 +15171,7 @@ test_get_link_info(void) subgroup_id, GET_LINK_INFO_TEST_SOFT_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create soft link '%s'\n", GET_LINK_INFO_TEST_SOFT_LINK_NAME); + printf(" couldn't create soft link '%s'\n", GET_LINK_INFO_TEST_SOFT_LINK_NAME); PART_ERROR(H5Lget_info_by_idx_soft_crt_order_decreasing); } @@ -15300,7 +15180,7 @@ test_get_link_info(void) subgroup_id, GET_LINK_INFO_TEST_SOFT_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create soft link '%s'\n", GET_LINK_INFO_TEST_SOFT_LINK_NAME2); + printf(" couldn't create soft link '%s'\n", GET_LINK_INFO_TEST_SOFT_LINK_NAME2); PART_ERROR(H5Lget_info_by_idx_soft_crt_order_decreasing); } @@ -15309,65 +15189,65 @@ test_get_link_info(void) subgroup_id, GET_LINK_INFO_TEST_SOFT_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create soft link '%s'\n", GET_LINK_INFO_TEST_SOFT_LINK_NAME3); + printf(" couldn't create soft link '%s'\n", GET_LINK_INFO_TEST_SOFT_LINK_NAME3); PART_ERROR(H5Lget_info_by_idx_soft_crt_order_decreasing); } /* Verify the links have been created */ if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if soft link '%s' exists\n", - GET_LINK_INFO_TEST_SOFT_LINK_NAME); + printf(" couldn't determine if soft link '%s' exists\n", + GET_LINK_INFO_TEST_SOFT_LINK_NAME); PART_ERROR(H5Lget_info_by_idx_soft_crt_order_decreasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" soft link '%s' did not exist before deletion\n", - GET_LINK_INFO_TEST_SOFT_LINK_NAME); + printf(" soft link '%s' did not exist before deletion\n", + GET_LINK_INFO_TEST_SOFT_LINK_NAME); PART_ERROR(H5Lget_info_by_idx_soft_crt_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_SOFT_LINK_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if soft link '%s' exists\n", - GET_LINK_INFO_TEST_SOFT_LINK_NAME2); + printf(" couldn't determine if soft link '%s' exists\n", + GET_LINK_INFO_TEST_SOFT_LINK_NAME2); PART_ERROR(H5Lget_info_by_idx_soft_crt_order_decreasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" soft link '%s' did not exist before deletion\n", - GET_LINK_INFO_TEST_SOFT_LINK_NAME2); + printf(" soft link '%s' did not exist before deletion\n", + GET_LINK_INFO_TEST_SOFT_LINK_NAME2); PART_ERROR(H5Lget_info_by_idx_soft_crt_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_SOFT_LINK_NAME3, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if soft link '%s' exists\n", - GET_LINK_INFO_TEST_SOFT_LINK_NAME3); + printf(" couldn't determine if soft link '%s' exists\n", + GET_LINK_INFO_TEST_SOFT_LINK_NAME3); PART_ERROR(H5Lget_info_by_idx_soft_crt_order_decreasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" soft link '%s' did not exist before deletion\n", - GET_LINK_INFO_TEST_SOFT_LINK_NAME3); + printf(" soft link '%s' did not exist before deletion\n", + GET_LINK_INFO_TEST_SOFT_LINK_NAME3); PART_ERROR(H5Lget_info_by_idx_soft_crt_order_decreasing); } /* Retrieve info of links in turn */ - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 2, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't get soft link info for index %d\n", 2); + printf(" couldn't get soft link info for index %d\n", 2); PART_ERROR(H5Lget_info_by_idx_soft_crt_order_decreasing); } if (link_info.type != H5L_TYPE_SOFT) { H5_FAILED(); - HDprintf(" incorrect link type returned\n"); + printf(" incorrect link type returned\n"); PART_ERROR(H5Lget_info_by_idx_soft_crt_order_decreasing); } @@ -15376,29 +15256,29 @@ test_get_link_info(void) 1; if (link_info.u.val_size != link_val_size) { H5_FAILED(); - HDprintf(" link's value size '%zu' did not match expected value '%zu'\n", - link_info.u.val_size, link_val_size); + printf(" link's value size '%zu' did not match expected value '%zu'\n", + link_info.u.val_size, link_val_size); PART_ERROR(H5Lget_info_by_idx_soft_crt_order_decreasing); } if (link_info.corder_valid && (link_info.corder != 0)) { H5_FAILED(); - HDprintf(" link's creation order value '%lld' did not match expected value '%lld'\n", - (long long)link_info.corder, (long long)0); + printf(" link's creation order value '%lld' did not match expected value '%lld'\n", + (long long)link_info.corder, (long long)0); PART_ERROR(H5Lget_info_by_idx_soft_crt_order_decreasing); } - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 1, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't get soft link info for index %d\n", 1); + printf(" couldn't get soft link info for index %d\n", 1); PART_ERROR(H5Lget_info_by_idx_soft_crt_order_decreasing); } if (link_info.type != H5L_TYPE_SOFT) { H5_FAILED(); - HDprintf(" incorrect link type returned\n"); + printf(" incorrect link type returned\n"); PART_ERROR(H5Lget_info_by_idx_soft_crt_order_decreasing); } @@ -15407,29 +15287,29 @@ test_get_link_info(void) 1; if (link_info.u.val_size != link_val_size) { H5_FAILED(); - HDprintf(" link's value size '%zu' did not match expected value '%zu'\n", - link_info.u.val_size, link_val_size); + printf(" link's value size '%zu' did not match expected value '%zu'\n", + link_info.u.val_size, link_val_size); PART_ERROR(H5Lget_info_by_idx_soft_crt_order_decreasing); } if (link_info.corder_valid && (link_info.corder != 1)) { H5_FAILED(); - HDprintf(" link's creation order value '%lld' did not match expected value '%lld'\n", - (long long)link_info.corder, (long long)1); + printf(" link's creation order value '%lld' did not match expected value '%lld'\n", + (long long)link_info.corder, (long long)1); PART_ERROR(H5Lget_info_by_idx_soft_crt_order_decreasing); } - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 0, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't get soft link info for index %d\n", 0); + printf(" couldn't get soft link info for index %d\n", 0); PART_ERROR(H5Lget_info_by_idx_soft_crt_order_decreasing); } if (link_info.type != H5L_TYPE_SOFT) { H5_FAILED(); - HDprintf(" incorrect link type returned\n"); + printf(" incorrect link type returned\n"); PART_ERROR(H5Lget_info_by_idx_soft_crt_order_decreasing); } @@ -15438,21 +15318,21 @@ test_get_link_info(void) 1; if (link_info.u.val_size != link_val_size) { H5_FAILED(); - HDprintf(" link's value size '%zu' did not match expected value '%zu'\n", - link_info.u.val_size, link_val_size); + printf(" link's value size '%zu' did not match expected value '%zu'\n", + link_info.u.val_size, link_val_size); PART_ERROR(H5Lget_info_by_idx_soft_crt_order_decreasing); } if (link_info.corder_valid && (link_info.corder != 2)) { H5_FAILED(); - HDprintf(" link's creation order value '%lld' did not match expected value '%lld'\n", - (long long)link_info.corder, (long long)2); + printf(" link's creation order value '%lld' did not match expected value '%lld'\n", + (long long)link_info.corder, (long long)2); PART_ERROR(H5Lget_info_by_idx_soft_crt_order_decreasing); } if (H5Gclose(subgroup_id) < 0) { H5_FAILED(); - HDprintf(" failed to close group '%s'\n", GET_LINK_INFO_TEST_SUBGROUP10_NAME); + printf(" failed to close group '%s'\n", GET_LINK_INFO_TEST_SUBGROUP10_NAME); PART_ERROR(H5Lget_info_by_idx_soft_crt_order_decreasing); } @@ -15474,7 +15354,7 @@ test_get_link_info(void) if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_INFO_TEST_SUBGROUP11_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create subgroup '%s'\n", GET_LINK_INFO_TEST_SUBGROUP11_NAME); + printf(" couldn't create subgroup '%s'\n", GET_LINK_INFO_TEST_SUBGROUP11_NAME); PART_ERROR(H5Lget_info_by_idx_soft_name_order_increasing); } @@ -15484,7 +15364,7 @@ test_get_link_info(void) subgroup_id, GET_LINK_INFO_TEST_SOFT_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create soft link '%s'\n", GET_LINK_INFO_TEST_SOFT_LINK_NAME); + printf(" couldn't create soft link '%s'\n", GET_LINK_INFO_TEST_SOFT_LINK_NAME); PART_ERROR(H5Lget_info_by_idx_soft_name_order_increasing); } @@ -15493,7 +15373,7 @@ test_get_link_info(void) subgroup_id, GET_LINK_INFO_TEST_SOFT_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create soft link '%s'\n", GET_LINK_INFO_TEST_SOFT_LINK_NAME2); + printf(" couldn't create soft link '%s'\n", GET_LINK_INFO_TEST_SOFT_LINK_NAME2); PART_ERROR(H5Lget_info_by_idx_soft_name_order_increasing); } @@ -15502,65 +15382,65 @@ test_get_link_info(void) subgroup_id, GET_LINK_INFO_TEST_SOFT_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create soft link '%s'\n", GET_LINK_INFO_TEST_SOFT_LINK_NAME3); + printf(" couldn't create soft link '%s'\n", GET_LINK_INFO_TEST_SOFT_LINK_NAME3); PART_ERROR(H5Lget_info_by_idx_soft_name_order_increasing); } /* Verify the links have been created */ if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if soft link '%s' exists\n", - GET_LINK_INFO_TEST_SOFT_LINK_NAME); + printf(" couldn't determine if soft link '%s' exists\n", + GET_LINK_INFO_TEST_SOFT_LINK_NAME); PART_ERROR(H5Lget_info_by_idx_soft_name_order_increasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" soft link '%s' did not exist before deletion\n", - GET_LINK_INFO_TEST_SOFT_LINK_NAME); + printf(" soft link '%s' did not exist before deletion\n", + GET_LINK_INFO_TEST_SOFT_LINK_NAME); PART_ERROR(H5Lget_info_by_idx_soft_name_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_SOFT_LINK_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if soft link '%s' exists\n", - GET_LINK_INFO_TEST_SOFT_LINK_NAME2); + printf(" couldn't determine if soft link '%s' exists\n", + GET_LINK_INFO_TEST_SOFT_LINK_NAME2); PART_ERROR(H5Lget_info_by_idx_soft_name_order_increasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" soft link '%s' did not exist before deletion\n", - GET_LINK_INFO_TEST_SOFT_LINK_NAME2); + printf(" soft link '%s' did not exist before deletion\n", + GET_LINK_INFO_TEST_SOFT_LINK_NAME2); PART_ERROR(H5Lget_info_by_idx_soft_name_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_SOFT_LINK_NAME3, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if soft link '%s' exists\n", - GET_LINK_INFO_TEST_SOFT_LINK_NAME3); + printf(" couldn't determine if soft link '%s' exists\n", + GET_LINK_INFO_TEST_SOFT_LINK_NAME3); PART_ERROR(H5Lget_info_by_idx_soft_name_order_increasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" soft link '%s' did not exist before deletion\n", - GET_LINK_INFO_TEST_SOFT_LINK_NAME3); + printf(" soft link '%s' did not exist before deletion\n", + GET_LINK_INFO_TEST_SOFT_LINK_NAME3); PART_ERROR(H5Lget_info_by_idx_soft_name_order_increasing); } /* Retrieve info of links in turn */ - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 0, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't get soft link info for index %d\n", 0); + printf(" couldn't get soft link info for index %d\n", 0); PART_ERROR(H5Lget_info_by_idx_soft_name_order_increasing); } if (link_info.type != H5L_TYPE_SOFT) { H5_FAILED(); - HDprintf(" incorrect link type returned\n"); + printf(" incorrect link type returned\n"); PART_ERROR(H5Lget_info_by_idx_soft_name_order_increasing); } @@ -15569,31 +15449,31 @@ test_get_link_info(void) 1; if (link_info.u.val_size != link_val_size) { H5_FAILED(); - HDprintf(" link's value size '%zu' did not match expected value '%zu'\n", - link_info.u.val_size, link_val_size); + printf(" link's value size '%zu' did not match expected value '%zu'\n", + link_info.u.val_size, link_val_size); PART_ERROR(H5Lget_info_by_idx_soft_name_order_increasing); } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (link_info.corder_valid && (link_info.corder != 0)) { H5_FAILED(); - HDprintf(" link's creation order value '%lld' did not match expected value '%lld'\n", - (long long)link_info.corder, (long long)0); + printf(" link's creation order value '%lld' did not match expected value '%lld'\n", + (long long)link_info.corder, (long long)0); PART_ERROR(H5Lget_info_by_idx_soft_name_order_increasing); } } - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 1, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't get soft link info for index %d\n", 1); + printf(" couldn't get soft link info for index %d\n", 1); PART_ERROR(H5Lget_info_by_idx_soft_name_order_increasing); } if (link_info.type != H5L_TYPE_SOFT) { H5_FAILED(); - HDprintf(" incorrect link type returned\n"); + printf(" incorrect link type returned\n"); PART_ERROR(H5Lget_info_by_idx_soft_name_order_increasing); } @@ -15602,31 +15482,31 @@ test_get_link_info(void) 1; if (link_info.u.val_size != link_val_size) { H5_FAILED(); - HDprintf(" link's value size '%zu' did not match expected value '%zu'\n", - link_info.u.val_size, link_val_size); + printf(" link's value size '%zu' did not match expected value '%zu'\n", + link_info.u.val_size, link_val_size); PART_ERROR(H5Lget_info_by_idx_soft_name_order_increasing); } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (link_info.corder_valid && (link_info.corder != 1)) { H5_FAILED(); - HDprintf(" link's creation order value '%lld' did not match expected value '%lld'\n", - (long long)link_info.corder, (long long)1); + printf(" link's creation order value '%lld' did not match expected value '%lld'\n", + (long long)link_info.corder, (long long)1); PART_ERROR(H5Lget_info_by_idx_soft_name_order_increasing); } } - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 2, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't get soft link info for index %d\n", 2); + printf(" couldn't get soft link info for index %d\n", 2); PART_ERROR(H5Lget_info_by_idx_soft_name_order_increasing); } if (link_info.type != H5L_TYPE_SOFT) { H5_FAILED(); - HDprintf(" incorrect link type returned\n"); + printf(" incorrect link type returned\n"); PART_ERROR(H5Lget_info_by_idx_soft_name_order_increasing); } @@ -15635,23 +15515,23 @@ test_get_link_info(void) 1; if (link_info.u.val_size != link_val_size) { H5_FAILED(); - HDprintf(" link's value size '%zu' did not match expected value '%zu'\n", - link_info.u.val_size, link_val_size); + printf(" link's value size '%zu' did not match expected value '%zu'\n", + link_info.u.val_size, link_val_size); PART_ERROR(H5Lget_info_by_idx_soft_name_order_increasing); } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (link_info.corder_valid && (link_info.corder != 2)) { H5_FAILED(); - HDprintf(" link's creation order value '%lld' did not match expected value '%lld'\n", - (long long)link_info.corder, (long long)2); + printf(" link's creation order value '%lld' did not match expected value '%lld'\n", + (long long)link_info.corder, (long long)2); PART_ERROR(H5Lget_info_by_idx_soft_name_order_increasing); } } if (H5Gclose(subgroup_id) < 0) { H5_FAILED(); - HDprintf(" failed to close group '%s'\n", GET_LINK_INFO_TEST_SUBGROUP11_NAME); + printf(" failed to close group '%s'\n", GET_LINK_INFO_TEST_SUBGROUP11_NAME); PART_ERROR(H5Lget_info_by_idx_soft_name_order_increasing); } @@ -15673,7 +15553,7 @@ test_get_link_info(void) if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_INFO_TEST_SUBGROUP12_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create subgroup '%s'\n", GET_LINK_INFO_TEST_SUBGROUP12_NAME); + printf(" couldn't create subgroup '%s'\n", GET_LINK_INFO_TEST_SUBGROUP12_NAME); PART_ERROR(H5Lget_info_by_idx_soft_name_order_decreasing); } @@ -15683,7 +15563,7 @@ test_get_link_info(void) subgroup_id, GET_LINK_INFO_TEST_SOFT_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create soft link '%s'\n", GET_LINK_INFO_TEST_SOFT_LINK_NAME); + printf(" couldn't create soft link '%s'\n", GET_LINK_INFO_TEST_SOFT_LINK_NAME); PART_ERROR(H5Lget_info_by_idx_soft_name_order_decreasing); } @@ -15692,7 +15572,7 @@ test_get_link_info(void) subgroup_id, GET_LINK_INFO_TEST_SOFT_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create soft link '%s'\n", GET_LINK_INFO_TEST_SOFT_LINK_NAME2); + printf(" couldn't create soft link '%s'\n", GET_LINK_INFO_TEST_SOFT_LINK_NAME2); PART_ERROR(H5Lget_info_by_idx_soft_name_order_decreasing); } @@ -15701,65 +15581,65 @@ test_get_link_info(void) subgroup_id, GET_LINK_INFO_TEST_SOFT_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create soft link '%s'\n", GET_LINK_INFO_TEST_SOFT_LINK_NAME3); + printf(" couldn't create soft link '%s'\n", GET_LINK_INFO_TEST_SOFT_LINK_NAME3); PART_ERROR(H5Lget_info_by_idx_soft_name_order_decreasing); } /* Verify the links have been created */ if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if soft link '%s' exists\n", - GET_LINK_INFO_TEST_SOFT_LINK_NAME); + printf(" couldn't determine if soft link '%s' exists\n", + GET_LINK_INFO_TEST_SOFT_LINK_NAME); PART_ERROR(H5Lget_info_by_idx_soft_name_order_decreasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" soft link '%s' did not exist before deletion\n", - GET_LINK_INFO_TEST_SOFT_LINK_NAME); + printf(" soft link '%s' did not exist before deletion\n", + GET_LINK_INFO_TEST_SOFT_LINK_NAME); PART_ERROR(H5Lget_info_by_idx_soft_name_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_SOFT_LINK_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if soft link '%s' exists\n", - GET_LINK_INFO_TEST_SOFT_LINK_NAME2); + printf(" couldn't determine if soft link '%s' exists\n", + GET_LINK_INFO_TEST_SOFT_LINK_NAME2); PART_ERROR(H5Lget_info_by_idx_soft_name_order_decreasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" soft link '%s' did not exist before deletion\n", - GET_LINK_INFO_TEST_SOFT_LINK_NAME2); + printf(" soft link '%s' did not exist before deletion\n", + GET_LINK_INFO_TEST_SOFT_LINK_NAME2); PART_ERROR(H5Lget_info_by_idx_soft_name_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_SOFT_LINK_NAME3, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if soft link '%s' exists\n", - GET_LINK_INFO_TEST_SOFT_LINK_NAME3); + printf(" couldn't determine if soft link '%s' exists\n", + GET_LINK_INFO_TEST_SOFT_LINK_NAME3); PART_ERROR(H5Lget_info_by_idx_soft_name_order_decreasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" soft link '%s' did not exist before deletion\n", - GET_LINK_INFO_TEST_SOFT_LINK_NAME3); + printf(" soft link '%s' did not exist before deletion\n", + GET_LINK_INFO_TEST_SOFT_LINK_NAME3); PART_ERROR(H5Lget_info_by_idx_soft_name_order_decreasing); } /* Retrieve info of links in turn */ - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 2, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't get soft link info for index %d\n", 2); + printf(" couldn't get soft link info for index %d\n", 2); PART_ERROR(H5Lget_info_by_idx_soft_name_order_decreasing); } if (link_info.type != H5L_TYPE_SOFT) { H5_FAILED(); - HDprintf(" incorrect link type returned\n"); + printf(" incorrect link type returned\n"); PART_ERROR(H5Lget_info_by_idx_soft_name_order_decreasing); } @@ -15768,31 +15648,31 @@ test_get_link_info(void) 1; if (link_info.u.val_size != link_val_size) { H5_FAILED(); - HDprintf(" link's value size '%lld' did not match expected value '%zu'\n", - (long long)link_info.u.val_size, link_val_size); + printf(" link's value size '%lld' did not match expected value '%zu'\n", + (long long)link_info.u.val_size, link_val_size); PART_ERROR(H5Lget_info_by_idx_soft_name_order_decreasing); } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (link_info.corder_valid && (link_info.corder != 0)) { H5_FAILED(); - HDprintf(" link's creation order value '%lld' did not match expected value '%lld'\n", - (long long)link_info.corder, (long long)0); + printf(" link's creation order value '%lld' did not match expected value '%lld'\n", + (long long)link_info.corder, (long long)0); PART_ERROR(H5Lget_info_by_idx_soft_name_order_decreasing); } } - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 1, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't get soft link info for index %d\n", 1); + printf(" couldn't get soft link info for index %d\n", 1); PART_ERROR(H5Lget_info_by_idx_soft_name_order_decreasing); } if (link_info.type != H5L_TYPE_SOFT) { H5_FAILED(); - HDprintf(" incorrect link type returned\n"); + printf(" incorrect link type returned\n"); PART_ERROR(H5Lget_info_by_idx_soft_name_order_decreasing); } @@ -15801,31 +15681,31 @@ test_get_link_info(void) 1; if (link_info.u.val_size != link_val_size) { H5_FAILED(); - HDprintf(" link's value size '%lld' did not match expected value '%zu'\n", - (long long)link_info.u.val_size, link_val_size); + printf(" link's value size '%lld' did not match expected value '%zu'\n", + (long long)link_info.u.val_size, link_val_size); PART_ERROR(H5Lget_info_by_idx_soft_name_order_decreasing); } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (link_info.corder_valid && (link_info.corder != 1)) { H5_FAILED(); - HDprintf(" link's creation order value '%lld' did not match expected value '%lld'\n", - (long long)link_info.corder, (long long)1); + printf(" link's creation order value '%lld' did not match expected value '%lld'\n", + (long long)link_info.corder, (long long)1); PART_ERROR(H5Lget_info_by_idx_soft_name_order_decreasing); } } - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 0, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't get soft link info for index %d\n", 0); + printf(" couldn't get soft link info for index %d\n", 0); PART_ERROR(H5Lget_info_by_idx_soft_name_order_decreasing); } if (link_info.type != H5L_TYPE_SOFT) { H5_FAILED(); - HDprintf(" incorrect link type returned\n"); + printf(" incorrect link type returned\n"); PART_ERROR(H5Lget_info_by_idx_soft_name_order_decreasing); } @@ -15834,23 +15714,23 @@ test_get_link_info(void) 1; if (link_info.u.val_size != link_val_size) { H5_FAILED(); - HDprintf(" link's value size '%lld' did not match expected value '%zu'\n", - (long long)link_info.u.val_size, link_val_size); + printf(" link's value size '%lld' did not match expected value '%zu'\n", + (long long)link_info.u.val_size, link_val_size); PART_ERROR(H5Lget_info_by_idx_soft_name_order_decreasing); } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (link_info.corder_valid && (link_info.corder != 2)) { H5_FAILED(); - HDprintf(" link's creation order value '%lld' did not match expected value '%lld'\n", - (long long)link_info.corder, (long long)2); + printf(" link's creation order value '%lld' did not match expected value '%lld'\n", + (long long)link_info.corder, (long long)2); PART_ERROR(H5Lget_info_by_idx_soft_name_order_decreasing); } } if (H5Gclose(subgroup_id) < 0) { H5_FAILED(); - HDprintf(" failed to close group '%s'\n", GET_LINK_INFO_TEST_SUBGROUP12_NAME); + printf(" failed to close group '%s'\n", GET_LINK_INFO_TEST_SUBGROUP12_NAME); PART_ERROR(H5Lget_info_by_idx_soft_name_order_decreasing); } @@ -15871,7 +15751,7 @@ test_get_link_info(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" creation order tracking isn't supported with this VOL connector\n"); + printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Lget_info_by_idx_external_crt_order_increasing); } @@ -15880,20 +15760,20 @@ test_get_link_info(void) if ((ext_file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); + printf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); PART_ERROR(H5Lget_info_by_idx_external_crt_order_increasing); } if (H5Fclose(ext_file_id) < 0) { H5_FAILED(); - HDprintf(" couldn't close file '%s'\n", ext_link_filename); + printf(" couldn't close file '%s'\n", ext_link_filename); PART_ERROR(H5Lget_info_by_idx_external_crt_order_increasing); } if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_INFO_TEST_SUBGROUP13_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create subgroup '%s'\n", GET_LINK_INFO_TEST_SUBGROUP13_NAME); + printf(" couldn't create subgroup '%s'\n", GET_LINK_INFO_TEST_SUBGROUP13_NAME); PART_ERROR(H5Lget_info_by_idx_external_crt_order_increasing); } @@ -15901,158 +15781,158 @@ test_get_link_info(void) if (H5Lcreate_external(ext_link_filename, ext_objname, subgroup_id, GET_LINK_INFO_TEST_EXT_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create external link '%s'\n", GET_LINK_INFO_TEST_EXT_LINK_NAME); + printf(" couldn't create external link '%s'\n", GET_LINK_INFO_TEST_EXT_LINK_NAME); PART_ERROR(H5Lget_info_by_idx_external_crt_order_increasing); } if (H5Lcreate_external(ext_link_filename, ext_objname, subgroup_id, GET_LINK_INFO_TEST_EXT_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create external link '%s'\n", GET_LINK_INFO_TEST_EXT_LINK_NAME2); + printf(" couldn't create external link '%s'\n", GET_LINK_INFO_TEST_EXT_LINK_NAME2); PART_ERROR(H5Lget_info_by_idx_external_crt_order_increasing); } if (H5Lcreate_external(ext_link_filename, ext_objname, subgroup_id, GET_LINK_INFO_TEST_EXT_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create external link '%s'\n", GET_LINK_INFO_TEST_EXT_LINK_NAME3); + printf(" couldn't create external link '%s'\n", GET_LINK_INFO_TEST_EXT_LINK_NAME3); PART_ERROR(H5Lget_info_by_idx_external_crt_order_increasing); } /* Verify the links have been created */ if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_EXT_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if external link '%s' exists\n", - GET_LINK_INFO_TEST_EXT_LINK_NAME); + printf(" couldn't determine if external link '%s' exists\n", + GET_LINK_INFO_TEST_EXT_LINK_NAME); PART_ERROR(H5Lget_info_by_idx_external_crt_order_increasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" external link '%s' did not exist before deletion\n", - GET_LINK_INFO_TEST_EXT_LINK_NAME); + printf(" external link '%s' did not exist before deletion\n", + GET_LINK_INFO_TEST_EXT_LINK_NAME); PART_ERROR(H5Lget_info_by_idx_external_crt_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_EXT_LINK_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if external link '%s' exists\n", - GET_LINK_INFO_TEST_EXT_LINK_NAME2); + printf(" couldn't determine if external link '%s' exists\n", + GET_LINK_INFO_TEST_EXT_LINK_NAME2); PART_ERROR(H5Lget_info_by_idx_external_crt_order_increasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" external link '%s' did not exist before deletion\n", - GET_LINK_INFO_TEST_EXT_LINK_NAME2); + printf(" external link '%s' did not exist before deletion\n", + GET_LINK_INFO_TEST_EXT_LINK_NAME2); PART_ERROR(H5Lget_info_by_idx_external_crt_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_EXT_LINK_NAME3, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if external link '%s' exists\n", - GET_LINK_INFO_TEST_EXT_LINK_NAME3); + printf(" couldn't determine if external link '%s' exists\n", + GET_LINK_INFO_TEST_EXT_LINK_NAME3); PART_ERROR(H5Lget_info_by_idx_external_crt_order_increasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" external link '%s' did not exist before deletion\n", - GET_LINK_INFO_TEST_EXT_LINK_NAME3); + printf(" external link '%s' did not exist before deletion\n", + GET_LINK_INFO_TEST_EXT_LINK_NAME3); PART_ERROR(H5Lget_info_by_idx_external_crt_order_increasing); } /* Retrieve info of links in turn */ - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 0, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't get external link info for index %d\n", 0); + printf(" couldn't get external link info for index %d\n", 0); PART_ERROR(H5Lget_info_by_idx_external_crt_order_increasing); } if (link_info.type != H5L_TYPE_EXTERNAL) { H5_FAILED(); - HDprintf(" incorrect link type returned\n"); + printf(" incorrect link type returned\n"); PART_ERROR(H5Lget_info_by_idx_external_crt_order_increasing); } link_val_size = 1 + strlen(ext_link_filename) + 1 + strlen(ext_objname) + 1; if (link_info.u.val_size != link_val_size) { H5_FAILED(); - HDprintf(" link's value size '%lld' did not match expected value '%zu'\n", - (long long)link_info.u.val_size, link_val_size); + printf(" link's value size '%lld' did not match expected value '%zu'\n", + (long long)link_info.u.val_size, link_val_size); PART_ERROR(H5Lget_info_by_idx_external_crt_order_increasing); } if (link_info.corder_valid && (link_info.corder != 0)) { H5_FAILED(); - HDprintf(" link's creation order value '%lld' did not match expected value '%lld'\n", - (long long)link_info.corder, (long long)0); + printf(" link's creation order value '%lld' did not match expected value '%lld'\n", + (long long)link_info.corder, (long long)0); PART_ERROR(H5Lget_info_by_idx_external_crt_order_increasing); } - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 1, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't get external link info for index %d\n", 1); + printf(" couldn't get external link info for index %d\n", 1); PART_ERROR(H5Lget_info_by_idx_external_crt_order_increasing); } if (link_info.type != H5L_TYPE_EXTERNAL) { H5_FAILED(); - HDprintf(" incorrect link type returned\n"); + printf(" incorrect link type returned\n"); PART_ERROR(H5Lget_info_by_idx_external_crt_order_increasing); } link_val_size = 1 + strlen(ext_link_filename) + 1 + strlen(ext_objname) + 1; if (link_info.u.val_size != link_val_size) { H5_FAILED(); - HDprintf(" link's value size '%lld' did not match expected value '%zu'\n", - (long long)link_info.u.val_size, link_val_size); + printf(" link's value size '%lld' did not match expected value '%zu'\n", + (long long)link_info.u.val_size, link_val_size); PART_ERROR(H5Lget_info_by_idx_external_crt_order_increasing); } if (link_info.corder_valid && (link_info.corder != 1)) { H5_FAILED(); - HDprintf(" link's creation order value '%lld' did not match expected value '%lld'\n", - (long long)link_info.corder, (long long)1); + printf(" link's creation order value '%lld' did not match expected value '%lld'\n", + (long long)link_info.corder, (long long)1); PART_ERROR(H5Lget_info_by_idx_external_crt_order_increasing); } - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 2, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't get external link info for index %d\n", 2); + printf(" couldn't get external link info for index %d\n", 2); PART_ERROR(H5Lget_info_by_idx_external_crt_order_increasing); } if (link_info.type != H5L_TYPE_EXTERNAL) { H5_FAILED(); - HDprintf(" incorrect link type returned\n"); + printf(" incorrect link type returned\n"); PART_ERROR(H5Lget_info_by_idx_external_crt_order_increasing); } link_val_size = 1 + strlen(ext_link_filename) + 1 + strlen(ext_objname) + 1; if (link_info.u.val_size != link_val_size) { H5_FAILED(); - HDprintf(" link's value size '%lld' did not match expected value '%zu'\n", - (long long)link_info.u.val_size, link_val_size); + printf(" link's value size '%lld' did not match expected value '%zu'\n", + (long long)link_info.u.val_size, link_val_size); PART_ERROR(H5Lget_info_by_idx_external_crt_order_increasing); } if (link_info.corder_valid && (link_info.corder != 2)) { H5_FAILED(); - HDprintf(" link's creation order value '%lld' did not match expected value '%lld'\n", - (long long)link_info.corder, (long long)2); + printf(" link's creation order value '%lld' did not match expected value '%lld'\n", + (long long)link_info.corder, (long long)2); PART_ERROR(H5Lget_info_by_idx_external_crt_order_increasing); } if (H5Gclose(subgroup_id) < 0) { H5_FAILED(); - HDprintf(" failed to close group '%s'\n", GET_LINK_INFO_TEST_SUBGROUP13_NAME); + printf(" failed to close group '%s'\n", GET_LINK_INFO_TEST_SUBGROUP13_NAME); PART_ERROR(H5Lget_info_by_idx_external_crt_order_increasing); } @@ -16075,7 +15955,7 @@ test_get_link_info(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" creation order tracking isn't supported with this VOL connector\n"); + printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Lget_info_by_idx_external_crt_order_decreasing); } @@ -16084,20 +15964,20 @@ test_get_link_info(void) if ((ext_file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); + printf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); PART_ERROR(H5Lget_info_by_idx_external_crt_order_decreasing); } if (H5Fclose(ext_file_id) < 0) { H5_FAILED(); - HDprintf(" couldn't close file '%s'\n", ext_link_filename); + printf(" couldn't close file '%s'\n", ext_link_filename); PART_ERROR(H5Lget_info_by_idx_external_crt_order_decreasing); } if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_INFO_TEST_SUBGROUP14_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create subgroup '%s'\n", GET_LINK_INFO_TEST_SUBGROUP14_NAME); + printf(" couldn't create subgroup '%s'\n", GET_LINK_INFO_TEST_SUBGROUP14_NAME); PART_ERROR(H5Lget_info_by_idx_external_crt_order_decreasing); } @@ -16105,158 +15985,158 @@ test_get_link_info(void) if (H5Lcreate_external(ext_link_filename, ext_objname, subgroup_id, GET_LINK_INFO_TEST_EXT_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create external link '%s'\n", GET_LINK_INFO_TEST_EXT_LINK_NAME); + printf(" couldn't create external link '%s'\n", GET_LINK_INFO_TEST_EXT_LINK_NAME); PART_ERROR(H5Lget_info_by_idx_external_crt_order_decreasing); } if (H5Lcreate_external(ext_link_filename, ext_objname, subgroup_id, GET_LINK_INFO_TEST_EXT_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create external link '%s'\n", GET_LINK_INFO_TEST_EXT_LINK_NAME2); + printf(" couldn't create external link '%s'\n", GET_LINK_INFO_TEST_EXT_LINK_NAME2); PART_ERROR(H5Lget_info_by_idx_external_crt_order_decreasing); } if (H5Lcreate_external(ext_link_filename, ext_objname, subgroup_id, GET_LINK_INFO_TEST_EXT_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create external link '%s'\n", GET_LINK_INFO_TEST_EXT_LINK_NAME3); + printf(" couldn't create external link '%s'\n", GET_LINK_INFO_TEST_EXT_LINK_NAME3); PART_ERROR(H5Lget_info_by_idx_external_crt_order_decreasing); } /* Verify the links have been created */ if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_EXT_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if external link '%s' exists\n", - GET_LINK_INFO_TEST_EXT_LINK_NAME); + printf(" couldn't determine if external link '%s' exists\n", + GET_LINK_INFO_TEST_EXT_LINK_NAME); PART_ERROR(H5Lget_info_by_idx_external_crt_order_decreasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" external link '%s' did not exist before deletion\n", - GET_LINK_INFO_TEST_EXT_LINK_NAME); + printf(" external link '%s' did not exist before deletion\n", + GET_LINK_INFO_TEST_EXT_LINK_NAME); PART_ERROR(H5Lget_info_by_idx_external_crt_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_EXT_LINK_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if external link '%s' exists\n", - GET_LINK_INFO_TEST_EXT_LINK_NAME2); + printf(" couldn't determine if external link '%s' exists\n", + GET_LINK_INFO_TEST_EXT_LINK_NAME2); PART_ERROR(H5Lget_info_by_idx_external_crt_order_decreasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" external link '%s' did not exist before deletion\n", - GET_LINK_INFO_TEST_EXT_LINK_NAME2); + printf(" external link '%s' did not exist before deletion\n", + GET_LINK_INFO_TEST_EXT_LINK_NAME2); PART_ERROR(H5Lget_info_by_idx_external_crt_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_EXT_LINK_NAME3, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if external link '%s' exists\n", - GET_LINK_INFO_TEST_EXT_LINK_NAME3); + printf(" couldn't determine if external link '%s' exists\n", + GET_LINK_INFO_TEST_EXT_LINK_NAME3); PART_ERROR(H5Lget_info_by_idx_external_crt_order_decreasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" external link '%s' did not exist before deletion\n", - GET_LINK_INFO_TEST_EXT_LINK_NAME3); + printf(" external link '%s' did not exist before deletion\n", + GET_LINK_INFO_TEST_EXT_LINK_NAME3); PART_ERROR(H5Lget_info_by_idx_external_crt_order_decreasing); } /* Retrieve info of links in turn */ - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 2, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't get external link info for index %d\n", 2); + printf(" couldn't get external link info for index %d\n", 2); PART_ERROR(H5Lget_info_by_idx_external_crt_order_decreasing); } if (link_info.type != H5L_TYPE_EXTERNAL) { H5_FAILED(); - HDprintf(" incorrect link type returned\n"); + printf(" incorrect link type returned\n"); PART_ERROR(H5Lget_info_by_idx_external_crt_order_decreasing); } link_val_size = 1 + strlen(ext_link_filename) + 1 + strlen(ext_objname) + 1; if (link_info.u.val_size != link_val_size) { H5_FAILED(); - HDprintf(" link's value size '%lld' did not match expected value '%zu'\n", - (long long)link_info.u.val_size, link_val_size); + printf(" link's value size '%lld' did not match expected value '%zu'\n", + (long long)link_info.u.val_size, link_val_size); PART_ERROR(H5Lget_info_by_idx_external_crt_order_decreasing); } if (link_info.corder_valid && (link_info.corder != 0)) { H5_FAILED(); - HDprintf(" link's creation order value '%lld' did not match expected value '%lld'\n", - (long long)link_info.corder, (long long)0); + printf(" link's creation order value '%lld' did not match expected value '%lld'\n", + (long long)link_info.corder, (long long)0); PART_ERROR(H5Lget_info_by_idx_external_crt_order_decreasing); } - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 1, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't get external link info for index %d\n", 1); + printf(" couldn't get external link info for index %d\n", 1); PART_ERROR(H5Lget_info_by_idx_external_crt_order_decreasing); } if (link_info.type != H5L_TYPE_EXTERNAL) { H5_FAILED(); - HDprintf(" incorrect link type returned\n"); + printf(" incorrect link type returned\n"); PART_ERROR(H5Lget_info_by_idx_external_crt_order_decreasing); } link_val_size = 1 + strlen(ext_link_filename) + 1 + strlen(ext_objname) + 1; if (link_info.u.val_size != link_val_size) { H5_FAILED(); - HDprintf(" link's value size '%lld' did not match expected value '%zu'\n", - (long long)link_info.u.val_size, link_val_size); + printf(" link's value size '%lld' did not match expected value '%zu'\n", + (long long)link_info.u.val_size, link_val_size); PART_ERROR(H5Lget_info_by_idx_external_crt_order_decreasing); } if (link_info.corder_valid && (link_info.corder != 1)) { H5_FAILED(); - HDprintf(" link's creation order value '%lld' did not match expected value '%lld'\n", - (long long)link_info.corder, (long long)1); + printf(" link's creation order value '%lld' did not match expected value '%lld'\n", + (long long)link_info.corder, (long long)1); PART_ERROR(H5Lget_info_by_idx_external_crt_order_decreasing); } - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 0, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't get external link info for index %d\n", 0); + printf(" couldn't get external link info for index %d\n", 0); PART_ERROR(H5Lget_info_by_idx_external_crt_order_decreasing); } if (link_info.type != H5L_TYPE_EXTERNAL) { H5_FAILED(); - HDprintf(" incorrect link type returned\n"); + printf(" incorrect link type returned\n"); PART_ERROR(H5Lget_info_by_idx_external_crt_order_decreasing); } link_val_size = 1 + strlen(ext_link_filename) + 1 + strlen(ext_objname) + 1; if (link_info.u.val_size != link_val_size) { H5_FAILED(); - HDprintf(" link's value size '%lld' did not match expected value '%zu'\n", - (long long)link_info.u.val_size, link_val_size); + printf(" link's value size '%lld' did not match expected value '%zu'\n", + (long long)link_info.u.val_size, link_val_size); PART_ERROR(H5Lget_info_by_idx_external_crt_order_decreasing); } if (link_info.corder_valid && (link_info.corder != 2)) { H5_FAILED(); - HDprintf(" link's creation order value '%lld' did not match expected value '%lld'\n", - (long long)link_info.corder, (long long)2); + printf(" link's creation order value '%lld' did not match expected value '%lld'\n", + (long long)link_info.corder, (long long)2); PART_ERROR(H5Lget_info_by_idx_external_crt_order_decreasing); } if (H5Gclose(subgroup_id) < 0) { H5_FAILED(); - HDprintf(" failed to close group '%s'\n", GET_LINK_INFO_TEST_SUBGROUP14_NAME); + printf(" failed to close group '%s'\n", GET_LINK_INFO_TEST_SUBGROUP14_NAME); PART_ERROR(H5Lget_info_by_idx_external_crt_order_decreasing); } @@ -16282,20 +16162,20 @@ test_get_link_info(void) if ((ext_file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); + printf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); PART_ERROR(H5Lget_info_by_idx_external_name_order_increasing); } if (H5Fclose(ext_file_id) < 0) { H5_FAILED(); - HDprintf(" couldn't close file '%s'\n", ext_link_filename); + printf(" couldn't close file '%s'\n", ext_link_filename); PART_ERROR(H5Lget_info_by_idx_external_name_order_increasing); } if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_INFO_TEST_SUBGROUP15_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create subgroup '%s'\n", GET_LINK_INFO_TEST_SUBGROUP15_NAME); + printf(" couldn't create subgroup '%s'\n", GET_LINK_INFO_TEST_SUBGROUP15_NAME); PART_ERROR(H5Lget_info_by_idx_external_name_order_increasing); } @@ -16303,164 +16183,164 @@ test_get_link_info(void) if (H5Lcreate_external(ext_link_filename, ext_objname, subgroup_id, GET_LINK_INFO_TEST_EXT_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create external link '%s'\n", GET_LINK_INFO_TEST_EXT_LINK_NAME); + printf(" couldn't create external link '%s'\n", GET_LINK_INFO_TEST_EXT_LINK_NAME); PART_ERROR(H5Lget_info_by_idx_external_name_order_increasing); } if (H5Lcreate_external(ext_link_filename, ext_objname, subgroup_id, GET_LINK_INFO_TEST_EXT_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create external link '%s'\n", GET_LINK_INFO_TEST_EXT_LINK_NAME2); + printf(" couldn't create external link '%s'\n", GET_LINK_INFO_TEST_EXT_LINK_NAME2); PART_ERROR(H5Lget_info_by_idx_external_name_order_increasing); } if (H5Lcreate_external(ext_link_filename, ext_objname, subgroup_id, GET_LINK_INFO_TEST_EXT_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create external link '%s'\n", GET_LINK_INFO_TEST_EXT_LINK_NAME3); + printf(" couldn't create external link '%s'\n", GET_LINK_INFO_TEST_EXT_LINK_NAME3); PART_ERROR(H5Lget_info_by_idx_external_name_order_increasing); } /* Verify the links have been created */ if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_EXT_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if external link '%s' exists\n", - GET_LINK_INFO_TEST_EXT_LINK_NAME); + printf(" couldn't determine if external link '%s' exists\n", + GET_LINK_INFO_TEST_EXT_LINK_NAME); PART_ERROR(H5Lget_info_by_idx_external_name_order_increasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" external link '%s' did not exist before deletion\n", - GET_LINK_INFO_TEST_EXT_LINK_NAME); + printf(" external link '%s' did not exist before deletion\n", + GET_LINK_INFO_TEST_EXT_LINK_NAME); PART_ERROR(H5Lget_info_by_idx_external_name_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_EXT_LINK_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if external link '%s' exists\n", - GET_LINK_INFO_TEST_EXT_LINK_NAME2); + printf(" couldn't determine if external link '%s' exists\n", + GET_LINK_INFO_TEST_EXT_LINK_NAME2); PART_ERROR(H5Lget_info_by_idx_external_name_order_increasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" external link '%s' did not exist before deletion\n", - GET_LINK_INFO_TEST_EXT_LINK_NAME2); + printf(" external link '%s' did not exist before deletion\n", + GET_LINK_INFO_TEST_EXT_LINK_NAME2); PART_ERROR(H5Lget_info_by_idx_external_name_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_EXT_LINK_NAME3, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if external link '%s' exists\n", - GET_LINK_INFO_TEST_EXT_LINK_NAME3); + printf(" couldn't determine if external link '%s' exists\n", + GET_LINK_INFO_TEST_EXT_LINK_NAME3); PART_ERROR(H5Lget_info_by_idx_external_name_order_increasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" external link '%s' did not exist before deletion\n", - GET_LINK_INFO_TEST_EXT_LINK_NAME3); + printf(" external link '%s' did not exist before deletion\n", + GET_LINK_INFO_TEST_EXT_LINK_NAME3); PART_ERROR(H5Lget_info_by_idx_external_name_order_increasing); } /* Retrieve info of links in turn */ - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 0, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't get external link info for index %d\n", 0); + printf(" couldn't get external link info for index %d\n", 0); PART_ERROR(H5Lget_info_by_idx_external_name_order_increasing); } if (link_info.type != H5L_TYPE_EXTERNAL) { H5_FAILED(); - HDprintf(" incorrect link type returned\n"); + printf(" incorrect link type returned\n"); PART_ERROR(H5Lget_info_by_idx_external_name_order_increasing); } link_val_size = 1 + strlen(ext_link_filename) + 1 + strlen(ext_objname) + 1; if (link_info.u.val_size != link_val_size) { H5_FAILED(); - HDprintf(" link's value size '%lld' did not match expected value '%zu'\n", - (long long)link_info.u.val_size, link_val_size); + printf(" link's value size '%lld' did not match expected value '%zu'\n", + (long long)link_info.u.val_size, link_val_size); PART_ERROR(H5Lget_info_by_idx_external_name_order_increasing); } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (link_info.corder_valid && (link_info.corder != 0)) { H5_FAILED(); - HDprintf(" link's creation order value '%lld' did not match expected value '%lld'\n", - (long long)link_info.corder, (long long)0); + printf(" link's creation order value '%lld' did not match expected value '%lld'\n", + (long long)link_info.corder, (long long)0); PART_ERROR(H5Lget_info_by_idx_external_name_order_increasing); } } - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 1, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't get external link info for index %d\n", 1); + printf(" couldn't get external link info for index %d\n", 1); PART_ERROR(H5Lget_info_by_idx_external_name_order_increasing); } if (link_info.type != H5L_TYPE_EXTERNAL) { H5_FAILED(); - HDprintf(" incorrect link type returned\n"); + printf(" incorrect link type returned\n"); PART_ERROR(H5Lget_info_by_idx_external_name_order_increasing); } link_val_size = 1 + strlen(ext_link_filename) + 1 + strlen(ext_objname) + 1; if (link_info.u.val_size != link_val_size) { H5_FAILED(); - HDprintf(" link's value size '%lld' did not match expected value '%zu'\n", - (long long)link_info.u.val_size, link_val_size); + printf(" link's value size '%lld' did not match expected value '%zu'\n", + (long long)link_info.u.val_size, link_val_size); PART_ERROR(H5Lget_info_by_idx_external_name_order_increasing); } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (link_info.corder_valid && (link_info.corder != 1)) { H5_FAILED(); - HDprintf(" link's creation order value '%lld' did not match expected value '%lld'\n", - (long long)link_info.corder, (long long)1); + printf(" link's creation order value '%lld' did not match expected value '%lld'\n", + (long long)link_info.corder, (long long)1); PART_ERROR(H5Lget_info_by_idx_external_name_order_increasing); } } - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 2, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't get external link info for index %d\n", 2); + printf(" couldn't get external link info for index %d\n", 2); PART_ERROR(H5Lget_info_by_idx_external_name_order_increasing); } if (link_info.type != H5L_TYPE_EXTERNAL) { H5_FAILED(); - HDprintf(" incorrect link type returned\n"); + printf(" incorrect link type returned\n"); PART_ERROR(H5Lget_info_by_idx_external_name_order_increasing); } link_val_size = 1 + strlen(ext_link_filename) + 1 + strlen(ext_objname) + 1; if (link_info.u.val_size != link_val_size) { H5_FAILED(); - HDprintf(" link's value size '%lld' did not match expected value '%zu'\n", - (long long)link_info.u.val_size, link_val_size); + printf(" link's value size '%lld' did not match expected value '%zu'\n", + (long long)link_info.u.val_size, link_val_size); PART_ERROR(H5Lget_info_by_idx_external_name_order_increasing); } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (link_info.corder_valid && (link_info.corder != 2)) { H5_FAILED(); - HDprintf(" link's creation order value '%lld' did not match expected value '%lld'\n", - (long long)link_info.corder, (long long)2); + printf(" link's creation order value '%lld' did not match expected value '%lld'\n", + (long long)link_info.corder, (long long)2); PART_ERROR(H5Lget_info_by_idx_external_name_order_increasing); } } if (H5Gclose(subgroup_id) < 0) { H5_FAILED(); - HDprintf(" failed to close group '%s'\n", GET_LINK_INFO_TEST_SUBGROUP15_NAME); + printf(" failed to close group '%s'\n", GET_LINK_INFO_TEST_SUBGROUP15_NAME); PART_ERROR(H5Lget_info_by_idx_external_name_order_increasing); } @@ -16486,20 +16366,20 @@ test_get_link_info(void) if ((ext_file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); + printf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); PART_ERROR(H5Lget_info_by_idx_external_name_order_decreasing); } if (H5Fclose(ext_file_id) < 0) { H5_FAILED(); - HDprintf(" couldn't close file '%s'\n", ext_link_filename); + printf(" couldn't close file '%s'\n", ext_link_filename); PART_ERROR(H5Lget_info_by_idx_external_name_order_decreasing); } if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_INFO_TEST_SUBGROUP16_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create subgroup '%s'\n", GET_LINK_INFO_TEST_SUBGROUP16_NAME); + printf(" couldn't create subgroup '%s'\n", GET_LINK_INFO_TEST_SUBGROUP16_NAME); PART_ERROR(H5Lget_info_by_idx_external_name_order_decreasing); } @@ -16507,164 +16387,164 @@ test_get_link_info(void) if (H5Lcreate_external(ext_link_filename, ext_objname, subgroup_id, GET_LINK_INFO_TEST_EXT_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create external link '%s'\n", GET_LINK_INFO_TEST_EXT_LINK_NAME); + printf(" couldn't create external link '%s'\n", GET_LINK_INFO_TEST_EXT_LINK_NAME); PART_ERROR(H5Lget_info_by_idx_external_name_order_decreasing); } if (H5Lcreate_external(ext_link_filename, ext_objname, subgroup_id, GET_LINK_INFO_TEST_EXT_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create external link '%s'\n", GET_LINK_INFO_TEST_EXT_LINK_NAME2); + printf(" couldn't create external link '%s'\n", GET_LINK_INFO_TEST_EXT_LINK_NAME2); PART_ERROR(H5Lget_info_by_idx_external_name_order_decreasing); } if (H5Lcreate_external(ext_link_filename, ext_objname, subgroup_id, GET_LINK_INFO_TEST_EXT_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create external link '%s'\n", GET_LINK_INFO_TEST_EXT_LINK_NAME3); + printf(" couldn't create external link '%s'\n", GET_LINK_INFO_TEST_EXT_LINK_NAME3); PART_ERROR(H5Lget_info_by_idx_external_name_order_decreasing); } /* Verify the links have been created */ if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_EXT_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if external link '%s' exists\n", - GET_LINK_INFO_TEST_EXT_LINK_NAME); + printf(" couldn't determine if external link '%s' exists\n", + GET_LINK_INFO_TEST_EXT_LINK_NAME); PART_ERROR(H5Lget_info_by_idx_external_name_order_decreasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" external link '%s' did not exist before deletion\n", - GET_LINK_INFO_TEST_EXT_LINK_NAME); + printf(" external link '%s' did not exist before deletion\n", + GET_LINK_INFO_TEST_EXT_LINK_NAME); PART_ERROR(H5Lget_info_by_idx_external_name_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_EXT_LINK_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if external link '%s' exists\n", - GET_LINK_INFO_TEST_EXT_LINK_NAME2); + printf(" couldn't determine if external link '%s' exists\n", + GET_LINK_INFO_TEST_EXT_LINK_NAME2); PART_ERROR(H5Lget_info_by_idx_external_name_order_decreasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" external link '%s' did not exist before deletion\n", - GET_LINK_INFO_TEST_EXT_LINK_NAME2); + printf(" external link '%s' did not exist before deletion\n", + GET_LINK_INFO_TEST_EXT_LINK_NAME2); PART_ERROR(H5Lget_info_by_idx_external_name_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_EXT_LINK_NAME3, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if external link '%s' exists\n", - GET_LINK_INFO_TEST_EXT_LINK_NAME3); + printf(" couldn't determine if external link '%s' exists\n", + GET_LINK_INFO_TEST_EXT_LINK_NAME3); PART_ERROR(H5Lget_info_by_idx_external_name_order_decreasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" external link '%s' did not exist before deletion\n", - GET_LINK_INFO_TEST_EXT_LINK_NAME3); + printf(" external link '%s' did not exist before deletion\n", + GET_LINK_INFO_TEST_EXT_LINK_NAME3); PART_ERROR(H5Lget_info_by_idx_external_name_order_decreasing); } /* Retrieve info of links in turn */ - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 2, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't get external link info for index %d\n", 2); + printf(" couldn't get external link info for index %d\n", 2); PART_ERROR(H5Lget_info_by_idx_external_name_order_decreasing); } if (link_info.type != H5L_TYPE_EXTERNAL) { H5_FAILED(); - HDprintf(" incorrect link type returned\n"); + printf(" incorrect link type returned\n"); PART_ERROR(H5Lget_info_by_idx_external_name_order_decreasing); } link_val_size = 1 + strlen(ext_link_filename) + 1 + strlen(ext_objname) + 1; if (link_info.u.val_size != link_val_size) { H5_FAILED(); - HDprintf(" link's value size '%lld' did not match expected value '%zu'\n", - (long long)link_info.u.val_size, link_val_size); + printf(" link's value size '%lld' did not match expected value '%zu'\n", + (long long)link_info.u.val_size, link_val_size); PART_ERROR(H5Lget_info_by_idx_external_name_order_decreasing); } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (link_info.corder_valid && (link_info.corder != 0)) { H5_FAILED(); - HDprintf(" link's creation order value '%lld' did not match expected value '%lld'\n", - (long long)link_info.corder, (long long)0); + printf(" link's creation order value '%lld' did not match expected value '%lld'\n", + (long long)link_info.corder, (long long)0); PART_ERROR(H5Lget_info_by_idx_external_name_order_decreasing); } } - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 1, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't get external link info for index %d\n", 1); + printf(" couldn't get external link info for index %d\n", 1); PART_ERROR(H5Lget_info_by_idx_external_name_order_decreasing); } if (link_info.type != H5L_TYPE_EXTERNAL) { H5_FAILED(); - HDprintf(" incorrect link type returned\n"); + printf(" incorrect link type returned\n"); PART_ERROR(H5Lget_info_by_idx_external_name_order_decreasing); } link_val_size = 1 + strlen(ext_link_filename) + 1 + strlen(ext_objname) + 1; if (link_info.u.val_size != link_val_size) { H5_FAILED(); - HDprintf(" link's value size '%lld' did not match expected value '%zu'\n", - (long long)link_info.u.val_size, link_val_size); + printf(" link's value size '%lld' did not match expected value '%zu'\n", + (long long)link_info.u.val_size, link_val_size); PART_ERROR(H5Lget_info_by_idx_external_name_order_decreasing); } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (link_info.corder_valid && (link_info.corder != 1)) { H5_FAILED(); - HDprintf(" link's creation order value '%lld' did not match expected value '%lld'\n", - (long long)link_info.corder, (long long)1); + printf(" link's creation order value '%lld' did not match expected value '%lld'\n", + (long long)link_info.corder, (long long)1); PART_ERROR(H5Lget_info_by_idx_external_name_order_decreasing); } } - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 0, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't get external link info for index %d\n", 0); + printf(" couldn't get external link info for index %d\n", 0); PART_ERROR(H5Lget_info_by_idx_external_name_order_decreasing); } if (link_info.type != H5L_TYPE_EXTERNAL) { H5_FAILED(); - HDprintf(" incorrect link type returned\n"); + printf(" incorrect link type returned\n"); PART_ERROR(H5Lget_info_by_idx_external_name_order_decreasing); } link_val_size = 1 + strlen(ext_link_filename) + 1 + strlen(ext_objname) + 1; if (link_info.u.val_size != link_val_size) { H5_FAILED(); - HDprintf(" link's value size '%lld' did not match expected value '%zu'\n", - (long long)link_info.u.val_size, link_val_size); + printf(" link's value size '%lld' did not match expected value '%zu'\n", + (long long)link_info.u.val_size, link_val_size); PART_ERROR(H5Lget_info_by_idx_external_name_order_decreasing); } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (link_info.corder_valid && (link_info.corder != 2)) { H5_FAILED(); - HDprintf(" link's creation order value '%lld' did not match expected value '%lld'\n", - (long long)link_info.corder, (long long)2); + printf(" link's creation order value '%lld' did not match expected value '%lld'\n", + (long long)link_info.corder, (long long)2); PART_ERROR(H5Lget_info_by_idx_external_name_order_decreasing); } } if (H5Gclose(subgroup_id) < 0) { H5_FAILED(); - HDprintf(" failed to close group '%s'\n", GET_LINK_INFO_TEST_SUBGROUP16_NAME); + printf(" failed to close group '%s'\n", GET_LINK_INFO_TEST_SUBGROUP16_NAME); PART_ERROR(H5Lget_info_by_idx_external_name_order_decreasing); } @@ -16798,8 +16678,8 @@ test_get_link_info_invalid_params(void) !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_MORE) || !(vol_cap_flags_g & H5VL_CAP_FLAG_HARD_LINKS)) { SKIPPED(); - HDprintf(" API functions for basic file, group, link, or hard link " - "aren't supported with this connector\n"); + printf(" API functions for basic file, group, link, or hard link " + "aren't supported with this connector\n"); return 0; } @@ -16807,34 +16687,33 @@ test_get_link_info_invalid_params(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); goto error; } if ((gcpl_id = H5Pcreate(H5P_GROUP_CREATE)) < 0) { H5_FAILED(); - HDprintf(" couldn't create a GCPL\n"); + printf(" couldn't create a GCPL\n"); goto error; } if ((group_id = H5Gcreate2(container_group, GET_LINK_INFO_INVALID_PARAMS_TEST_GROUP_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container subgroup '%s'\n", - GET_LINK_INFO_INVALID_PARAMS_TEST_GROUP_NAME); + printf(" couldn't create container subgroup '%s'\n", GET_LINK_INFO_INVALID_PARAMS_TEST_GROUP_NAME); goto error; } if (H5Lcreate_hard(group_id, ".", group_id, GET_LINK_INFO_INVALID_PARAMS_TEST_HARD_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create hard link '%s'\n", GET_LINK_INFO_INVALID_PARAMS_TEST_HARD_LINK_NAME); + printf(" couldn't create hard link '%s'\n", GET_LINK_INFO_INVALID_PARAMS_TEST_HARD_LINK_NAME); goto error; } @@ -16842,14 +16721,14 @@ test_get_link_info_invalid_params(void) if ((link_exists = H5Lexists(group_id, GET_LINK_INFO_INVALID_PARAMS_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if hard link '%s' exists\n", - GET_LINK_INFO_INVALID_PARAMS_TEST_HARD_LINK_NAME); + printf(" couldn't determine if hard link '%s' exists\n", + GET_LINK_INFO_INVALID_PARAMS_TEST_HARD_LINK_NAME); goto error; } if (!link_exists) { H5_FAILED(); - HDprintf(" hard link did not exist\n"); + printf(" hard link did not exist\n"); goto error; } @@ -16861,7 +16740,7 @@ test_get_link_info_invalid_params(void) { TESTING_2("H5Lget_info2 with an invalid location ID"); - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); H5E_BEGIN_TRY { @@ -16872,7 +16751,7 @@ test_get_link_info_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Lget_info2 succeeded with an invalid location ID!\n"); + printf(" H5Lget_info2 succeeded with an invalid location ID!\n"); PART_ERROR(H5Lget_info_invalid_loc_id); } @@ -16892,7 +16771,7 @@ test_get_link_info_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Lget_info2 succeeded with a NULL link name!\n"); + printf(" H5Lget_info2 succeeded with a NULL link name!\n"); PART_ERROR(H5Lget_info_invalid_link_name); } @@ -16904,7 +16783,7 @@ test_get_link_info_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Lget_info2 succeeded with an invalid link name of ''!\n"); + printf(" H5Lget_info2 succeeded with an invalid link name of ''!\n"); PART_ERROR(H5Lget_info_invalid_link_name); } @@ -16925,7 +16804,7 @@ test_get_link_info_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Lget_info2 succeeded with an invalid LAPL!\n"); + printf(" H5Lget_info2 succeeded with an invalid LAPL!\n"); PART_ERROR(H5Lget_info_invalid_lapl); } @@ -16933,7 +16812,7 @@ test_get_link_info_invalid_params(void) } PART_END(H5Lget_info_invalid_lapl); - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); PART_BEGIN(H5Lget_info_by_idx_invalid_loc_id) { @@ -16948,7 +16827,7 @@ test_get_link_info_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Lget_info_by_idx2 succeeded with an invalid location ID!\n"); + printf(" H5Lget_info_by_idx2 succeeded with an invalid location ID!\n"); PART_ERROR(H5Lget_info_by_idx_invalid_loc_id); } @@ -16969,7 +16848,7 @@ test_get_link_info_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Lget_info_by_idx2 succeeded with a NULL group name!\n"); + printf(" H5Lget_info_by_idx2 succeeded with a NULL group name!\n"); PART_ERROR(H5Lget_info_by_idx_invalid_grp_name); } @@ -16982,7 +16861,7 @@ test_get_link_info_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Lget_info_by_idx2 succeeded with an invalid group name of ''!\n"); + printf(" H5Lget_info_by_idx2 succeeded with an invalid group name of ''!\n"); PART_ERROR(H5Lget_info_by_idx_invalid_grp_name); } @@ -17003,7 +16882,7 @@ test_get_link_info_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Lget_info_by_idx2 succeeded with invalid index type H5_INDEX_UNKNOWN!\n"); + printf(" H5Lget_info_by_idx2 succeeded with invalid index type H5_INDEX_UNKNOWN!\n"); PART_ERROR(H5Lget_info_by_idx_invalid_index_type); } @@ -17016,7 +16895,7 @@ test_get_link_info_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Lget_info_by_idx2 succeeded with invalid index type H5_INDEX_N!\n"); + printf(" H5Lget_info_by_idx2 succeeded with invalid index type H5_INDEX_N!\n"); PART_ERROR(H5Lget_info_by_idx_invalid_index_type); } @@ -17037,7 +16916,7 @@ test_get_link_info_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf( + printf( " H5Lget_info_by_idx2 succeeded with invalid iteration ordering H5_ITER_UNKNOWN!\n"); PART_ERROR(H5Lget_info_by_idx_invalid_iter_order); } @@ -17051,7 +16930,7 @@ test_get_link_info_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Lget_info_by_idx2 succeeded with invalid iteration ordering H5_ITER_N!\n"); + printf(" H5Lget_info_by_idx2 succeeded with invalid iteration ordering H5_ITER_N!\n"); PART_ERROR(H5Lget_info_by_idx_invalid_iter_order); } @@ -17072,7 +16951,7 @@ test_get_link_info_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Lget_info_by_idx2 succeeded with an invalid LAPL!\n"); + printf(" H5Lget_info_by_idx2 succeeded with an invalid LAPL!\n"); PART_ERROR(H5Lget_info_by_idx_invalid_lapl); } @@ -17134,8 +17013,8 @@ test_get_link_name(void) !(vol_cap_flags_g & H5VL_CAP_FLAG_HARD_LINKS) || !(vol_cap_flags_g & H5VL_CAP_FLAG_EXTERNAL_LINKS) || !(vol_cap_flags_g & H5VL_CAP_FLAG_SOFT_LINKS)) { SKIPPED(); - HDprintf(" API functions for basic file, group, link, soft link, hard link, or external link " - "aren't supported with this connector\n"); + printf(" API functions for basic file, group, link, soft link, hard link, or external link " + "aren't supported with this connector\n"); return 0; } @@ -17143,26 +17022,26 @@ test_get_link_name(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); goto error; } if ((gcpl_id = H5Pcreate(H5P_GROUP_CREATE)) < 0) { H5_FAILED(); - HDprintf(" couldn't create GCPL for link creation order tracking\n"); + printf(" couldn't create GCPL for link creation order tracking\n"); goto error; } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (H5Pset_link_creation_order(gcpl_id, H5P_CRT_ORDER_TRACKED) < 0) { H5_FAILED(); - HDprintf(" couldn't set link creation order tracking\n"); + printf(" couldn't set link creation order tracking\n"); goto error; } } @@ -17170,7 +17049,7 @@ test_get_link_name(void) if ((group_id = H5Gcreate2(container_group, GET_LINK_NAME_TEST_GROUP_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container subgroup '%s'\n", GET_LINK_NAME_TEST_GROUP_NAME); + printf(" couldn't create container subgroup '%s'\n", GET_LINK_NAME_TEST_GROUP_NAME); goto error; } @@ -17184,7 +17063,7 @@ test_get_link_name(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" creation order tracking isn't supported with this VOL connector\n"); + printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Lget_name_by_idx_hard_crt_order_increasing); } @@ -17192,8 +17071,8 @@ test_get_link_name(void) if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_NAME_TEST_HARD_SUBGROUP_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container subgroup '%s'\n", - GET_LINK_NAME_TEST_HARD_SUBGROUP_NAME); + printf(" couldn't create container subgroup '%s'\n", + GET_LINK_NAME_TEST_HARD_SUBGROUP_NAME); PART_ERROR(H5Lget_name_by_idx_hard_crt_order_increasing); } @@ -17201,64 +17080,64 @@ test_get_link_name(void) if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, GET_LINK_NAME_TEST_HARD_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to create hard link '%s'\n", GET_LINK_NAME_TEST_HARD_LINK_NAME3); + printf(" failed to create hard link '%s'\n", GET_LINK_NAME_TEST_HARD_LINK_NAME3); PART_ERROR(H5Lget_name_by_idx_hard_crt_order_increasing); } if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, GET_LINK_NAME_TEST_HARD_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to create hard link '%s'\n", GET_LINK_NAME_TEST_HARD_LINK_NAME2); + printf(" failed to create hard link '%s'\n", GET_LINK_NAME_TEST_HARD_LINK_NAME2); PART_ERROR(H5Lget_name_by_idx_hard_crt_order_increasing); } if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, GET_LINK_NAME_TEST_HARD_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to create hard link '%s'\n", GET_LINK_NAME_TEST_HARD_LINK_NAME); + printf(" failed to create hard link '%s'\n", GET_LINK_NAME_TEST_HARD_LINK_NAME); PART_ERROR(H5Lget_name_by_idx_hard_crt_order_increasing); } /* Verify the links have been created */ if ((link_exists = H5Lexists(subgroup_id, GET_LINK_NAME_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if hard link '%s' exists\n", - GET_LINK_NAME_TEST_HARD_LINK_NAME); + printf(" couldn't determine if hard link '%s' exists\n", + GET_LINK_NAME_TEST_HARD_LINK_NAME); PART_ERROR(H5Lget_name_by_idx_hard_crt_order_increasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" hard link '%s' did not exist before name retrieval\n", - GET_LINK_NAME_TEST_HARD_LINK_NAME); + printf(" hard link '%s' did not exist before name retrieval\n", + GET_LINK_NAME_TEST_HARD_LINK_NAME); PART_ERROR(H5Lget_name_by_idx_hard_crt_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_NAME_TEST_HARD_LINK_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if hard link '%s' exists\n", - GET_LINK_NAME_TEST_HARD_LINK_NAME2); + printf(" couldn't determine if hard link '%s' exists\n", + GET_LINK_NAME_TEST_HARD_LINK_NAME2); PART_ERROR(H5Lget_name_by_idx_hard_crt_order_increasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" hard link '%s' did not exist before name retrieval\n", - GET_LINK_NAME_TEST_HARD_LINK_NAME2); + printf(" hard link '%s' did not exist before name retrieval\n", + GET_LINK_NAME_TEST_HARD_LINK_NAME2); PART_ERROR(H5Lget_name_by_idx_hard_crt_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_NAME_TEST_HARD_LINK_NAME3, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if hard link '%s' exists\n", - GET_LINK_NAME_TEST_HARD_LINK_NAME3); + printf(" couldn't determine if hard link '%s' exists\n", + GET_LINK_NAME_TEST_HARD_LINK_NAME3); PART_ERROR(H5Lget_name_by_idx_hard_crt_order_increasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" hard link '%s' did not exist before name retrieval\n", - GET_LINK_NAME_TEST_HARD_LINK_NAME3); + printf(" hard link '%s' did not exist before name retrieval\n", + GET_LINK_NAME_TEST_HARD_LINK_NAME3); PART_ERROR(H5Lget_name_by_idx_hard_crt_order_increasing); } @@ -17266,72 +17145,72 @@ test_get_link_name(void) if ((link_name_buf_size = H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 0, NULL, 0, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve link name size\n"); + printf(" failed to retrieve link name size\n"); PART_ERROR(H5Lget_name_by_idx_hard_crt_order_increasing); } if (H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 0, link_name_buf, (size_t)link_name_buf_size + 1, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve link name\n"); + printf(" failed to retrieve link name\n"); PART_ERROR(H5Lget_name_by_idx_hard_crt_order_increasing); } if (HDstrncmp(link_name_buf, GET_LINK_NAME_TEST_HARD_LINK_NAME3, strlen(GET_LINK_NAME_TEST_HARD_LINK_NAME3) + 1)) { H5_FAILED(); - HDprintf(" link name '%s' did not match expected name '%s'\n", link_name_buf, - GET_LINK_NAME_TEST_HARD_LINK_NAME3); + printf(" link name '%s' did not match expected name '%s'\n", link_name_buf, + GET_LINK_NAME_TEST_HARD_LINK_NAME3); PART_ERROR(H5Lget_name_by_idx_hard_crt_order_increasing); } if ((link_name_buf_size = H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 1, NULL, 0, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve link name size\n"); + printf(" failed to retrieve link name size\n"); PART_ERROR(H5Lget_name_by_idx_hard_crt_order_increasing); } if (H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 1, link_name_buf, (size_t)link_name_buf_size + 1, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve link name\n"); + printf(" failed to retrieve link name\n"); PART_ERROR(H5Lget_name_by_idx_hard_crt_order_increasing); } if (HDstrncmp(link_name_buf, GET_LINK_NAME_TEST_HARD_LINK_NAME2, strlen(GET_LINK_NAME_TEST_HARD_LINK_NAME2) + 1)) { H5_FAILED(); - HDprintf(" link name '%s' did not match expected name '%s'\n", link_name_buf, - GET_LINK_NAME_TEST_HARD_LINK_NAME2); + printf(" link name '%s' did not match expected name '%s'\n", link_name_buf, + GET_LINK_NAME_TEST_HARD_LINK_NAME2); PART_ERROR(H5Lget_name_by_idx_hard_crt_order_increasing); } if ((link_name_buf_size = H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 2, NULL, 0, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve link name size\n"); + printf(" failed to retrieve link name size\n"); PART_ERROR(H5Lget_name_by_idx_hard_crt_order_increasing); } if (H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 2, link_name_buf, (size_t)link_name_buf_size + 1, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve link name\n"); + printf(" failed to retrieve link name\n"); PART_ERROR(H5Lget_name_by_idx_hard_crt_order_increasing); } if (HDstrncmp(link_name_buf, GET_LINK_NAME_TEST_HARD_LINK_NAME, strlen(GET_LINK_NAME_TEST_HARD_LINK_NAME) + 1)) { H5_FAILED(); - HDprintf(" link name '%s' did not match expected name '%s'\n", link_name_buf, - GET_LINK_NAME_TEST_HARD_LINK_NAME); + printf(" link name '%s' did not match expected name '%s'\n", link_name_buf, + GET_LINK_NAME_TEST_HARD_LINK_NAME); PART_ERROR(H5Lget_name_by_idx_hard_crt_order_increasing); } if (H5Gclose(subgroup_id) < 0) { H5_FAILED(); - HDprintf(" failed to close group\n"); + printf(" failed to close group\n"); PART_ERROR(H5Lget_name_by_idx_hard_crt_order_increasing); } @@ -17352,7 +17231,7 @@ test_get_link_name(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" creation order tracking isn't supported with this VOL connector\n"); + printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Lget_name_by_idx_hard_crt_order_decreasing); } @@ -17360,8 +17239,8 @@ test_get_link_name(void) if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_NAME_TEST_HARD_SUBGROUP_NAME2, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container subgroup '%s'\n", - GET_LINK_NAME_TEST_HARD_SUBGROUP_NAME2); + printf(" couldn't create container subgroup '%s'\n", + GET_LINK_NAME_TEST_HARD_SUBGROUP_NAME2); PART_ERROR(H5Lget_name_by_idx_hard_crt_order_decreasing); } @@ -17369,64 +17248,64 @@ test_get_link_name(void) if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, GET_LINK_NAME_TEST_HARD_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to create hard link '%s'\n", GET_LINK_NAME_TEST_HARD_LINK_NAME3); + printf(" failed to create hard link '%s'\n", GET_LINK_NAME_TEST_HARD_LINK_NAME3); PART_ERROR(H5Lget_name_by_idx_hard_crt_order_decreasing); } if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, GET_LINK_NAME_TEST_HARD_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to create hard link '%s'\n", GET_LINK_NAME_TEST_HARD_LINK_NAME2); + printf(" failed to create hard link '%s'\n", GET_LINK_NAME_TEST_HARD_LINK_NAME2); PART_ERROR(H5Lget_name_by_idx_hard_crt_order_decreasing); } if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, GET_LINK_NAME_TEST_HARD_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to create hard link '%s'\n", GET_LINK_NAME_TEST_HARD_LINK_NAME); + printf(" failed to create hard link '%s'\n", GET_LINK_NAME_TEST_HARD_LINK_NAME); PART_ERROR(H5Lget_name_by_idx_hard_crt_order_decreasing); } /* Verify the links have been created */ if ((link_exists = H5Lexists(subgroup_id, GET_LINK_NAME_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if hard link '%s' exists\n", - GET_LINK_NAME_TEST_HARD_LINK_NAME); + printf(" couldn't determine if hard link '%s' exists\n", + GET_LINK_NAME_TEST_HARD_LINK_NAME); PART_ERROR(H5Lget_name_by_idx_hard_crt_order_decreasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" hard link '%s' did not exist before name retrieval\n", - GET_LINK_NAME_TEST_HARD_LINK_NAME); + printf(" hard link '%s' did not exist before name retrieval\n", + GET_LINK_NAME_TEST_HARD_LINK_NAME); PART_ERROR(H5Lget_name_by_idx_hard_crt_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_NAME_TEST_HARD_LINK_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if hard link '%s' exists\n", - GET_LINK_NAME_TEST_HARD_LINK_NAME2); + printf(" couldn't determine if hard link '%s' exists\n", + GET_LINK_NAME_TEST_HARD_LINK_NAME2); PART_ERROR(H5Lget_name_by_idx_hard_crt_order_decreasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" hard link '%s' did not exist before name retrieval\n", - GET_LINK_NAME_TEST_HARD_LINK_NAME2); + printf(" hard link '%s' did not exist before name retrieval\n", + GET_LINK_NAME_TEST_HARD_LINK_NAME2); PART_ERROR(H5Lget_name_by_idx_hard_crt_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_NAME_TEST_HARD_LINK_NAME3, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if hard link '%s' exists\n", - GET_LINK_NAME_TEST_HARD_LINK_NAME3); + printf(" couldn't determine if hard link '%s' exists\n", + GET_LINK_NAME_TEST_HARD_LINK_NAME3); PART_ERROR(H5Lget_name_by_idx_hard_crt_order_decreasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" hard link '%s' did not exist before name retrieval\n", - GET_LINK_NAME_TEST_HARD_LINK_NAME3); + printf(" hard link '%s' did not exist before name retrieval\n", + GET_LINK_NAME_TEST_HARD_LINK_NAME3); PART_ERROR(H5Lget_name_by_idx_hard_crt_order_decreasing); } @@ -17434,72 +17313,72 @@ test_get_link_name(void) if ((link_name_buf_size = H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 0, NULL, 0, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve link name size\n"); + printf(" failed to retrieve link name size\n"); PART_ERROR(H5Lget_name_by_idx_hard_crt_order_decreasing); } if (H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 0, link_name_buf, (size_t)link_name_buf_size + 1, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve link name\n"); + printf(" failed to retrieve link name\n"); PART_ERROR(H5Lget_name_by_idx_hard_crt_order_decreasing); } if (HDstrncmp(link_name_buf, GET_LINK_NAME_TEST_HARD_LINK_NAME, strlen(GET_LINK_NAME_TEST_HARD_LINK_NAME) + 1)) { H5_FAILED(); - HDprintf(" link name '%s' did not match expected name '%s'\n", link_name_buf, - GET_LINK_NAME_TEST_HARD_LINK_NAME); + printf(" link name '%s' did not match expected name '%s'\n", link_name_buf, + GET_LINK_NAME_TEST_HARD_LINK_NAME); PART_ERROR(H5Lget_name_by_idx_hard_crt_order_decreasing); } if ((link_name_buf_size = H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 1, NULL, 0, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve link name size\n"); + printf(" failed to retrieve link name size\n"); PART_ERROR(H5Lget_name_by_idx_hard_crt_order_decreasing); } if (H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 1, link_name_buf, (size_t)link_name_buf_size + 1, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve link name\n"); + printf(" failed to retrieve link name\n"); PART_ERROR(H5Lget_name_by_idx_hard_crt_order_decreasing); } if (HDstrncmp(link_name_buf, GET_LINK_NAME_TEST_HARD_LINK_NAME2, strlen(GET_LINK_NAME_TEST_HARD_LINK_NAME2) + 1)) { H5_FAILED(); - HDprintf(" link name '%s' did not match expected name '%s'\n", link_name_buf, - GET_LINK_NAME_TEST_HARD_LINK_NAME2); + printf(" link name '%s' did not match expected name '%s'\n", link_name_buf, + GET_LINK_NAME_TEST_HARD_LINK_NAME2); PART_ERROR(H5Lget_name_by_idx_hard_crt_order_decreasing); } if ((link_name_buf_size = H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 2, NULL, 0, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve link name size\n"); + printf(" failed to retrieve link name size\n"); PART_ERROR(H5Lget_name_by_idx_hard_crt_order_decreasing); } if (H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 2, link_name_buf, (size_t)link_name_buf_size + 1, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve link name\n"); + printf(" failed to retrieve link name\n"); PART_ERROR(H5Lget_name_by_idx_hard_crt_order_decreasing); } if (HDstrncmp(link_name_buf, GET_LINK_NAME_TEST_HARD_LINK_NAME3, strlen(GET_LINK_NAME_TEST_HARD_LINK_NAME3) + 1)) { H5_FAILED(); - HDprintf(" link name '%s' did not match expected name '%s'\n", link_name_buf, - GET_LINK_NAME_TEST_HARD_LINK_NAME3); + printf(" link name '%s' did not match expected name '%s'\n", link_name_buf, + GET_LINK_NAME_TEST_HARD_LINK_NAME3); PART_ERROR(H5Lget_name_by_idx_hard_crt_order_decreasing); } if (H5Gclose(subgroup_id) < 0) { H5_FAILED(); - HDprintf(" failed to close group\n"); + printf(" failed to close group\n"); PART_ERROR(H5Lget_name_by_idx_hard_crt_order_decreasing); } @@ -17522,8 +17401,8 @@ test_get_link_name(void) if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_NAME_TEST_HARD_SUBGROUP_NAME3, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container subgroup '%s'\n", - GET_LINK_NAME_TEST_HARD_SUBGROUP_NAME3); + printf(" couldn't create container subgroup '%s'\n", + GET_LINK_NAME_TEST_HARD_SUBGROUP_NAME3); PART_ERROR(H5Lget_name_by_idx_hard_name_order_increasing); } @@ -17531,64 +17410,64 @@ test_get_link_name(void) if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, GET_LINK_NAME_TEST_HARD_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to create hard link '%s'\n", GET_LINK_NAME_TEST_HARD_LINK_NAME); + printf(" failed to create hard link '%s'\n", GET_LINK_NAME_TEST_HARD_LINK_NAME); PART_ERROR(H5Lget_name_by_idx_hard_name_order_increasing); } if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, GET_LINK_NAME_TEST_HARD_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to create hard link '%s'\n", GET_LINK_NAME_TEST_HARD_LINK_NAME2); + printf(" failed to create hard link '%s'\n", GET_LINK_NAME_TEST_HARD_LINK_NAME2); PART_ERROR(H5Lget_name_by_idx_hard_name_order_increasing); } if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, GET_LINK_NAME_TEST_HARD_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to create hard link '%s'\n", GET_LINK_NAME_TEST_HARD_LINK_NAME3); + printf(" failed to create hard link '%s'\n", GET_LINK_NAME_TEST_HARD_LINK_NAME3); PART_ERROR(H5Lget_name_by_idx_hard_name_order_increasing); } /* Verify the links have been created */ if ((link_exists = H5Lexists(subgroup_id, GET_LINK_NAME_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if hard link '%s' exists\n", - GET_LINK_NAME_TEST_HARD_LINK_NAME); + printf(" couldn't determine if hard link '%s' exists\n", + GET_LINK_NAME_TEST_HARD_LINK_NAME); PART_ERROR(H5Lget_name_by_idx_hard_name_order_increasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" hard link '%s' did not exist before name retrieval\n", - GET_LINK_NAME_TEST_HARD_LINK_NAME); + printf(" hard link '%s' did not exist before name retrieval\n", + GET_LINK_NAME_TEST_HARD_LINK_NAME); PART_ERROR(H5Lget_name_by_idx_hard_name_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_NAME_TEST_HARD_LINK_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if hard link '%s' exists\n", - GET_LINK_NAME_TEST_HARD_LINK_NAME2); + printf(" couldn't determine if hard link '%s' exists\n", + GET_LINK_NAME_TEST_HARD_LINK_NAME2); PART_ERROR(H5Lget_name_by_idx_hard_name_order_increasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" hard link '%s' did not exist before name retrieval\n", - GET_LINK_NAME_TEST_HARD_LINK_NAME2); + printf(" hard link '%s' did not exist before name retrieval\n", + GET_LINK_NAME_TEST_HARD_LINK_NAME2); PART_ERROR(H5Lget_name_by_idx_hard_name_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_NAME_TEST_HARD_LINK_NAME3, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if hard link '%s' exists\n", - GET_LINK_NAME_TEST_HARD_LINK_NAME3); + printf(" couldn't determine if hard link '%s' exists\n", + GET_LINK_NAME_TEST_HARD_LINK_NAME3); PART_ERROR(H5Lget_name_by_idx_hard_name_order_increasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" hard link '%s' did not exist before name retrieval\n", - GET_LINK_NAME_TEST_HARD_LINK_NAME3); + printf(" hard link '%s' did not exist before name retrieval\n", + GET_LINK_NAME_TEST_HARD_LINK_NAME3); PART_ERROR(H5Lget_name_by_idx_hard_name_order_increasing); } @@ -17596,72 +17475,72 @@ test_get_link_name(void) if ((link_name_buf_size = H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 0, NULL, 0, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve link name size\n"); + printf(" failed to retrieve link name size\n"); PART_ERROR(H5Lget_name_by_idx_hard_name_order_increasing); } if (H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 0, link_name_buf, (size_t)link_name_buf_size + 1, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve link name\n"); + printf(" failed to retrieve link name\n"); PART_ERROR(H5Lget_name_by_idx_hard_name_order_increasing); } if (HDstrncmp(link_name_buf, GET_LINK_NAME_TEST_HARD_LINK_NAME, strlen(GET_LINK_NAME_TEST_HARD_LINK_NAME) + 1)) { H5_FAILED(); - HDprintf(" link name '%s' did not match expected name '%s'\n", link_name_buf, - GET_LINK_NAME_TEST_HARD_LINK_NAME); + printf(" link name '%s' did not match expected name '%s'\n", link_name_buf, + GET_LINK_NAME_TEST_HARD_LINK_NAME); PART_ERROR(H5Lget_name_by_idx_hard_name_order_increasing); } if ((link_name_buf_size = H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 1, NULL, 0, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve link name size\n"); + printf(" failed to retrieve link name size\n"); PART_ERROR(H5Lget_name_by_idx_hard_name_order_increasing); } if (H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 1, link_name_buf, (size_t)link_name_buf_size + 1, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve link name\n"); + printf(" failed to retrieve link name\n"); PART_ERROR(H5Lget_name_by_idx_hard_name_order_increasing); } if (HDstrncmp(link_name_buf, GET_LINK_NAME_TEST_HARD_LINK_NAME2, strlen(GET_LINK_NAME_TEST_HARD_LINK_NAME2) + 1)) { H5_FAILED(); - HDprintf(" link name '%s' did not match expected name '%s'\n", link_name_buf, - GET_LINK_NAME_TEST_HARD_LINK_NAME2); + printf(" link name '%s' did not match expected name '%s'\n", link_name_buf, + GET_LINK_NAME_TEST_HARD_LINK_NAME2); PART_ERROR(H5Lget_name_by_idx_hard_name_order_increasing); } if ((link_name_buf_size = H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 2, NULL, 0, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve link name size\n"); + printf(" failed to retrieve link name size\n"); PART_ERROR(H5Lget_name_by_idx_hard_name_order_increasing); } if (H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 2, link_name_buf, (size_t)link_name_buf_size + 1, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve link name\n"); + printf(" failed to retrieve link name\n"); PART_ERROR(H5Lget_name_by_idx_hard_name_order_increasing); } if (HDstrncmp(link_name_buf, GET_LINK_NAME_TEST_HARD_LINK_NAME3, strlen(GET_LINK_NAME_TEST_HARD_LINK_NAME3) + 1)) { H5_FAILED(); - HDprintf(" link name '%s' did not match expected name '%s'\n", link_name_buf, - GET_LINK_NAME_TEST_HARD_LINK_NAME3); + printf(" link name '%s' did not match expected name '%s'\n", link_name_buf, + GET_LINK_NAME_TEST_HARD_LINK_NAME3); PART_ERROR(H5Lget_name_by_idx_hard_name_order_increasing); } if (H5Gclose(subgroup_id) < 0) { H5_FAILED(); - HDprintf(" failed to close group\n"); + printf(" failed to close group\n"); PART_ERROR(H5Lget_name_by_idx_hard_name_order_increasing); } @@ -17684,8 +17563,8 @@ test_get_link_name(void) if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_NAME_TEST_HARD_SUBGROUP_NAME4, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container subgroup '%s'\n", - GET_LINK_NAME_TEST_HARD_SUBGROUP_NAME4); + printf(" couldn't create container subgroup '%s'\n", + GET_LINK_NAME_TEST_HARD_SUBGROUP_NAME4); PART_ERROR(H5Lget_name_by_idx_hard_name_order_decreasing); } @@ -17693,64 +17572,64 @@ test_get_link_name(void) if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, GET_LINK_NAME_TEST_HARD_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to create hard link '%s'\n", GET_LINK_NAME_TEST_HARD_LINK_NAME); + printf(" failed to create hard link '%s'\n", GET_LINK_NAME_TEST_HARD_LINK_NAME); PART_ERROR(H5Lget_name_by_idx_hard_name_order_decreasing); } if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, GET_LINK_NAME_TEST_HARD_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to create hard link '%s'\n", GET_LINK_NAME_TEST_HARD_LINK_NAME2); + printf(" failed to create hard link '%s'\n", GET_LINK_NAME_TEST_HARD_LINK_NAME2); PART_ERROR(H5Lget_name_by_idx_hard_name_order_decreasing); } if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, GET_LINK_NAME_TEST_HARD_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to create hard link '%s'\n", GET_LINK_NAME_TEST_HARD_LINK_NAME3); + printf(" failed to create hard link '%s'\n", GET_LINK_NAME_TEST_HARD_LINK_NAME3); PART_ERROR(H5Lget_name_by_idx_hard_name_order_decreasing); } /* Verify the links have been created */ if ((link_exists = H5Lexists(subgroup_id, GET_LINK_NAME_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if hard link '%s' exists\n", - GET_LINK_NAME_TEST_HARD_LINK_NAME); + printf(" couldn't determine if hard link '%s' exists\n", + GET_LINK_NAME_TEST_HARD_LINK_NAME); PART_ERROR(H5Lget_name_by_idx_hard_name_order_decreasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" hard link '%s' did not exist before name retrieval\n", - GET_LINK_NAME_TEST_HARD_LINK_NAME); + printf(" hard link '%s' did not exist before name retrieval\n", + GET_LINK_NAME_TEST_HARD_LINK_NAME); PART_ERROR(H5Lget_name_by_idx_hard_name_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_NAME_TEST_HARD_LINK_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if hard link '%s' exists\n", - GET_LINK_NAME_TEST_HARD_LINK_NAME2); + printf(" couldn't determine if hard link '%s' exists\n", + GET_LINK_NAME_TEST_HARD_LINK_NAME2); PART_ERROR(H5Lget_name_by_idx_hard_name_order_decreasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" hard link '%s' did not exist before name retrieval\n", - GET_LINK_NAME_TEST_HARD_LINK_NAME2); + printf(" hard link '%s' did not exist before name retrieval\n", + GET_LINK_NAME_TEST_HARD_LINK_NAME2); PART_ERROR(H5Lget_name_by_idx_hard_name_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_NAME_TEST_HARD_LINK_NAME3, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if hard link '%s' exists\n", - GET_LINK_NAME_TEST_HARD_LINK_NAME3); + printf(" couldn't determine if hard link '%s' exists\n", + GET_LINK_NAME_TEST_HARD_LINK_NAME3); PART_ERROR(H5Lget_name_by_idx_hard_name_order_decreasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" hard link '%s' did not exist before name retrieval\n", - GET_LINK_NAME_TEST_HARD_LINK_NAME3); + printf(" hard link '%s' did not exist before name retrieval\n", + GET_LINK_NAME_TEST_HARD_LINK_NAME3); PART_ERROR(H5Lget_name_by_idx_hard_name_order_decreasing); } @@ -17758,72 +17637,72 @@ test_get_link_name(void) if ((link_name_buf_size = H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 0, NULL, 0, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve link name size\n"); + printf(" failed to retrieve link name size\n"); PART_ERROR(H5Lget_name_by_idx_hard_name_order_decreasing); } if (H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 0, link_name_buf, (size_t)link_name_buf_size + 1, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve link name\n"); + printf(" failed to retrieve link name\n"); PART_ERROR(H5Lget_name_by_idx_hard_name_order_decreasing); } if (HDstrncmp(link_name_buf, GET_LINK_NAME_TEST_HARD_LINK_NAME3, strlen(GET_LINK_NAME_TEST_HARD_LINK_NAME3) + 1)) { H5_FAILED(); - HDprintf(" link name '%s' did not match expected name '%s'\n", link_name_buf, - GET_LINK_NAME_TEST_HARD_LINK_NAME3); + printf(" link name '%s' did not match expected name '%s'\n", link_name_buf, + GET_LINK_NAME_TEST_HARD_LINK_NAME3); PART_ERROR(H5Lget_name_by_idx_hard_name_order_decreasing); } if ((link_name_buf_size = H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 1, NULL, 0, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve link name size\n"); + printf(" failed to retrieve link name size\n"); PART_ERROR(H5Lget_name_by_idx_hard_name_order_decreasing); } if (H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 1, link_name_buf, (size_t)link_name_buf_size + 1, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve link name\n"); + printf(" failed to retrieve link name\n"); PART_ERROR(H5Lget_name_by_idx_hard_name_order_decreasing); } if (HDstrncmp(link_name_buf, GET_LINK_NAME_TEST_HARD_LINK_NAME2, strlen(GET_LINK_NAME_TEST_HARD_LINK_NAME2) + 1)) { H5_FAILED(); - HDprintf(" link name '%s' did not match expected name '%s'\n", link_name_buf, - GET_LINK_NAME_TEST_HARD_LINK_NAME2); + printf(" link name '%s' did not match expected name '%s'\n", link_name_buf, + GET_LINK_NAME_TEST_HARD_LINK_NAME2); PART_ERROR(H5Lget_name_by_idx_hard_name_order_decreasing); } if ((link_name_buf_size = H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 2, NULL, 0, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve link name size\n"); + printf(" failed to retrieve link name size\n"); PART_ERROR(H5Lget_name_by_idx_hard_name_order_decreasing); } if (H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 2, link_name_buf, (size_t)link_name_buf_size + 1, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve link name\n"); + printf(" failed to retrieve link name\n"); PART_ERROR(H5Lget_name_by_idx_hard_name_order_decreasing); } if (HDstrncmp(link_name_buf, GET_LINK_NAME_TEST_HARD_LINK_NAME, strlen(GET_LINK_NAME_TEST_HARD_LINK_NAME) + 1)) { H5_FAILED(); - HDprintf(" link name '%s' did not match expected name '%s'\n", link_name_buf, - GET_LINK_NAME_TEST_HARD_LINK_NAME); + printf(" link name '%s' did not match expected name '%s'\n", link_name_buf, + GET_LINK_NAME_TEST_HARD_LINK_NAME); PART_ERROR(H5Lget_name_by_idx_hard_name_order_decreasing); } if (H5Gclose(subgroup_id) < 0) { H5_FAILED(); - HDprintf(" failed to close group\n"); + printf(" failed to close group\n"); PART_ERROR(H5Lget_name_by_idx_hard_name_order_decreasing); } @@ -17844,7 +17723,7 @@ test_get_link_name(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" creation order tracking isn't supported with this VOL connector\n"); + printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Lget_name_by_idx_soft_crt_order_increasing); } @@ -17852,8 +17731,8 @@ test_get_link_name(void) if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_NAME_TEST_SOFT_SUBGROUP_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container subgroup '%s'\n", - GET_LINK_NAME_TEST_SOFT_SUBGROUP_NAME); + printf(" couldn't create container subgroup '%s'\n", + GET_LINK_NAME_TEST_SOFT_SUBGROUP_NAME); PART_ERROR(H5Lget_name_by_idx_soft_crt_order_increasing); } @@ -17861,64 +17740,64 @@ test_get_link_name(void) if (H5Lcreate_soft("/" LINK_TEST_GROUP_NAME "/" GET_LINK_NAME_TEST_GROUP_NAME, subgroup_id, GET_LINK_NAME_TEST_SOFT_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to create soft link '%s'\n", GET_LINK_NAME_TEST_SOFT_LINK_NAME3); + printf(" failed to create soft link '%s'\n", GET_LINK_NAME_TEST_SOFT_LINK_NAME3); PART_ERROR(H5Lget_name_by_idx_soft_crt_order_increasing); } if (H5Lcreate_soft("/" LINK_TEST_GROUP_NAME "/" GET_LINK_NAME_TEST_GROUP_NAME, subgroup_id, GET_LINK_NAME_TEST_SOFT_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to create soft link '%s'\n", GET_LINK_NAME_TEST_SOFT_LINK_NAME2); + printf(" failed to create soft link '%s'\n", GET_LINK_NAME_TEST_SOFT_LINK_NAME2); PART_ERROR(H5Lget_name_by_idx_soft_crt_order_increasing); } if (H5Lcreate_soft("/" LINK_TEST_GROUP_NAME "/" GET_LINK_NAME_TEST_GROUP_NAME, subgroup_id, GET_LINK_NAME_TEST_SOFT_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to create soft link '%s'\n", GET_LINK_NAME_TEST_SOFT_LINK_NAME); + printf(" failed to create soft link '%s'\n", GET_LINK_NAME_TEST_SOFT_LINK_NAME); PART_ERROR(H5Lget_name_by_idx_soft_crt_order_increasing); } /* Verify the links have been created */ if ((link_exists = H5Lexists(subgroup_id, GET_LINK_NAME_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if soft link '%s' exists\n", - GET_LINK_NAME_TEST_SOFT_LINK_NAME); + printf(" couldn't determine if soft link '%s' exists\n", + GET_LINK_NAME_TEST_SOFT_LINK_NAME); PART_ERROR(H5Lget_name_by_idx_soft_crt_order_increasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" soft link '%s' did not exist before name retrieval\n", - GET_LINK_NAME_TEST_SOFT_LINK_NAME); + printf(" soft link '%s' did not exist before name retrieval\n", + GET_LINK_NAME_TEST_SOFT_LINK_NAME); PART_ERROR(H5Lget_name_by_idx_soft_crt_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_NAME_TEST_SOFT_LINK_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if soft link '%s' exists\n", - GET_LINK_NAME_TEST_SOFT_LINK_NAME2); + printf(" couldn't determine if soft link '%s' exists\n", + GET_LINK_NAME_TEST_SOFT_LINK_NAME2); PART_ERROR(H5Lget_name_by_idx_soft_crt_order_increasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" soft link '%s' did not exist before name retrieval\n", - GET_LINK_NAME_TEST_SOFT_LINK_NAME2); + printf(" soft link '%s' did not exist before name retrieval\n", + GET_LINK_NAME_TEST_SOFT_LINK_NAME2); PART_ERROR(H5Lget_name_by_idx_soft_crt_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_NAME_TEST_SOFT_LINK_NAME3, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if soft link '%s' exists\n", - GET_LINK_NAME_TEST_SOFT_LINK_NAME3); + printf(" couldn't determine if soft link '%s' exists\n", + GET_LINK_NAME_TEST_SOFT_LINK_NAME3); PART_ERROR(H5Lget_name_by_idx_soft_crt_order_increasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" soft link '%s' did not exist before name retrieval\n", - GET_LINK_NAME_TEST_SOFT_LINK_NAME3); + printf(" soft link '%s' did not exist before name retrieval\n", + GET_LINK_NAME_TEST_SOFT_LINK_NAME3); PART_ERROR(H5Lget_name_by_idx_soft_crt_order_increasing); } @@ -17926,72 +17805,72 @@ test_get_link_name(void) if ((link_name_buf_size = H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 0, NULL, 0, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve link name size\n"); + printf(" failed to retrieve link name size\n"); PART_ERROR(H5Lget_name_by_idx_soft_crt_order_increasing); } if (H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 0, link_name_buf, (size_t)link_name_buf_size + 1, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve link name\n"); + printf(" failed to retrieve link name\n"); PART_ERROR(H5Lget_name_by_idx_soft_crt_order_increasing); } if (HDstrncmp(link_name_buf, GET_LINK_NAME_TEST_SOFT_LINK_NAME3, strlen(GET_LINK_NAME_TEST_SOFT_LINK_NAME3) + 1)) { H5_FAILED(); - HDprintf(" link name '%s' did not match expected name '%s'\n", link_name_buf, - GET_LINK_NAME_TEST_SOFT_LINK_NAME3); + printf(" link name '%s' did not match expected name '%s'\n", link_name_buf, + GET_LINK_NAME_TEST_SOFT_LINK_NAME3); PART_ERROR(H5Lget_name_by_idx_soft_crt_order_increasing); } if ((link_name_buf_size = H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 1, NULL, 0, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve link name size\n"); + printf(" failed to retrieve link name size\n"); PART_ERROR(H5Lget_name_by_idx_soft_crt_order_increasing); } if (H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 1, link_name_buf, (size_t)link_name_buf_size + 1, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve link name\n"); + printf(" failed to retrieve link name\n"); PART_ERROR(H5Lget_name_by_idx_soft_crt_order_increasing); } if (HDstrncmp(link_name_buf, GET_LINK_NAME_TEST_SOFT_LINK_NAME2, strlen(GET_LINK_NAME_TEST_SOFT_LINK_NAME2) + 1)) { H5_FAILED(); - HDprintf(" link name '%s' did not match expected name '%s'\n", link_name_buf, - GET_LINK_NAME_TEST_SOFT_LINK_NAME2); + printf(" link name '%s' did not match expected name '%s'\n", link_name_buf, + GET_LINK_NAME_TEST_SOFT_LINK_NAME2); PART_ERROR(H5Lget_name_by_idx_soft_crt_order_increasing); } if ((link_name_buf_size = H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 2, NULL, 0, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve link name size\n"); + printf(" failed to retrieve link name size\n"); PART_ERROR(H5Lget_name_by_idx_soft_crt_order_increasing); } if (H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 2, link_name_buf, (size_t)link_name_buf_size + 1, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve link name\n"); + printf(" failed to retrieve link name\n"); PART_ERROR(H5Lget_name_by_idx_soft_crt_order_increasing); } if (HDstrncmp(link_name_buf, GET_LINK_NAME_TEST_SOFT_LINK_NAME, strlen(GET_LINK_NAME_TEST_SOFT_LINK_NAME) + 1)) { H5_FAILED(); - HDprintf(" link name '%s' did not match expected name '%s'\n", link_name_buf, - GET_LINK_NAME_TEST_SOFT_LINK_NAME); + printf(" link name '%s' did not match expected name '%s'\n", link_name_buf, + GET_LINK_NAME_TEST_SOFT_LINK_NAME); PART_ERROR(H5Lget_name_by_idx_soft_crt_order_increasing); } if (H5Gclose(subgroup_id) < 0) { H5_FAILED(); - HDprintf(" failed to close group\n"); + printf(" failed to close group\n"); PART_ERROR(H5Lget_name_by_idx_soft_crt_order_increasing); } @@ -18012,7 +17891,7 @@ test_get_link_name(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" creation order tracking isn't supported with this VOL connector\n"); + printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Lget_name_by_idx_soft_crt_order_decreasing); } @@ -18020,8 +17899,8 @@ test_get_link_name(void) if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_NAME_TEST_SOFT_SUBGROUP_NAME2, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container subgroup '%s'\n", - GET_LINK_NAME_TEST_SOFT_SUBGROUP_NAME2); + printf(" couldn't create container subgroup '%s'\n", + GET_LINK_NAME_TEST_SOFT_SUBGROUP_NAME2); PART_ERROR(H5Lget_name_by_idx_soft_crt_order_decreasing); } @@ -18029,64 +17908,64 @@ test_get_link_name(void) if (H5Lcreate_soft("/" LINK_TEST_GROUP_NAME "/" GET_LINK_NAME_TEST_GROUP_NAME, subgroup_id, GET_LINK_NAME_TEST_SOFT_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to create soft link '%s'\n", GET_LINK_NAME_TEST_SOFT_LINK_NAME3); + printf(" failed to create soft link '%s'\n", GET_LINK_NAME_TEST_SOFT_LINK_NAME3); PART_ERROR(H5Lget_name_by_idx_soft_crt_order_decreasing); } if (H5Lcreate_soft("/" LINK_TEST_GROUP_NAME "/" GET_LINK_NAME_TEST_GROUP_NAME, subgroup_id, GET_LINK_NAME_TEST_SOFT_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to create soft link '%s'\n", GET_LINK_NAME_TEST_SOFT_LINK_NAME2); + printf(" failed to create soft link '%s'\n", GET_LINK_NAME_TEST_SOFT_LINK_NAME2); PART_ERROR(H5Lget_name_by_idx_soft_crt_order_decreasing); } if (H5Lcreate_soft("/" LINK_TEST_GROUP_NAME "/" GET_LINK_NAME_TEST_GROUP_NAME, subgroup_id, GET_LINK_NAME_TEST_SOFT_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to create soft link '%s'\n", GET_LINK_NAME_TEST_SOFT_LINK_NAME); + printf(" failed to create soft link '%s'\n", GET_LINK_NAME_TEST_SOFT_LINK_NAME); PART_ERROR(H5Lget_name_by_idx_soft_crt_order_decreasing); } /* Verify the links have been created */ if ((link_exists = H5Lexists(subgroup_id, GET_LINK_NAME_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if soft link '%s' exists\n", - GET_LINK_NAME_TEST_SOFT_LINK_NAME); + printf(" couldn't determine if soft link '%s' exists\n", + GET_LINK_NAME_TEST_SOFT_LINK_NAME); PART_ERROR(H5Lget_name_by_idx_soft_crt_order_decreasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" soft link '%s' did not exist before name retrieval\n", - GET_LINK_NAME_TEST_SOFT_LINK_NAME); + printf(" soft link '%s' did not exist before name retrieval\n", + GET_LINK_NAME_TEST_SOFT_LINK_NAME); PART_ERROR(H5Lget_name_by_idx_soft_crt_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_NAME_TEST_SOFT_LINK_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if soft link '%s' exists\n", - GET_LINK_NAME_TEST_SOFT_LINK_NAME2); + printf(" couldn't determine if soft link '%s' exists\n", + GET_LINK_NAME_TEST_SOFT_LINK_NAME2); PART_ERROR(H5Lget_name_by_idx_soft_crt_order_decreasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" soft link '%s' did not exist before name retrieval\n", - GET_LINK_NAME_TEST_SOFT_LINK_NAME2); + printf(" soft link '%s' did not exist before name retrieval\n", + GET_LINK_NAME_TEST_SOFT_LINK_NAME2); PART_ERROR(H5Lget_name_by_idx_soft_crt_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_NAME_TEST_SOFT_LINK_NAME3, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if soft link '%s' exists\n", - GET_LINK_NAME_TEST_SOFT_LINK_NAME3); + printf(" couldn't determine if soft link '%s' exists\n", + GET_LINK_NAME_TEST_SOFT_LINK_NAME3); PART_ERROR(H5Lget_name_by_idx_soft_crt_order_decreasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" soft link '%s' did not exist before name retrieval\n", - GET_LINK_NAME_TEST_SOFT_LINK_NAME3); + printf(" soft link '%s' did not exist before name retrieval\n", + GET_LINK_NAME_TEST_SOFT_LINK_NAME3); PART_ERROR(H5Lget_name_by_idx_soft_crt_order_decreasing); } @@ -18094,72 +17973,72 @@ test_get_link_name(void) if ((link_name_buf_size = H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 0, NULL, 0, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve link name size\n"); + printf(" failed to retrieve link name size\n"); PART_ERROR(H5Lget_name_by_idx_soft_crt_order_decreasing); } if (H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 0, link_name_buf, (size_t)link_name_buf_size + 1, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve link name\n"); + printf(" failed to retrieve link name\n"); PART_ERROR(H5Lget_name_by_idx_soft_crt_order_decreasing); } if (HDstrncmp(link_name_buf, GET_LINK_NAME_TEST_SOFT_LINK_NAME, strlen(GET_LINK_NAME_TEST_SOFT_LINK_NAME) + 1)) { H5_FAILED(); - HDprintf(" link name '%s' did not match expected name '%s'\n", link_name_buf, - GET_LINK_NAME_TEST_SOFT_LINK_NAME); + printf(" link name '%s' did not match expected name '%s'\n", link_name_buf, + GET_LINK_NAME_TEST_SOFT_LINK_NAME); PART_ERROR(H5Lget_name_by_idx_soft_crt_order_decreasing); } if ((link_name_buf_size = H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 1, NULL, 0, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve link name size\n"); + printf(" failed to retrieve link name size\n"); PART_ERROR(H5Lget_name_by_idx_soft_crt_order_decreasing); } if (H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 1, link_name_buf, (size_t)link_name_buf_size + 1, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve link name\n"); + printf(" failed to retrieve link name\n"); PART_ERROR(H5Lget_name_by_idx_soft_crt_order_decreasing); } if (HDstrncmp(link_name_buf, GET_LINK_NAME_TEST_SOFT_LINK_NAME2, strlen(GET_LINK_NAME_TEST_SOFT_LINK_NAME2) + 1)) { H5_FAILED(); - HDprintf(" link name '%s' did not match expected name '%s'\n", link_name_buf, - GET_LINK_NAME_TEST_SOFT_LINK_NAME2); + printf(" link name '%s' did not match expected name '%s'\n", link_name_buf, + GET_LINK_NAME_TEST_SOFT_LINK_NAME2); PART_ERROR(H5Lget_name_by_idx_soft_crt_order_decreasing); } if ((link_name_buf_size = H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 2, NULL, 0, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve link name size\n"); + printf(" failed to retrieve link name size\n"); PART_ERROR(H5Lget_name_by_idx_soft_crt_order_decreasing); } if (H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 2, link_name_buf, (size_t)link_name_buf_size + 1, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve link name\n"); + printf(" failed to retrieve link name\n"); PART_ERROR(H5Lget_name_by_idx_soft_crt_order_decreasing); } if (HDstrncmp(link_name_buf, GET_LINK_NAME_TEST_SOFT_LINK_NAME3, strlen(GET_LINK_NAME_TEST_SOFT_LINK_NAME3) + 1)) { H5_FAILED(); - HDprintf(" link name '%s' did not match expected name '%s'\n", link_name_buf, - GET_LINK_NAME_TEST_SOFT_LINK_NAME3); + printf(" link name '%s' did not match expected name '%s'\n", link_name_buf, + GET_LINK_NAME_TEST_SOFT_LINK_NAME3); PART_ERROR(H5Lget_name_by_idx_soft_crt_order_decreasing); } if (H5Gclose(subgroup_id) < 0) { H5_FAILED(); - HDprintf(" failed to close group\n"); + printf(" failed to close group\n"); PART_ERROR(H5Lget_name_by_idx_soft_crt_order_decreasing); } @@ -18182,8 +18061,8 @@ test_get_link_name(void) if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_NAME_TEST_SOFT_SUBGROUP_NAME3, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container subgroup '%s'\n", - GET_LINK_NAME_TEST_SOFT_SUBGROUP_NAME3); + printf(" couldn't create container subgroup '%s'\n", + GET_LINK_NAME_TEST_SOFT_SUBGROUP_NAME3); PART_ERROR(H5Lget_name_by_idx_soft_name_order_increasing); } @@ -18191,64 +18070,64 @@ test_get_link_name(void) if (H5Lcreate_soft("/" LINK_TEST_GROUP_NAME "/" GET_LINK_NAME_TEST_GROUP_NAME, subgroup_id, GET_LINK_NAME_TEST_SOFT_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to create soft link '%s'\n", GET_LINK_NAME_TEST_SOFT_LINK_NAME); + printf(" failed to create soft link '%s'\n", GET_LINK_NAME_TEST_SOFT_LINK_NAME); PART_ERROR(H5Lget_name_by_idx_soft_name_order_increasing); } if (H5Lcreate_soft("/" LINK_TEST_GROUP_NAME "/" GET_LINK_NAME_TEST_GROUP_NAME, subgroup_id, GET_LINK_NAME_TEST_SOFT_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to create soft link '%s'\n", GET_LINK_NAME_TEST_SOFT_LINK_NAME2); + printf(" failed to create soft link '%s'\n", GET_LINK_NAME_TEST_SOFT_LINK_NAME2); PART_ERROR(H5Lget_name_by_idx_soft_name_order_increasing); } if (H5Lcreate_soft("/" LINK_TEST_GROUP_NAME "/" GET_LINK_NAME_TEST_GROUP_NAME, subgroup_id, GET_LINK_NAME_TEST_SOFT_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to create soft link '%s'\n", GET_LINK_NAME_TEST_SOFT_LINK_NAME3); + printf(" failed to create soft link '%s'\n", GET_LINK_NAME_TEST_SOFT_LINK_NAME3); PART_ERROR(H5Lget_name_by_idx_soft_name_order_increasing); } /* Verify the links have been created */ if ((link_exists = H5Lexists(subgroup_id, GET_LINK_NAME_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if soft link '%s' exists\n", - GET_LINK_NAME_TEST_SOFT_LINK_NAME); + printf(" couldn't determine if soft link '%s' exists\n", + GET_LINK_NAME_TEST_SOFT_LINK_NAME); PART_ERROR(H5Lget_name_by_idx_soft_name_order_increasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" soft link '%s' did not exist before name retrieval\n", - GET_LINK_NAME_TEST_SOFT_LINK_NAME); + printf(" soft link '%s' did not exist before name retrieval\n", + GET_LINK_NAME_TEST_SOFT_LINK_NAME); PART_ERROR(H5Lget_name_by_idx_soft_name_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_NAME_TEST_SOFT_LINK_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if soft link '%s' exists\n", - GET_LINK_NAME_TEST_SOFT_LINK_NAME2); + printf(" couldn't determine if soft link '%s' exists\n", + GET_LINK_NAME_TEST_SOFT_LINK_NAME2); PART_ERROR(H5Lget_name_by_idx_soft_name_order_increasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" soft link '%s' did not exist before name retrieval\n", - GET_LINK_NAME_TEST_SOFT_LINK_NAME2); + printf(" soft link '%s' did not exist before name retrieval\n", + GET_LINK_NAME_TEST_SOFT_LINK_NAME2); PART_ERROR(H5Lget_name_by_idx_soft_name_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_NAME_TEST_SOFT_LINK_NAME3, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if soft link '%s' exists\n", - GET_LINK_NAME_TEST_SOFT_LINK_NAME3); + printf(" couldn't determine if soft link '%s' exists\n", + GET_LINK_NAME_TEST_SOFT_LINK_NAME3); PART_ERROR(H5Lget_name_by_idx_soft_name_order_increasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" soft link '%s' did not exist before name retrieval\n", - GET_LINK_NAME_TEST_SOFT_LINK_NAME3); + printf(" soft link '%s' did not exist before name retrieval\n", + GET_LINK_NAME_TEST_SOFT_LINK_NAME3); PART_ERROR(H5Lget_name_by_idx_soft_name_order_increasing); } @@ -18256,72 +18135,72 @@ test_get_link_name(void) if ((link_name_buf_size = H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 0, NULL, 0, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve link name size\n"); + printf(" failed to retrieve link name size\n"); PART_ERROR(H5Lget_name_by_idx_soft_name_order_increasing); } if (H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 0, link_name_buf, (size_t)link_name_buf_size + 1, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve link name\n"); + printf(" failed to retrieve link name\n"); PART_ERROR(H5Lget_name_by_idx_soft_name_order_increasing); } if (HDstrncmp(link_name_buf, GET_LINK_NAME_TEST_SOFT_LINK_NAME, strlen(GET_LINK_NAME_TEST_SOFT_LINK_NAME) + 1)) { H5_FAILED(); - HDprintf(" link name '%s' did not match expected name '%s'\n", link_name_buf, - GET_LINK_NAME_TEST_SOFT_LINK_NAME); + printf(" link name '%s' did not match expected name '%s'\n", link_name_buf, + GET_LINK_NAME_TEST_SOFT_LINK_NAME); PART_ERROR(H5Lget_name_by_idx_soft_name_order_increasing); } if ((link_name_buf_size = H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 1, NULL, 0, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve link name size\n"); + printf(" failed to retrieve link name size\n"); PART_ERROR(H5Lget_name_by_idx_soft_name_order_increasing); } if (H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 1, link_name_buf, (size_t)link_name_buf_size + 1, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve link name\n"); + printf(" failed to retrieve link name\n"); PART_ERROR(H5Lget_name_by_idx_soft_name_order_increasing); } if (HDstrncmp(link_name_buf, GET_LINK_NAME_TEST_SOFT_LINK_NAME2, strlen(GET_LINK_NAME_TEST_SOFT_LINK_NAME2) + 1)) { H5_FAILED(); - HDprintf(" link name '%s' did not match expected name '%s'\n", link_name_buf, - GET_LINK_NAME_TEST_SOFT_LINK_NAME2); + printf(" link name '%s' did not match expected name '%s'\n", link_name_buf, + GET_LINK_NAME_TEST_SOFT_LINK_NAME2); PART_ERROR(H5Lget_name_by_idx_soft_name_order_increasing); } if ((link_name_buf_size = H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 2, NULL, 0, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve link name size\n"); + printf(" failed to retrieve link name size\n"); PART_ERROR(H5Lget_name_by_idx_soft_name_order_increasing); } if (H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 2, link_name_buf, (size_t)link_name_buf_size + 1, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve link name\n"); + printf(" failed to retrieve link name\n"); PART_ERROR(H5Lget_name_by_idx_soft_name_order_increasing); } if (HDstrncmp(link_name_buf, GET_LINK_NAME_TEST_SOFT_LINK_NAME3, strlen(GET_LINK_NAME_TEST_SOFT_LINK_NAME3) + 1)) { H5_FAILED(); - HDprintf(" link name '%s' did not match expected name '%s'\n", link_name_buf, - GET_LINK_NAME_TEST_SOFT_LINK_NAME3); + printf(" link name '%s' did not match expected name '%s'\n", link_name_buf, + GET_LINK_NAME_TEST_SOFT_LINK_NAME3); PART_ERROR(H5Lget_name_by_idx_soft_name_order_increasing); } if (H5Gclose(subgroup_id) < 0) { H5_FAILED(); - HDprintf(" failed to close group\n"); + printf(" failed to close group\n"); PART_ERROR(H5Lget_name_by_idx_soft_name_order_increasing); } @@ -18344,8 +18223,8 @@ test_get_link_name(void) if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_NAME_TEST_SOFT_SUBGROUP_NAME4, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container subgroup '%s'\n", - GET_LINK_NAME_TEST_SOFT_SUBGROUP_NAME4); + printf(" couldn't create container subgroup '%s'\n", + GET_LINK_NAME_TEST_SOFT_SUBGROUP_NAME4); PART_ERROR(H5Lget_name_by_idx_soft_name_order_decreasing); } @@ -18353,64 +18232,64 @@ test_get_link_name(void) if (H5Lcreate_soft("/" LINK_TEST_GROUP_NAME "/" GET_LINK_NAME_TEST_GROUP_NAME, subgroup_id, GET_LINK_NAME_TEST_SOFT_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to create soft link '%s'\n", GET_LINK_NAME_TEST_SOFT_LINK_NAME); + printf(" failed to create soft link '%s'\n", GET_LINK_NAME_TEST_SOFT_LINK_NAME); PART_ERROR(H5Lget_name_by_idx_soft_name_order_decreasing); } if (H5Lcreate_soft("/" LINK_TEST_GROUP_NAME "/" GET_LINK_NAME_TEST_GROUP_NAME, subgroup_id, GET_LINK_NAME_TEST_SOFT_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to create soft link '%s'\n", GET_LINK_NAME_TEST_SOFT_LINK_NAME2); + printf(" failed to create soft link '%s'\n", GET_LINK_NAME_TEST_SOFT_LINK_NAME2); PART_ERROR(H5Lget_name_by_idx_soft_name_order_decreasing); } if (H5Lcreate_soft("/" LINK_TEST_GROUP_NAME "/" GET_LINK_NAME_TEST_GROUP_NAME, subgroup_id, GET_LINK_NAME_TEST_SOFT_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to create soft link '%s'\n", GET_LINK_NAME_TEST_SOFT_LINK_NAME3); + printf(" failed to create soft link '%s'\n", GET_LINK_NAME_TEST_SOFT_LINK_NAME3); PART_ERROR(H5Lget_name_by_idx_soft_name_order_decreasing); } /* Verify the links have been created */ if ((link_exists = H5Lexists(subgroup_id, GET_LINK_NAME_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if soft link '%s' exists\n", - GET_LINK_NAME_TEST_SOFT_LINK_NAME); + printf(" couldn't determine if soft link '%s' exists\n", + GET_LINK_NAME_TEST_SOFT_LINK_NAME); PART_ERROR(H5Lget_name_by_idx_soft_name_order_decreasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" soft link '%s' did not exist before name retrieval\n", - GET_LINK_NAME_TEST_SOFT_LINK_NAME); + printf(" soft link '%s' did not exist before name retrieval\n", + GET_LINK_NAME_TEST_SOFT_LINK_NAME); PART_ERROR(H5Lget_name_by_idx_soft_name_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_NAME_TEST_SOFT_LINK_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if soft link '%s' exists\n", - GET_LINK_NAME_TEST_SOFT_LINK_NAME2); + printf(" couldn't determine if soft link '%s' exists\n", + GET_LINK_NAME_TEST_SOFT_LINK_NAME2); PART_ERROR(H5Lget_name_by_idx_soft_name_order_decreasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" soft link '%s' did not exist before name retrieval\n", - GET_LINK_NAME_TEST_SOFT_LINK_NAME2); + printf(" soft link '%s' did not exist before name retrieval\n", + GET_LINK_NAME_TEST_SOFT_LINK_NAME2); PART_ERROR(H5Lget_name_by_idx_soft_name_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_NAME_TEST_SOFT_LINK_NAME3, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if soft link '%s' exists\n", - GET_LINK_NAME_TEST_SOFT_LINK_NAME3); + printf(" couldn't determine if soft link '%s' exists\n", + GET_LINK_NAME_TEST_SOFT_LINK_NAME3); PART_ERROR(H5Lget_name_by_idx_soft_name_order_decreasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" soft link '%s' did not exist before name retrieval\n", - GET_LINK_NAME_TEST_SOFT_LINK_NAME3); + printf(" soft link '%s' did not exist before name retrieval\n", + GET_LINK_NAME_TEST_SOFT_LINK_NAME3); PART_ERROR(H5Lget_name_by_idx_soft_name_order_decreasing); } @@ -18418,72 +18297,72 @@ test_get_link_name(void) if ((link_name_buf_size = H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 0, NULL, 0, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve link name size\n"); + printf(" failed to retrieve link name size\n"); PART_ERROR(H5Lget_name_by_idx_soft_name_order_decreasing); } if (H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 0, link_name_buf, (size_t)link_name_buf_size + 1, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve link name\n"); + printf(" failed to retrieve link name\n"); PART_ERROR(H5Lget_name_by_idx_soft_name_order_decreasing); } if (HDstrncmp(link_name_buf, GET_LINK_NAME_TEST_SOFT_LINK_NAME3, strlen(GET_LINK_NAME_TEST_SOFT_LINK_NAME3) + 1)) { H5_FAILED(); - HDprintf(" link name '%s' did not match expected name '%s'\n", link_name_buf, - GET_LINK_NAME_TEST_SOFT_LINK_NAME3); + printf(" link name '%s' did not match expected name '%s'\n", link_name_buf, + GET_LINK_NAME_TEST_SOFT_LINK_NAME3); PART_ERROR(H5Lget_name_by_idx_soft_name_order_decreasing); } if ((link_name_buf_size = H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 1, NULL, 0, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve link name size\n"); + printf(" failed to retrieve link name size\n"); PART_ERROR(H5Lget_name_by_idx_soft_name_order_decreasing); } if (H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 1, link_name_buf, (size_t)link_name_buf_size + 1, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve link name\n"); + printf(" failed to retrieve link name\n"); PART_ERROR(H5Lget_name_by_idx_soft_name_order_decreasing); } if (HDstrncmp(link_name_buf, GET_LINK_NAME_TEST_SOFT_LINK_NAME2, strlen(GET_LINK_NAME_TEST_SOFT_LINK_NAME2) + 1)) { H5_FAILED(); - HDprintf(" link name '%s' did not match expected name '%s'\n", link_name_buf, - GET_LINK_NAME_TEST_SOFT_LINK_NAME2); + printf(" link name '%s' did not match expected name '%s'\n", link_name_buf, + GET_LINK_NAME_TEST_SOFT_LINK_NAME2); PART_ERROR(H5Lget_name_by_idx_soft_name_order_decreasing); } if ((link_name_buf_size = H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 2, NULL, 0, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve link name size\n"); + printf(" failed to retrieve link name size\n"); PART_ERROR(H5Lget_name_by_idx_soft_name_order_decreasing); } if (H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 2, link_name_buf, (size_t)link_name_buf_size + 1, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve link name\n"); + printf(" failed to retrieve link name\n"); PART_ERROR(H5Lget_name_by_idx_soft_name_order_decreasing); } if (HDstrncmp(link_name_buf, GET_LINK_NAME_TEST_SOFT_LINK_NAME, strlen(GET_LINK_NAME_TEST_SOFT_LINK_NAME) + 1)) { H5_FAILED(); - HDprintf(" link name '%s' did not match expected name '%s'\n", link_name_buf, - GET_LINK_NAME_TEST_SOFT_LINK_NAME); + printf(" link name '%s' did not match expected name '%s'\n", link_name_buf, + GET_LINK_NAME_TEST_SOFT_LINK_NAME); PART_ERROR(H5Lget_name_by_idx_soft_name_order_decreasing); } if (H5Gclose(subgroup_id) < 0) { H5_FAILED(); - HDprintf(" failed to close group\n"); + printf(" failed to close group\n"); PART_ERROR(H5Lget_name_by_idx_soft_name_order_decreasing); } @@ -18504,7 +18383,7 @@ test_get_link_name(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" creation order tracking isn't supported with this VOL connector\n"); + printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Lget_name_by_idx_external_crt_order_increasing); } @@ -18514,13 +18393,13 @@ test_get_link_name(void) if ((ext_file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); + printf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); PART_ERROR(H5Lget_name_by_idx_external_crt_order_increasing); } if (H5Fclose(ext_file_id) < 0) { H5_FAILED(); - HDprintf(" couldn't close file '%s'\n", ext_link_filename); + printf(" couldn't close file '%s'\n", ext_link_filename); PART_ERROR(H5Lget_name_by_idx_external_crt_order_increasing); } @@ -18528,8 +18407,8 @@ test_get_link_name(void) if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_NAME_TEST_EXTERNAL_SUBGROUP_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container subgroup '%s'\n", - GET_LINK_NAME_TEST_EXTERNAL_SUBGROUP_NAME); + printf(" couldn't create container subgroup '%s'\n", + GET_LINK_NAME_TEST_EXTERNAL_SUBGROUP_NAME); PART_ERROR(H5Lget_name_by_idx_external_crt_order_increasing); } @@ -18537,21 +18416,21 @@ test_get_link_name(void) if (H5Lcreate_external(ext_link_filename, "/", subgroup_id, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to create external link '%s'\n", GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3); + printf(" failed to create external link '%s'\n", GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3); PART_ERROR(H5Lget_name_by_idx_external_crt_order_increasing); } if (H5Lcreate_external(ext_link_filename, "/", subgroup_id, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to create external link '%s'\n", GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2); + printf(" failed to create external link '%s'\n", GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2); PART_ERROR(H5Lget_name_by_idx_external_crt_order_increasing); } if (H5Lcreate_external(ext_link_filename, "/", subgroup_id, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to create external link '%s'\n", GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME); + printf(" failed to create external link '%s'\n", GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME); PART_ERROR(H5Lget_name_by_idx_external_crt_order_increasing); } @@ -18559,45 +18438,45 @@ test_get_link_name(void) if ((link_exists = H5Lexists(subgroup_id, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if external link '%s' exists\n", - GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME); + printf(" couldn't determine if external link '%s' exists\n", + GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME); PART_ERROR(H5Lget_name_by_idx_external_crt_order_increasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" external link '%s' did not exist before name retrieval\n", - GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME); + printf(" external link '%s' did not exist before name retrieval\n", + GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME); PART_ERROR(H5Lget_name_by_idx_external_crt_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if external link '%s' exists\n", - GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2); + printf(" couldn't determine if external link '%s' exists\n", + GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2); PART_ERROR(H5Lget_name_by_idx_external_crt_order_increasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" external link '%s' did not exist before name retrieval\n", - GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2); + printf(" external link '%s' did not exist before name retrieval\n", + GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2); PART_ERROR(H5Lget_name_by_idx_external_crt_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if external link '%s' exists\n", - GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3); + printf(" couldn't determine if external link '%s' exists\n", + GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3); PART_ERROR(H5Lget_name_by_idx_external_crt_order_increasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" external link '%s' did not exist before name retrieval\n", - GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3); + printf(" external link '%s' did not exist before name retrieval\n", + GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3); PART_ERROR(H5Lget_name_by_idx_external_crt_order_increasing); } @@ -18605,72 +18484,72 @@ test_get_link_name(void) if ((link_name_buf_size = H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 0, NULL, 0, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve link name size\n"); + printf(" failed to retrieve link name size\n"); PART_ERROR(H5Lget_name_by_idx_external_crt_order_increasing); } if (H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 0, link_name_buf, (size_t)link_name_buf_size + 1, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve link name\n"); + printf(" failed to retrieve link name\n"); PART_ERROR(H5Lget_name_by_idx_external_crt_order_increasing); } if (HDstrncmp(link_name_buf, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3, strlen(GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3) + 1)) { H5_FAILED(); - HDprintf(" link name '%s' did not match expected name '%s'\n", link_name_buf, - GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3); + printf(" link name '%s' did not match expected name '%s'\n", link_name_buf, + GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3); PART_ERROR(H5Lget_name_by_idx_external_crt_order_increasing); } if ((link_name_buf_size = H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 1, NULL, 0, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve link name size\n"); + printf(" failed to retrieve link name size\n"); PART_ERROR(H5Lget_name_by_idx_external_crt_order_increasing); } if (H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 1, link_name_buf, (size_t)link_name_buf_size + 1, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve link name\n"); + printf(" failed to retrieve link name\n"); PART_ERROR(H5Lget_name_by_idx_external_crt_order_increasing); } if (HDstrncmp(link_name_buf, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2, strlen(GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2) + 1)) { H5_FAILED(); - HDprintf(" link name '%s' did not match expected name '%s'\n", link_name_buf, - GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2); + printf(" link name '%s' did not match expected name '%s'\n", link_name_buf, + GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2); PART_ERROR(H5Lget_name_by_idx_external_crt_order_increasing); } if ((link_name_buf_size = H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 2, NULL, 0, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve link name size\n"); + printf(" failed to retrieve link name size\n"); PART_ERROR(H5Lget_name_by_idx_external_crt_order_increasing); } if (H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 2, link_name_buf, (size_t)link_name_buf_size + 1, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve link name\n"); + printf(" failed to retrieve link name\n"); PART_ERROR(H5Lget_name_by_idx_external_crt_order_increasing); } if (HDstrncmp(link_name_buf, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME, strlen(GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME) + 1)) { H5_FAILED(); - HDprintf(" link name '%s' did not match expected name '%s'\n", link_name_buf, - GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME); + printf(" link name '%s' did not match expected name '%s'\n", link_name_buf, + GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME); PART_ERROR(H5Lget_name_by_idx_external_crt_order_increasing); } if (H5Gclose(subgroup_id) < 0) { H5_FAILED(); - HDprintf(" failed to close group\n"); + printf(" failed to close group\n"); PART_ERROR(H5Lget_name_by_idx_external_crt_order_increasing); } @@ -18693,7 +18572,7 @@ test_get_link_name(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" creation order tracking isn't supported with this VOL connector\n"); + printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Lget_name_by_idx_external_crt_order_decreasing); } @@ -18703,13 +18582,13 @@ test_get_link_name(void) if ((ext_file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); + printf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); PART_ERROR(H5Lget_name_by_idx_external_crt_order_decreasing); } if (H5Fclose(ext_file_id) < 0) { H5_FAILED(); - HDprintf(" couldn't close file '%s'\n", ext_link_filename); + printf(" couldn't close file '%s'\n", ext_link_filename); PART_ERROR(H5Lget_name_by_idx_external_crt_order_decreasing); } @@ -18717,8 +18596,8 @@ test_get_link_name(void) if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_NAME_TEST_EXTERNAL_SUBGROUP_NAME2, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container subgroup '%s'\n", - GET_LINK_NAME_TEST_EXTERNAL_SUBGROUP_NAME2); + printf(" couldn't create container subgroup '%s'\n", + GET_LINK_NAME_TEST_EXTERNAL_SUBGROUP_NAME2); PART_ERROR(H5Lget_name_by_idx_external_crt_order_decreasing); } @@ -18726,21 +18605,21 @@ test_get_link_name(void) if (H5Lcreate_external(ext_link_filename, "/", subgroup_id, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to create external link '%s'\n", GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3); + printf(" failed to create external link '%s'\n", GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3); PART_ERROR(H5Lget_name_by_idx_external_crt_order_decreasing); } if (H5Lcreate_external(ext_link_filename, "/", subgroup_id, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to create external link '%s'\n", GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2); + printf(" failed to create external link '%s'\n", GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2); PART_ERROR(H5Lget_name_by_idx_external_crt_order_decreasing); } if (H5Lcreate_external(ext_link_filename, "/", subgroup_id, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to create external link '%s'\n", GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME); + printf(" failed to create external link '%s'\n", GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME); PART_ERROR(H5Lget_name_by_idx_external_crt_order_decreasing); } @@ -18748,45 +18627,45 @@ test_get_link_name(void) if ((link_exists = H5Lexists(subgroup_id, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if external link '%s' exists\n", - GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME); + printf(" couldn't determine if external link '%s' exists\n", + GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME); PART_ERROR(H5Lget_name_by_idx_external_crt_order_decreasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" external link '%s' did not exist before name retrieval\n", - GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME); + printf(" external link '%s' did not exist before name retrieval\n", + GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME); PART_ERROR(H5Lget_name_by_idx_external_crt_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if external link '%s' exists\n", - GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2); + printf(" couldn't determine if external link '%s' exists\n", + GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2); PART_ERROR(H5Lget_name_by_idx_external_crt_order_decreasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" external link '%s' did not exist before name retrieval\n", - GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2); + printf(" external link '%s' did not exist before name retrieval\n", + GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2); PART_ERROR(H5Lget_name_by_idx_external_crt_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if external link '%s' exists\n", - GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3); + printf(" couldn't determine if external link '%s' exists\n", + GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3); PART_ERROR(H5Lget_name_by_idx_external_crt_order_decreasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" external link '%s' did not exist before name retrieval\n", - GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3); + printf(" external link '%s' did not exist before name retrieval\n", + GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3); PART_ERROR(H5Lget_name_by_idx_external_crt_order_decreasing); } @@ -18794,72 +18673,72 @@ test_get_link_name(void) if ((link_name_buf_size = H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 0, NULL, 0, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve link name size\n"); + printf(" failed to retrieve link name size\n"); PART_ERROR(H5Lget_name_by_idx_external_crt_order_decreasing); } if (H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 0, link_name_buf, (size_t)link_name_buf_size + 1, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve link name\n"); + printf(" failed to retrieve link name\n"); PART_ERROR(H5Lget_name_by_idx_external_crt_order_decreasing); } if (HDstrncmp(link_name_buf, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME, strlen(GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME) + 1)) { H5_FAILED(); - HDprintf(" link name '%s' did not match expected name '%s'\n", link_name_buf, - GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME); + printf(" link name '%s' did not match expected name '%s'\n", link_name_buf, + GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME); PART_ERROR(H5Lget_name_by_idx_external_crt_order_decreasing); } if ((link_name_buf_size = H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 1, NULL, 0, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve link name size\n"); + printf(" failed to retrieve link name size\n"); PART_ERROR(H5Lget_name_by_idx_external_crt_order_decreasing); } if (H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 1, link_name_buf, (size_t)link_name_buf_size + 1, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve link name\n"); + printf(" failed to retrieve link name\n"); PART_ERROR(H5Lget_name_by_idx_external_crt_order_decreasing); } if (HDstrncmp(link_name_buf, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2, strlen(GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2) + 1)) { H5_FAILED(); - HDprintf(" link name '%s' did not match expected name '%s'\n", link_name_buf, - GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2); + printf(" link name '%s' did not match expected name '%s'\n", link_name_buf, + GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2); PART_ERROR(H5Lget_name_by_idx_external_crt_order_decreasing); } if ((link_name_buf_size = H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 2, NULL, 0, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve link name size\n"); + printf(" failed to retrieve link name size\n"); PART_ERROR(H5Lget_name_by_idx_external_crt_order_decreasing); } if (H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 2, link_name_buf, (size_t)link_name_buf_size + 1, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve link name\n"); + printf(" failed to retrieve link name\n"); PART_ERROR(H5Lget_name_by_idx_external_crt_order_decreasing); } if (HDstrncmp(link_name_buf, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3, strlen(GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3) + 1)) { H5_FAILED(); - HDprintf(" link name '%s' did not match expected name '%s'\n", link_name_buf, - GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3); + printf(" link name '%s' did not match expected name '%s'\n", link_name_buf, + GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3); PART_ERROR(H5Lget_name_by_idx_external_crt_order_decreasing); } if (H5Gclose(subgroup_id) < 0) { H5_FAILED(); - HDprintf(" failed to close group\n"); + printf(" failed to close group\n"); PART_ERROR(H5Lget_name_by_idx_external_crt_order_decreasing); } @@ -18886,13 +18765,13 @@ test_get_link_name(void) if ((ext_file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); + printf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); PART_ERROR(H5Lget_name_by_idx_external_name_order_increasing); } if (H5Fclose(ext_file_id) < 0) { H5_FAILED(); - HDprintf(" couldn't close file '%s'\n", ext_link_filename); + printf(" couldn't close file '%s'\n", ext_link_filename); PART_ERROR(H5Lget_name_by_idx_external_name_order_increasing); } @@ -18900,8 +18779,8 @@ test_get_link_name(void) if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_NAME_TEST_EXTERNAL_SUBGROUP_NAME3, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container subgroup '%s'\n", - GET_LINK_NAME_TEST_EXTERNAL_SUBGROUP_NAME3); + printf(" couldn't create container subgroup '%s'\n", + GET_LINK_NAME_TEST_EXTERNAL_SUBGROUP_NAME3); PART_ERROR(H5Lget_name_by_idx_external_name_order_increasing); } @@ -18909,21 +18788,21 @@ test_get_link_name(void) if (H5Lcreate_external(ext_link_filename, "/", subgroup_id, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to create external link '%s'\n", GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME); + printf(" failed to create external link '%s'\n", GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME); PART_ERROR(H5Lget_name_by_idx_external_name_order_increasing); } if (H5Lcreate_external(ext_link_filename, "/", subgroup_id, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to create external link '%s'\n", GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2); + printf(" failed to create external link '%s'\n", GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2); PART_ERROR(H5Lget_name_by_idx_external_name_order_increasing); } if (H5Lcreate_external(ext_link_filename, "/", subgroup_id, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to create external link '%s'\n", GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3); + printf(" failed to create external link '%s'\n", GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3); PART_ERROR(H5Lget_name_by_idx_external_name_order_increasing); } @@ -18931,45 +18810,45 @@ test_get_link_name(void) if ((link_exists = H5Lexists(subgroup_id, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if external link '%s' exists\n", - GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME); + printf(" couldn't determine if external link '%s' exists\n", + GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME); PART_ERROR(H5Lget_name_by_idx_external_name_order_increasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" external link '%s' did not exist before name retrieval\n", - GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME); + printf(" external link '%s' did not exist before name retrieval\n", + GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME); PART_ERROR(H5Lget_name_by_idx_external_name_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if external link '%s' exists\n", - GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2); + printf(" couldn't determine if external link '%s' exists\n", + GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2); PART_ERROR(H5Lget_name_by_idx_external_name_order_increasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" external link '%s' did not exist before name retrieval\n", - GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2); + printf(" external link '%s' did not exist before name retrieval\n", + GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2); PART_ERROR(H5Lget_name_by_idx_external_name_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if external link '%s' exists\n", - GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3); + printf(" couldn't determine if external link '%s' exists\n", + GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3); PART_ERROR(H5Lget_name_by_idx_external_name_order_increasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" external link '%s' did not exist before name retrieval\n", - GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3); + printf(" external link '%s' did not exist before name retrieval\n", + GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3); PART_ERROR(H5Lget_name_by_idx_external_name_order_increasing); } @@ -18977,72 +18856,72 @@ test_get_link_name(void) if ((link_name_buf_size = H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 0, NULL, 0, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve link name size\n"); + printf(" failed to retrieve link name size\n"); PART_ERROR(H5Lget_name_by_idx_external_name_order_increasing); } if (H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 0, link_name_buf, (size_t)link_name_buf_size + 1, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve link name\n"); + printf(" failed to retrieve link name\n"); PART_ERROR(H5Lget_name_by_idx_external_name_order_increasing); } if (HDstrncmp(link_name_buf, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME, strlen(GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME) + 1)) { H5_FAILED(); - HDprintf(" link name '%s' did not match expected name '%s'\n", link_name_buf, - GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME); + printf(" link name '%s' did not match expected name '%s'\n", link_name_buf, + GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME); PART_ERROR(H5Lget_name_by_idx_external_name_order_increasing); } if ((link_name_buf_size = H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 1, NULL, 0, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve link name size\n"); + printf(" failed to retrieve link name size\n"); PART_ERROR(H5Lget_name_by_idx_external_name_order_increasing); } if (H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 1, link_name_buf, (size_t)link_name_buf_size + 1, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve link name\n"); + printf(" failed to retrieve link name\n"); PART_ERROR(H5Lget_name_by_idx_external_name_order_increasing); } if (HDstrncmp(link_name_buf, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2, strlen(GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2) + 1)) { H5_FAILED(); - HDprintf(" link name '%s' did not match expected name '%s'\n", link_name_buf, - GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2); + printf(" link name '%s' did not match expected name '%s'\n", link_name_buf, + GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2); PART_ERROR(H5Lget_name_by_idx_external_name_order_increasing); } if ((link_name_buf_size = H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 2, NULL, 0, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve link name size\n"); + printf(" failed to retrieve link name size\n"); PART_ERROR(H5Lget_name_by_idx_external_name_order_increasing); } if (H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 2, link_name_buf, (size_t)link_name_buf_size + 1, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve link name\n"); + printf(" failed to retrieve link name\n"); PART_ERROR(H5Lget_name_by_idx_external_name_order_increasing); } if (HDstrncmp(link_name_buf, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3, strlen(GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3) + 1)) { H5_FAILED(); - HDprintf(" link name '%s' did not match expected name '%s'\n", link_name_buf, - GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3); + printf(" link name '%s' did not match expected name '%s'\n", link_name_buf, + GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3); PART_ERROR(H5Lget_name_by_idx_external_name_order_increasing); } if (H5Gclose(subgroup_id) < 0) { H5_FAILED(); - HDprintf(" failed to close group\n"); + printf(" failed to close group\n"); PART_ERROR(H5Lget_name_by_idx_external_name_order_increasing); } @@ -19069,13 +18948,13 @@ test_get_link_name(void) if ((ext_file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); + printf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); PART_ERROR(H5Lget_name_by_idx_external_name_order_decreasing); } if (H5Fclose(ext_file_id) < 0) { H5_FAILED(); - HDprintf(" couldn't close file '%s'\n", ext_link_filename); + printf(" couldn't close file '%s'\n", ext_link_filename); PART_ERROR(H5Lget_name_by_idx_external_name_order_decreasing); } @@ -19083,8 +18962,8 @@ test_get_link_name(void) if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_NAME_TEST_EXTERNAL_SUBGROUP_NAME4, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container subgroup '%s'\n", - GET_LINK_NAME_TEST_EXTERNAL_SUBGROUP_NAME4); + printf(" couldn't create container subgroup '%s'\n", + GET_LINK_NAME_TEST_EXTERNAL_SUBGROUP_NAME4); PART_ERROR(H5Lget_name_by_idx_external_name_order_decreasing); } @@ -19092,21 +18971,21 @@ test_get_link_name(void) if (H5Lcreate_external(ext_link_filename, "/", subgroup_id, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to create external link '%s'\n", GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME); + printf(" failed to create external link '%s'\n", GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME); PART_ERROR(H5Lget_name_by_idx_external_name_order_decreasing); } if (H5Lcreate_external(ext_link_filename, "/", subgroup_id, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to create external link '%s'\n", GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2); + printf(" failed to create external link '%s'\n", GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2); PART_ERROR(H5Lget_name_by_idx_external_name_order_decreasing); } if (H5Lcreate_external(ext_link_filename, "/", subgroup_id, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to create external link '%s'\n", GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3); + printf(" failed to create external link '%s'\n", GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3); PART_ERROR(H5Lget_name_by_idx_external_name_order_decreasing); } @@ -19114,45 +18993,45 @@ test_get_link_name(void) if ((link_exists = H5Lexists(subgroup_id, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if external link '%s' exists\n", - GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME); + printf(" couldn't determine if external link '%s' exists\n", + GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME); PART_ERROR(H5Lget_name_by_idx_external_name_order_decreasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" external link '%s' did not exist before name retrieval\n", - GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME); + printf(" external link '%s' did not exist before name retrieval\n", + GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME); PART_ERROR(H5Lget_name_by_idx_external_name_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if external link '%s' exists\n", - GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2); + printf(" couldn't determine if external link '%s' exists\n", + GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2); PART_ERROR(H5Lget_name_by_idx_external_name_order_decreasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" external link '%s' did not exist before name retrieval\n", - GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2); + printf(" external link '%s' did not exist before name retrieval\n", + GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2); PART_ERROR(H5Lget_name_by_idx_external_name_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if external link '%s' exists\n", - GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3); + printf(" couldn't determine if external link '%s' exists\n", + GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3); PART_ERROR(H5Lget_name_by_idx_external_name_order_decreasing); } if (!link_exists) { H5_FAILED(); - HDprintf(" external link '%s' did not exist before name retrieval\n", - GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3); + printf(" external link '%s' did not exist before name retrieval\n", + GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3); PART_ERROR(H5Lget_name_by_idx_external_name_order_decreasing); } @@ -19160,72 +19039,72 @@ test_get_link_name(void) if ((link_name_buf_size = H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 0, NULL, 0, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve link name size\n"); + printf(" failed to retrieve link name size\n"); PART_ERROR(H5Lget_name_by_idx_external_name_order_decreasing); } if (H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 0, link_name_buf, (size_t)link_name_buf_size + 1, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve link name\n"); + printf(" failed to retrieve link name\n"); PART_ERROR(H5Lget_name_by_idx_external_name_order_decreasing); } if (HDstrncmp(link_name_buf, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3, strlen(GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3) + 1)) { H5_FAILED(); - HDprintf(" link name '%s' did not match expected name '%s'\n", link_name_buf, - GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3); + printf(" link name '%s' did not match expected name '%s'\n", link_name_buf, + GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3); PART_ERROR(H5Lget_name_by_idx_external_name_order_decreasing); } if ((link_name_buf_size = H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 1, NULL, 0, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve link name size\n"); + printf(" failed to retrieve link name size\n"); PART_ERROR(H5Lget_name_by_idx_external_name_order_decreasing); } if (H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 1, link_name_buf, (size_t)link_name_buf_size + 1, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve link name\n"); + printf(" failed to retrieve link name\n"); PART_ERROR(H5Lget_name_by_idx_external_name_order_decreasing); } if (HDstrncmp(link_name_buf, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2, strlen(GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2) + 1)) { H5_FAILED(); - HDprintf(" link name '%s' did not match expected name '%s'\n", link_name_buf, - GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2); + printf(" link name '%s' did not match expected name '%s'\n", link_name_buf, + GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2); PART_ERROR(H5Lget_name_by_idx_external_name_order_decreasing); } if ((link_name_buf_size = H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 2, NULL, 0, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve link name size\n"); + printf(" failed to retrieve link name size\n"); PART_ERROR(H5Lget_name_by_idx_external_name_order_decreasing); } if (H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 2, link_name_buf, (size_t)link_name_buf_size + 1, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve link name\n"); + printf(" failed to retrieve link name\n"); PART_ERROR(H5Lget_name_by_idx_external_name_order_decreasing); } if (HDstrncmp(link_name_buf, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME, strlen(GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME) + 1)) { H5_FAILED(); - HDprintf(" link name '%s' did not match expected name '%s'\n", link_name_buf, - GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME); + printf(" link name '%s' did not match expected name '%s'\n", link_name_buf, + GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME); PART_ERROR(H5Lget_name_by_idx_external_name_order_decreasing); } if (H5Gclose(subgroup_id) < 0) { H5_FAILED(); - HDprintf(" failed to close group\n"); + printf(" failed to close group\n"); PART_ERROR(H5Lget_name_by_idx_external_name_order_decreasing); } @@ -19369,8 +19248,8 @@ test_get_link_name_invalid_params(void) !(vol_cap_flags_g & H5VL_CAP_FLAG_HARD_LINKS) || !(vol_cap_flags_g & H5VL_CAP_FLAG_EXTERNAL_LINKS) || !(vol_cap_flags_g & H5VL_CAP_FLAG_SOFT_LINKS)) { SKIPPED(); - HDprintf(" API functions for basic file, group, link, soft link, hard link, or external link " - "aren't supported with this connector\n"); + printf(" API functions for basic file, group, link, soft link, hard link, or external link " + "aren't supported with this connector\n"); return 0; } @@ -19378,28 +19257,27 @@ test_get_link_name_invalid_params(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, GET_LINK_NAME_INVALID_PARAMS_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container subgroup '%s'\n", - GET_LINK_NAME_INVALID_PARAMS_TEST_GROUP_NAME); + printf(" couldn't create container subgroup '%s'\n", GET_LINK_NAME_INVALID_PARAMS_TEST_GROUP_NAME); goto error; } if (H5Lcreate_hard(group_id, ".", group_id, GET_LINK_NAME_INVALID_PARAMS_TEST_HARD_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to create hard link '%s'\n", GET_LINK_NAME_INVALID_PARAMS_TEST_HARD_LINK_NAME); + printf(" failed to create hard link '%s'\n", GET_LINK_NAME_INVALID_PARAMS_TEST_HARD_LINK_NAME); goto error; } @@ -19407,25 +19285,25 @@ test_get_link_name_invalid_params(void) if ((link_exists = H5Lexists(group_id, GET_LINK_NAME_INVALID_PARAMS_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if link exists\n"); + printf(" couldn't determine if link exists\n"); goto error; } if (!link_exists) { H5_FAILED(); - HDprintf(" link did not exist\n"); + printf(" link did not exist\n"); goto error; } if ((ret = H5Lget_name_by_idx(group_id, ".", H5_INDEX_NAME, H5_ITER_INC, 0, NULL, link_name_buf_size, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve link name size\n"); + printf(" failed to retrieve link name size\n"); goto error; } link_name_buf_size = (size_t)ret; - if (NULL == (link_name_buf = (char *)HDmalloc(link_name_buf_size + 1))) + if (NULL == (link_name_buf = (char *)malloc(link_name_buf_size + 1))) TEST_ERROR; PASSED(); @@ -19445,7 +19323,7 @@ test_get_link_name_invalid_params(void) if (ret >= 0) { H5_FAILED(); - HDprintf(" H5Lget_name_by_idx succeeded with an invalid location ID!\n"); + printf(" H5Lget_name_by_idx succeeded with an invalid location ID!\n"); PART_ERROR(H5Lget_name_by_idx_invalid_loc_id); } @@ -19466,7 +19344,7 @@ test_get_link_name_invalid_params(void) if (ret >= 0) { H5_FAILED(); - HDprintf(" H5Lget_name_by_idx succeeded with a NULL group name!\n"); + printf(" H5Lget_name_by_idx succeeded with a NULL group name!\n"); PART_ERROR(H5Lget_name_by_idx_invalid_grp_name); } @@ -19479,7 +19357,7 @@ test_get_link_name_invalid_params(void) if (ret >= 0) { H5_FAILED(); - HDprintf(" H5Lget_name_by_idx succeeded with an invalid group name of ''!\n"); + printf(" H5Lget_name_by_idx succeeded with an invalid group name of ''!\n"); PART_ERROR(H5Lget_name_by_idx_invalid_grp_name); } @@ -19500,7 +19378,7 @@ test_get_link_name_invalid_params(void) if (ret >= 0) { H5_FAILED(); - HDprintf(" H5Lget_name_by_idx succeeded with invalid index type H5_INDEX_UNKNOWN!\n"); + printf(" H5Lget_name_by_idx succeeded with invalid index type H5_INDEX_UNKNOWN!\n"); PART_ERROR(H5Lget_name_by_idx_invalid_index_type); } @@ -19513,7 +19391,7 @@ test_get_link_name_invalid_params(void) if (ret >= 0) { H5_FAILED(); - HDprintf(" H5Lget_name_by_idx succeeded with invalid index type H5_INDEX_N!\n"); + printf(" H5Lget_name_by_idx succeeded with invalid index type H5_INDEX_N!\n"); PART_ERROR(H5Lget_name_by_idx_invalid_index_type); } @@ -19534,8 +19412,7 @@ test_get_link_name_invalid_params(void) if (ret >= 0) { H5_FAILED(); - HDprintf( - " H5Lget_name_by_idx succeeded with invalid iteration ordering H5_ITER_UNKNOWN!\n"); + printf(" H5Lget_name_by_idx succeeded with invalid iteration ordering H5_ITER_UNKNOWN!\n"); PART_ERROR(H5Lget_name_by_idx_invalid_iter_order); } @@ -19548,7 +19425,7 @@ test_get_link_name_invalid_params(void) if (ret >= 0) { H5_FAILED(); - HDprintf(" H5Lget_name_by_idx succeeded with invalid iteration ordering H5_ITER_N!\n"); + printf(" H5Lget_name_by_idx succeeded with invalid iteration ordering H5_ITER_N!\n"); PART_ERROR(H5Lget_name_by_idx_invalid_iter_order); } @@ -19569,7 +19446,7 @@ test_get_link_name_invalid_params(void) if (ret >= 0) { H5_FAILED(); - HDprintf(" H5Lget_name_by_idx succeeded with an invalid LAPL!\n"); + printf(" H5Lget_name_by_idx succeeded with an invalid LAPL!\n"); PART_ERROR(H5Lget_name_by_idx_invalid_lapl); } @@ -19582,7 +19459,7 @@ test_get_link_name_invalid_params(void) TESTING_2("test cleanup"); if (link_name_buf) { - HDfree(link_name_buf); + free(link_name_buf); link_name_buf = NULL; } @@ -19601,7 +19478,7 @@ error: H5E_BEGIN_TRY { if (link_name_buf) - HDfree(link_name_buf); + free(link_name_buf); H5Gclose(group_id); H5Gclose(container_group); H5Fclose(file_id); @@ -19637,8 +19514,8 @@ test_link_iterate_hard_links(void) !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ITERATE)) { SKIPPED(); - HDprintf(" API functions for basic file, group, dataset, link, or iterate aren't " - "supported with this connector\n"); + printf(" API functions for basic file, group, dataset, link, or iterate aren't " + "supported with this connector\n"); return 0; } @@ -19646,26 +19523,26 @@ test_link_iterate_hard_links(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); goto error; } if ((gcpl_id = H5Pcreate(H5P_GROUP_CREATE)) < 0) { H5_FAILED(); - HDprintf(" couldn't create GCPL for link creation order tracking\n"); + printf(" couldn't create GCPL for link creation order tracking\n"); goto error; } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (H5Pset_link_creation_order(gcpl_id, H5P_CRT_ORDER_TRACKED) < 0) { H5_FAILED(); - HDprintf(" couldn't set link creation order tracking\n"); + printf(" couldn't set link creation order tracking\n"); goto error; } } @@ -19673,7 +19550,7 @@ test_link_iterate_hard_links(void) if ((group_id = H5Gcreate2(container_group, LINK_ITER_HARD_LINKS_TEST_SUBGROUP_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container subgroup '%s'\n", LINK_ITER_HARD_LINKS_TEST_SUBGROUP_NAME); + printf(" couldn't create container subgroup '%s'\n", LINK_ITER_HARD_LINKS_TEST_SUBGROUP_NAME); goto error; } @@ -19694,26 +19571,26 @@ test_link_iterate_hard_links(void) if ((dset_id = H5Dcreate2(group_id, dset_name, dset_dtype, dset_dspace, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create hard link '%s'\n", dset_name); + printf(" couldn't create hard link '%s'\n", dset_name); goto error; } /* Verify the link has been created */ if ((link_exists = H5Lexists(group_id, dset_name, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if link '%s' exists\n", dset_name); + printf(" couldn't determine if link '%s' exists\n", dset_name); goto error; } if (!link_exists) { H5_FAILED(); - HDprintf(" link '%s' did not exist\n", dset_name); + printf(" link '%s' did not exist\n", dset_name); goto error; } if (H5Dclose(dset_id) < 0) { H5_FAILED(); - HDprintf(" couldn't close dataset '%s'\n", dset_name); + printf(" couldn't close dataset '%s'\n", dset_name); goto error; } } @@ -19738,13 +19615,13 @@ test_link_iterate_hard_links(void) /* Test basic link iteration capability using both index types and both index orders */ if (H5Literate2(group_id, H5_INDEX_NAME, H5_ITER_INC, NULL, link_iter_hard_links_cb, &i) < 0) { H5_FAILED(); - HDprintf(" H5Literate2 by index type name in increasing order failed\n"); + printf(" H5Literate2 by index type name in increasing order failed\n"); PART_ERROR(H5Literate_link_name_increasing); } if (i != LINK_ITER_HARD_LINKS_TEST_NUM_LINKS) { H5_FAILED(); - HDprintf(" some links were not iterated over!\n"); + printf(" some links were not iterated over!\n"); PART_ERROR(H5Literate_link_name_increasing); } @@ -19761,13 +19638,13 @@ test_link_iterate_hard_links(void) if (H5Literate2(group_id, H5_INDEX_NAME, H5_ITER_DEC, NULL, link_iter_hard_links_cb, &i) < 0) { H5_FAILED(); - HDprintf(" H5Literate2 by index type name in decreasing order failed\n"); + printf(" H5Literate2 by index type name in decreasing order failed\n"); PART_ERROR(H5Literate_link_name_decreasing); } if (i != 2 * LINK_ITER_HARD_LINKS_TEST_NUM_LINKS) { H5_FAILED(); - HDprintf(" some links were not iterated over!\n"); + printf(" some links were not iterated over!\n"); PART_ERROR(H5Literate_link_name_decreasing); } @@ -19781,7 +19658,7 @@ test_link_iterate_hard_links(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" creation order tracking isn't supported with this VOL connector\n"); + printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Literate_link_creation_increasing); } @@ -19791,13 +19668,13 @@ test_link_iterate_hard_links(void) if (H5Literate2(group_id, H5_INDEX_CRT_ORDER, H5_ITER_INC, NULL, link_iter_hard_links_cb, &i) < 0) { H5_FAILED(); - HDprintf(" H5Literate2 by index type creation order in increasing order failed\n"); + printf(" H5Literate2 by index type creation order in increasing order failed\n"); PART_ERROR(H5Literate_link_creation_increasing); } if (i != 3 * LINK_ITER_HARD_LINKS_TEST_NUM_LINKS) { H5_FAILED(); - HDprintf(" some links were not iterated over!\n"); + printf(" some links were not iterated over!\n"); PART_ERROR(H5Literate_link_creation_increasing); } @@ -19811,7 +19688,7 @@ test_link_iterate_hard_links(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" creation order tracking isn't supported with this VOL connector\n"); + printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Literate_link_creation_decreasing); } @@ -19821,13 +19698,13 @@ test_link_iterate_hard_links(void) if (H5Literate2(group_id, H5_INDEX_CRT_ORDER, H5_ITER_DEC, NULL, link_iter_hard_links_cb, &i) < 0) { H5_FAILED(); - HDprintf(" H5Literate2 by index type creation order in decreasing order failed\n"); + printf(" H5Literate2 by index type creation order in decreasing order failed\n"); PART_ERROR(H5Literate_link_creation_decreasing); } if (i != 4 * LINK_ITER_HARD_LINKS_TEST_NUM_LINKS) { H5_FAILED(); - HDprintf(" some links were not iterated over!\n"); + printf(" some links were not iterated over!\n"); PART_ERROR(H5Literate_link_creation_decreasing); } @@ -19846,13 +19723,13 @@ test_link_iterate_hard_links(void) file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_ITER_HARD_LINKS_TEST_SUBGROUP_NAME, H5_INDEX_NAME, H5_ITER_INC, NULL, link_iter_hard_links_cb, &i, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" H5Literate_by_name2 by index type name in increasing order failed\n"); + printf(" H5Literate_by_name2 by index type name in increasing order failed\n"); PART_ERROR(H5Literate_by_name_link_name_increasing); } if (i != LINK_ITER_HARD_LINKS_TEST_NUM_LINKS) { H5_FAILED(); - HDprintf(" some links were not iterated over!\n"); + printf(" some links were not iterated over!\n"); PART_ERROR(H5Literate_by_name_link_name_increasing); } @@ -19871,13 +19748,13 @@ test_link_iterate_hard_links(void) file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_ITER_HARD_LINKS_TEST_SUBGROUP_NAME, H5_INDEX_NAME, H5_ITER_DEC, NULL, link_iter_hard_links_cb, &i, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" H5Literate_by_name2 by index type name in decreasing order failed\n"); + printf(" H5Literate_by_name2 by index type name in decreasing order failed\n"); PART_ERROR(H5Literate_by_name_link_name_decreasing); } if (i != 2 * LINK_ITER_HARD_LINKS_TEST_NUM_LINKS) { H5_FAILED(); - HDprintf(" some links were not iterated over!\n"); + printf(" some links were not iterated over!\n"); PART_ERROR(H5Literate_by_name_link_name_decreasing); } @@ -19891,7 +19768,7 @@ test_link_iterate_hard_links(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" creation order tracking isn't supported with this VOL connector\n"); + printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Literate_by_name_creation_increasing); } @@ -19902,13 +19779,13 @@ test_link_iterate_hard_links(void) file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_ITER_HARD_LINKS_TEST_SUBGROUP_NAME, H5_INDEX_CRT_ORDER, H5_ITER_INC, NULL, link_iter_hard_links_cb, &i, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" H5Literate_by_name2 by index type creation order in increasing order failed\n"); + printf(" H5Literate_by_name2 by index type creation order in increasing order failed\n"); PART_ERROR(H5Literate_by_name_creation_increasing); } if (i != 3 * LINK_ITER_HARD_LINKS_TEST_NUM_LINKS) { H5_FAILED(); - HDprintf(" some links were not iterated over!\n"); + printf(" some links were not iterated over!\n"); PART_ERROR(H5Literate_by_name_creation_increasing); } @@ -19922,7 +19799,7 @@ test_link_iterate_hard_links(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" creation order tracking isn't supported with this VOL connector\n"); + printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Literate_by_name_creation_decreasing); } @@ -19933,13 +19810,13 @@ test_link_iterate_hard_links(void) file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_ITER_HARD_LINKS_TEST_SUBGROUP_NAME, H5_INDEX_CRT_ORDER, H5_ITER_DEC, NULL, link_iter_hard_links_cb, &i, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" H5Literate_by_name2 by index type creation order in decreasing order failed\n"); + printf(" H5Literate_by_name2 by index type creation order in decreasing order failed\n"); PART_ERROR(H5Literate_by_name_creation_decreasing); } if (i != 4 * LINK_ITER_HARD_LINKS_TEST_NUM_LINKS) { H5_FAILED(); - HDprintf(" some links were not iterated over!\n"); + printf(" some links were not iterated over!\n"); PART_ERROR(H5Literate_by_name_creation_decreasing); } @@ -20007,8 +19884,8 @@ test_link_iterate_soft_links(void) !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_SOFT_LINKS) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ITERATE)) { SKIPPED(); - HDprintf(" API functions for basic file, group, link, soft link, or iterate " - "aren't supported with this connector\n"); + printf(" API functions for basic file, group, link, soft link, or iterate " + "aren't supported with this connector\n"); return 0; } @@ -20016,26 +19893,26 @@ test_link_iterate_soft_links(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); goto error; } if ((gcpl_id = H5Pcreate(H5P_GROUP_CREATE)) < 0) { H5_FAILED(); - HDprintf(" couldn't create GCPL for link creation order tracking\n"); + printf(" couldn't create GCPL for link creation order tracking\n"); goto error; } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (H5Pset_link_creation_order(gcpl_id, H5P_CRT_ORDER_TRACKED) < 0) { H5_FAILED(); - HDprintf(" couldn't set link creation order tracking\n"); + printf(" couldn't set link creation order tracking\n"); goto error; } } @@ -20043,7 +19920,7 @@ test_link_iterate_soft_links(void) if ((group_id = H5Gcreate2(container_group, LINK_ITER_SOFT_LINKS_TEST_SUBGROUP_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container subgroup '%s'\n", LINK_ITER_SOFT_LINKS_TEST_SUBGROUP_NAME); + printf(" couldn't create container subgroup '%s'\n", LINK_ITER_SOFT_LINKS_TEST_SUBGROUP_NAME); goto error; } @@ -20060,20 +19937,20 @@ test_link_iterate_soft_links(void) if (H5Lcreate_soft(link_target, group_id, link_name, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create soft link '%s'\n", link_name); + printf(" couldn't create soft link '%s'\n", link_name); goto error; } /* Verify the link has been created */ if ((link_exists = H5Lexists(group_id, link_name, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if link '%s' exists\n", link_name); + printf(" couldn't determine if link '%s' exists\n", link_name); goto error; } if (!link_exists) { H5_FAILED(); - HDprintf(" link '%s' did not exist\n", link_name); + printf(" link '%s' did not exist\n", link_name); goto error; } } @@ -20098,13 +19975,13 @@ test_link_iterate_soft_links(void) /* Test basic link iteration capability using both index types and both index orders */ if (H5Literate2(group_id, H5_INDEX_NAME, H5_ITER_INC, NULL, link_iter_soft_links_cb, &i) < 0) { H5_FAILED(); - HDprintf(" H5Literate2 by index type name in increasing order failed\n"); + printf(" H5Literate2 by index type name in increasing order failed\n"); PART_ERROR(H5Literate_link_name_increasing); } if (i != LINK_ITER_SOFT_LINKS_TEST_NUM_LINKS) { H5_FAILED(); - HDprintf(" some links were not iterated over!\n"); + printf(" some links were not iterated over!\n"); PART_ERROR(H5Literate_link_name_increasing); } @@ -20121,13 +19998,13 @@ test_link_iterate_soft_links(void) if (H5Literate2(group_id, H5_INDEX_NAME, H5_ITER_DEC, NULL, link_iter_soft_links_cb, &i) < 0) { H5_FAILED(); - HDprintf(" H5Literate2 by index type name in decreasing order failed\n"); + printf(" H5Literate2 by index type name in decreasing order failed\n"); PART_ERROR(H5Literate_link_name_decreasing); } if (i != 2 * LINK_ITER_SOFT_LINKS_TEST_NUM_LINKS) { H5_FAILED(); - HDprintf(" some links were not iterated over!\n"); + printf(" some links were not iterated over!\n"); PART_ERROR(H5Literate_link_name_decreasing); } @@ -20141,7 +20018,7 @@ test_link_iterate_soft_links(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" creation order tracking isn't supported with this VOL connector\n"); + printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Literate_link_creation_increasing); } @@ -20151,13 +20028,13 @@ test_link_iterate_soft_links(void) if (H5Literate2(group_id, H5_INDEX_CRT_ORDER, H5_ITER_INC, NULL, link_iter_soft_links_cb, &i) < 0) { H5_FAILED(); - HDprintf(" H5Literate2 by index type creation order in increasing order failed\n"); + printf(" H5Literate2 by index type creation order in increasing order failed\n"); PART_ERROR(H5Literate_link_creation_increasing); } if (i != 3 * LINK_ITER_SOFT_LINKS_TEST_NUM_LINKS) { H5_FAILED(); - HDprintf(" some links were not iterated over!\n"); + printf(" some links were not iterated over!\n"); PART_ERROR(H5Literate_link_creation_increasing); } @@ -20171,7 +20048,7 @@ test_link_iterate_soft_links(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" creation order tracking isn't supported with this VOL connector\n"); + printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Literate_link_creation_decreasing); } @@ -20181,13 +20058,13 @@ test_link_iterate_soft_links(void) if (H5Literate2(group_id, H5_INDEX_CRT_ORDER, H5_ITER_DEC, NULL, link_iter_soft_links_cb, &i) < 0) { H5_FAILED(); - HDprintf(" H5Literate2 by index type creation order in decreasing order failed\n"); + printf(" H5Literate2 by index type creation order in decreasing order failed\n"); PART_ERROR(H5Literate_link_creation_decreasing); } if (i != 4 * LINK_ITER_SOFT_LINKS_TEST_NUM_LINKS) { H5_FAILED(); - HDprintf(" some links were not iterated over!\n"); + printf(" some links were not iterated over!\n"); PART_ERROR(H5Literate_link_creation_decreasing); } @@ -20206,13 +20083,13 @@ test_link_iterate_soft_links(void) file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_ITER_SOFT_LINKS_TEST_SUBGROUP_NAME, H5_INDEX_NAME, H5_ITER_INC, NULL, link_iter_soft_links_cb, &i, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" H5Literate_by_name2 by index type name in increasing order failed\n"); + printf(" H5Literate_by_name2 by index type name in increasing order failed\n"); PART_ERROR(H5Literate_by_name_link_name_increasing); } if (i != LINK_ITER_SOFT_LINKS_TEST_NUM_LINKS) { H5_FAILED(); - HDprintf(" some links were not iterated over!\n"); + printf(" some links were not iterated over!\n"); PART_ERROR(H5Literate_by_name_link_name_increasing); } @@ -20231,13 +20108,13 @@ test_link_iterate_soft_links(void) file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_ITER_SOFT_LINKS_TEST_SUBGROUP_NAME, H5_INDEX_NAME, H5_ITER_DEC, NULL, link_iter_soft_links_cb, &i, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" H5Literate_by_name2 by index type name in decreasing order failed\n"); + printf(" H5Literate_by_name2 by index type name in decreasing order failed\n"); PART_ERROR(H5Literate_by_name_link_name_decreasing); } if (i != 2 * LINK_ITER_SOFT_LINKS_TEST_NUM_LINKS) { H5_FAILED(); - HDprintf(" some links were not iterated over!\n"); + printf(" some links were not iterated over!\n"); PART_ERROR(H5Literate_by_name_link_name_decreasing); } @@ -20251,7 +20128,7 @@ test_link_iterate_soft_links(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" creation order tracking isn't supported with this VOL connector\n"); + printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Literate_by_name_creation_increasing); } @@ -20262,13 +20139,13 @@ test_link_iterate_soft_links(void) file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_ITER_SOFT_LINKS_TEST_SUBGROUP_NAME, H5_INDEX_CRT_ORDER, H5_ITER_INC, NULL, link_iter_soft_links_cb, &i, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" H5Literate_by_name2 by index type creation order in increasing order failed\n"); + printf(" H5Literate_by_name2 by index type creation order in increasing order failed\n"); PART_ERROR(H5Literate_by_name_creation_increasing); } if (i != 3 * LINK_ITER_SOFT_LINKS_TEST_NUM_LINKS) { H5_FAILED(); - HDprintf(" some links were not iterated over!\n"); + printf(" some links were not iterated over!\n"); PART_ERROR(H5Literate_by_name_creation_increasing); } @@ -20282,7 +20159,7 @@ test_link_iterate_soft_links(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" creation order tracking isn't supported with this VOL connector\n"); + printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Literate_by_name_creation_decreasing); } @@ -20293,13 +20170,13 @@ test_link_iterate_soft_links(void) file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_ITER_SOFT_LINKS_TEST_SUBGROUP_NAME, H5_INDEX_CRT_ORDER, H5_ITER_DEC, NULL, link_iter_soft_links_cb, &i, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" H5Literate_by_name2 by index type creation order in decreasing order failed\n"); + printf(" H5Literate_by_name2 by index type creation order in decreasing order failed\n"); PART_ERROR(H5Literate_by_name_creation_decreasing); } if (i != 4 * LINK_ITER_SOFT_LINKS_TEST_NUM_LINKS) { H5_FAILED(); - HDprintf(" some links were not iterated over!\n"); + printf(" some links were not iterated over!\n"); PART_ERROR(H5Literate_by_name_creation_decreasing); } @@ -20361,8 +20238,8 @@ test_link_iterate_external_links(void) !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_EXTERNAL_LINKS) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ITERATE)) { SKIPPED(); - HDprintf(" API functions for basic file, group, link, external link, or iterate " - "aren't supported with this connector\n"); + printf(" API functions for basic file, group, link, external link, or iterate " + "aren't supported with this connector\n"); return 0; } @@ -20372,7 +20249,7 @@ test_link_iterate_external_links(void) if ((file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); + printf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); goto error; } @@ -20381,26 +20258,26 @@ test_link_iterate_external_links(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); goto error; } if ((gcpl_id = H5Pcreate(H5P_GROUP_CREATE)) < 0) { H5_FAILED(); - HDprintf(" couldn't create GCPL for link creation order tracking\n"); + printf(" couldn't create GCPL for link creation order tracking\n"); goto error; } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (H5Pset_link_creation_order(gcpl_id, H5P_CRT_ORDER_TRACKED) < 0) { H5_FAILED(); - HDprintf(" couldn't set link creation order tracking\n"); + printf(" couldn't set link creation order tracking\n"); goto error; } } @@ -20408,7 +20285,7 @@ test_link_iterate_external_links(void) if ((group_id = H5Gcreate2(container_group, LINK_ITER_EXT_LINKS_TEST_SUBGROUP_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container subgroup '%s'\n", LINK_ITER_EXT_LINKS_TEST_SUBGROUP_NAME); + printf(" couldn't create container subgroup '%s'\n", LINK_ITER_EXT_LINKS_TEST_SUBGROUP_NAME); goto error; } @@ -20421,20 +20298,20 @@ test_link_iterate_external_links(void) if (H5Lcreate_external(ext_link_filename, "/", group_id, link_name, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create external link '%s'\n", link_name); + printf(" couldn't create external link '%s'\n", link_name); goto error; } /* Verify the link has been created */ if ((link_exists = H5Lexists(group_id, link_name, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if link '%s' exists\n", link_name); + printf(" couldn't determine if link '%s' exists\n", link_name); goto error; } if (!link_exists) { H5_FAILED(); - HDprintf(" link '%s' did not exist\n", link_name); + printf(" link '%s' did not exist\n", link_name); goto error; } } @@ -20460,13 +20337,13 @@ test_link_iterate_external_links(void) if (H5Literate2(group_id, H5_INDEX_NAME, H5_ITER_INC, NULL, link_iter_external_links_cb, &i) < 0) { H5_FAILED(); - HDprintf(" H5Literate2 by index type name in increasing order failed\n"); + printf(" H5Literate2 by index type name in increasing order failed\n"); PART_ERROR(H5Literate_link_name_increasing); } if (i != LINK_ITER_EXT_LINKS_TEST_NUM_LINKS) { H5_FAILED(); - HDprintf(" some links were not iterated over!\n"); + printf(" some links were not iterated over!\n"); PART_ERROR(H5Literate_link_name_increasing); } @@ -20484,13 +20361,13 @@ test_link_iterate_external_links(void) if (H5Literate2(group_id, H5_INDEX_NAME, H5_ITER_DEC, NULL, link_iter_external_links_cb, &i) < 0) { H5_FAILED(); - HDprintf(" H5Literate2 by index type name in decreasing order failed\n"); + printf(" H5Literate2 by index type name in decreasing order failed\n"); PART_ERROR(H5Literate_link_name_decreasing); } if (i != 2 * LINK_ITER_EXT_LINKS_TEST_NUM_LINKS) { H5_FAILED(); - HDprintf(" some links were not iterated over!\n"); + printf(" some links were not iterated over!\n"); PART_ERROR(H5Literate_link_name_decreasing); } @@ -20504,7 +20381,7 @@ test_link_iterate_external_links(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" creation order tracking isn't supported with this VOL connector\n"); + printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Literate_link_creation_increasing); } @@ -20514,13 +20391,13 @@ test_link_iterate_external_links(void) if (H5Literate2(group_id, H5_INDEX_CRT_ORDER, H5_ITER_INC, NULL, link_iter_external_links_cb, &i) < 0) { H5_FAILED(); - HDprintf(" H5Literate2 by index type creation order in increasing order failed\n"); + printf(" H5Literate2 by index type creation order in increasing order failed\n"); PART_ERROR(H5Literate_link_creation_increasing); } if (i != 3 * LINK_ITER_EXT_LINKS_TEST_NUM_LINKS) { H5_FAILED(); - HDprintf(" some links were not iterated over!\n"); + printf(" some links were not iterated over!\n"); PART_ERROR(H5Literate_link_creation_increasing); } @@ -20534,7 +20411,7 @@ test_link_iterate_external_links(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" creation order tracking isn't supported with this VOL connector\n"); + printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Literate_link_creation_decreasing); } @@ -20544,13 +20421,13 @@ test_link_iterate_external_links(void) if (H5Literate2(group_id, H5_INDEX_CRT_ORDER, H5_ITER_DEC, NULL, link_iter_external_links_cb, &i) < 0) { H5_FAILED(); - HDprintf(" H5Literate2 by index type creation order in decreasing order failed\n"); + printf(" H5Literate2 by index type creation order in decreasing order failed\n"); PART_ERROR(H5Literate_link_creation_decreasing); } if (i != 4 * LINK_ITER_EXT_LINKS_TEST_NUM_LINKS) { H5_FAILED(); - HDprintf(" some links were not iterated over!\n"); + printf(" some links were not iterated over!\n"); PART_ERROR(H5Literate_link_creation_decreasing); } @@ -20569,13 +20446,13 @@ test_link_iterate_external_links(void) file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_ITER_EXT_LINKS_TEST_SUBGROUP_NAME, H5_INDEX_NAME, H5_ITER_INC, NULL, link_iter_external_links_cb, &i, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" H5Literate_by_name2 by index type name in increasing order failed\n"); + printf(" H5Literate_by_name2 by index type name in increasing order failed\n"); PART_ERROR(H5Literate_by_name_link_name_increasing); } if (i != LINK_ITER_EXT_LINKS_TEST_NUM_LINKS) { H5_FAILED(); - HDprintf(" some links were not iterated over!\n"); + printf(" some links were not iterated over!\n"); PART_ERROR(H5Literate_by_name_link_name_increasing); } @@ -20594,13 +20471,13 @@ test_link_iterate_external_links(void) file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_ITER_EXT_LINKS_TEST_SUBGROUP_NAME, H5_INDEX_NAME, H5_ITER_DEC, NULL, link_iter_external_links_cb, &i, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" H5Literate_by_name2 by index type name in decreasing order failed\n"); + printf(" H5Literate_by_name2 by index type name in decreasing order failed\n"); PART_ERROR(H5Literate_by_name_link_name_decreasing); } if (i != 2 * LINK_ITER_EXT_LINKS_TEST_NUM_LINKS) { H5_FAILED(); - HDprintf(" some links were not iterated over!\n"); + printf(" some links were not iterated over!\n"); PART_ERROR(H5Literate_by_name_link_name_decreasing); } @@ -20614,7 +20491,7 @@ test_link_iterate_external_links(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" creation order tracking isn't supported with this VOL connector\n"); + printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Literate_by_name_creation_increasing); } @@ -20626,13 +20503,13 @@ test_link_iterate_external_links(void) H5_INDEX_CRT_ORDER, H5_ITER_INC, NULL, link_iter_external_links_cb, &i, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" H5Literate_by_name2 by index type creation order in increasing order failed\n"); + printf(" H5Literate_by_name2 by index type creation order in increasing order failed\n"); PART_ERROR(H5Literate_by_name_creation_increasing); } if (i != 3 * LINK_ITER_EXT_LINKS_TEST_NUM_LINKS) { H5_FAILED(); - HDprintf(" some links were not iterated over!\n"); + printf(" some links were not iterated over!\n"); PART_ERROR(H5Literate_by_name_creation_increasing); } @@ -20646,7 +20523,7 @@ test_link_iterate_external_links(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" creation order tracking isn't supported with this VOL connector\n"); + printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Literate_by_name_creation_decreasing); } @@ -20658,13 +20535,13 @@ test_link_iterate_external_links(void) H5_INDEX_CRT_ORDER, H5_ITER_DEC, NULL, link_iter_external_links_cb, &i, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" H5Literate_by_name2 by index type creation order in decreasing order failed\n"); + printf(" H5Literate_by_name2 by index type creation order in decreasing order failed\n"); PART_ERROR(H5Literate_by_name_creation_decreasing); } if (i != 4 * LINK_ITER_EXT_LINKS_TEST_NUM_LINKS) { H5_FAILED(); - HDprintf(" some links were not iterated over!\n"); + printf(" some links were not iterated over!\n"); PART_ERROR(H5Literate_by_name_creation_decreasing); } @@ -20758,8 +20635,8 @@ test_link_iterate_mixed_links(void) !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_EXTERNAL_LINKS) || !(vol_cap_flags_g & H5VL_CAP_FLAG_SOFT_LINKS) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ITERATE)) { SKIPPED(); - HDprintf(" API functions for basic file, group, link, soft link, external link, or iterate " - "aren't supported with this connector\n"); + printf(" API functions for basic file, group, link, soft link, external link, or iterate " + "aren't supported with this connector\n"); return 0; } @@ -20769,7 +20646,7 @@ test_link_iterate_mixed_links(void) if ((file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); + printf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); goto error; } @@ -20778,26 +20655,26 @@ test_link_iterate_mixed_links(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); goto error; } if ((gcpl_id = H5Pcreate(H5P_GROUP_CREATE)) < 0) { H5_FAILED(); - HDprintf(" couldn't create GCPL for link creation order tracking\n"); + printf(" couldn't create GCPL for link creation order tracking\n"); goto error; } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (H5Pset_link_creation_order(gcpl_id, H5P_CRT_ORDER_TRACKED) < 0) { H5_FAILED(); - HDprintf(" couldn't set link creation order tracking\n"); + printf(" couldn't set link creation order tracking\n"); goto error; } } @@ -20805,7 +20682,7 @@ test_link_iterate_mixed_links(void) if ((group_id = H5Gcreate2(container_group, LINK_ITER_MIXED_LINKS_TEST_SUBGROUP_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container subgroup '%s'\n", LINK_ITER_MIXED_LINKS_TEST_SUBGROUP_NAME); + printf(" couldn't create container subgroup '%s'\n", LINK_ITER_MIXED_LINKS_TEST_SUBGROUP_NAME); goto error; } @@ -20819,7 +20696,7 @@ test_link_iterate_mixed_links(void) if ((dset_id = H5Dcreate2(group_id, LINK_ITER_MIXED_LINKS_TEST_HARD_LINK_NAME, dset_dtype, dset_dspace, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create hard link '%s'\n", LINK_ITER_MIXED_LINKS_TEST_HARD_LINK_NAME); + printf(" couldn't create hard link '%s'\n", LINK_ITER_MIXED_LINKS_TEST_HARD_LINK_NAME); goto error; } @@ -20827,51 +20704,51 @@ test_link_iterate_mixed_links(void) "/" LINK_ITER_MIXED_LINKS_TEST_HARD_LINK_NAME, group_id, LINK_ITER_MIXED_LINKS_TEST_SOFT_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create soft link '%s'\n", LINK_ITER_MIXED_LINKS_TEST_SOFT_LINK_NAME); + printf(" couldn't create soft link '%s'\n", LINK_ITER_MIXED_LINKS_TEST_SOFT_LINK_NAME); goto error; } if (H5Lcreate_external(ext_link_filename, "/", group_id, LINK_ITER_MIXED_LINKS_TEST_EXT_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create external link '%s'\n", LINK_ITER_MIXED_LINKS_TEST_EXT_LINK_NAME); + printf(" couldn't create external link '%s'\n", LINK_ITER_MIXED_LINKS_TEST_EXT_LINK_NAME); goto error; } /* Verify the links have been created */ if ((link_exists = H5Lexists(group_id, LINK_ITER_MIXED_LINKS_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if link '%s' exists\n", LINK_ITER_MIXED_LINKS_TEST_HARD_LINK_NAME); + printf(" couldn't determine if link '%s' exists\n", LINK_ITER_MIXED_LINKS_TEST_HARD_LINK_NAME); goto error; } if (!link_exists) { H5_FAILED(); - HDprintf(" first link did not exist\n"); + printf(" first link did not exist\n"); goto error; } if ((link_exists = H5Lexists(group_id, LINK_ITER_MIXED_LINKS_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if link '%s' exists\n", LINK_ITER_MIXED_LINKS_TEST_SOFT_LINK_NAME); + printf(" couldn't determine if link '%s' exists\n", LINK_ITER_MIXED_LINKS_TEST_SOFT_LINK_NAME); goto error; } if (!link_exists) { H5_FAILED(); - HDprintf(" second link did not exist\n"); + printf(" second link did not exist\n"); goto error; } if ((link_exists = H5Lexists(group_id, LINK_ITER_MIXED_LINKS_TEST_EXT_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if link '%s' exists\n", LINK_ITER_MIXED_LINKS_TEST_EXT_LINK_NAME); + printf(" couldn't determine if link '%s' exists\n", LINK_ITER_MIXED_LINKS_TEST_EXT_LINK_NAME); goto error; } if (!link_exists) { H5_FAILED(); - HDprintf(" third link did not exist\n"); + printf(" third link did not exist\n"); goto error; } @@ -20895,13 +20772,13 @@ test_link_iterate_mixed_links(void) /* Test basic link iteration capability using both index types and both index orders */ if (H5Literate2(group_id, H5_INDEX_NAME, H5_ITER_INC, NULL, link_iter_mixed_links_cb, &i) < 0) { H5_FAILED(); - HDprintf(" H5Literate2 by index type name in increasing order failed\n"); + printf(" H5Literate2 by index type name in increasing order failed\n"); PART_ERROR(H5Literate_link_name_increasing); } if (i != LINK_ITER_MIXED_LINKS_TEST_NUM_LINKS) { H5_FAILED(); - HDprintf(" some links were not iterated over!\n"); + printf(" some links were not iterated over!\n"); PART_ERROR(H5Literate_link_name_increasing); } @@ -20918,13 +20795,13 @@ test_link_iterate_mixed_links(void) if (H5Literate2(group_id, H5_INDEX_NAME, H5_ITER_DEC, NULL, link_iter_mixed_links_cb, &i) < 0) { H5_FAILED(); - HDprintf(" H5Literate2 by index type name in decreasing order failed\n"); + printf(" H5Literate2 by index type name in decreasing order failed\n"); PART_ERROR(H5Literate_link_name_decreasing); } if (i != 2 * LINK_ITER_MIXED_LINKS_TEST_NUM_LINKS) { H5_FAILED(); - HDprintf(" some links were not iterated over!\n"); + printf(" some links were not iterated over!\n"); PART_ERROR(H5Literate_link_name_decreasing); } @@ -20938,7 +20815,7 @@ test_link_iterate_mixed_links(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" creation order tracking isn't supported with this VOL connector\n"); + printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Literate_link_creation_increasing); } @@ -20948,13 +20825,13 @@ test_link_iterate_mixed_links(void) if (H5Literate2(group_id, H5_INDEX_CRT_ORDER, H5_ITER_INC, NULL, link_iter_mixed_links_cb, &i) < 0) { H5_FAILED(); - HDprintf(" H5Literate2 by index type creation order in increasing order failed\n"); + printf(" H5Literate2 by index type creation order in increasing order failed\n"); PART_ERROR(H5Literate_link_creation_increasing); } if (i != 3 * LINK_ITER_MIXED_LINKS_TEST_NUM_LINKS) { H5_FAILED(); - HDprintf(" some links were not iterated over!\n"); + printf(" some links were not iterated over!\n"); PART_ERROR(H5Literate_link_creation_increasing); } @@ -20968,7 +20845,7 @@ test_link_iterate_mixed_links(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" creation order tracking isn't supported with this VOL connector\n"); + printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Literate_link_creation_decreasing); } @@ -20978,13 +20855,13 @@ test_link_iterate_mixed_links(void) if (H5Literate2(group_id, H5_INDEX_CRT_ORDER, H5_ITER_DEC, NULL, link_iter_mixed_links_cb, &i) < 0) { H5_FAILED(); - HDprintf(" H5Literate2 by index type creation order in decreasing order failed\n"); + printf(" H5Literate2 by index type creation order in decreasing order failed\n"); PART_ERROR(H5Literate_link_creation_decreasing); } if (i != 4 * LINK_ITER_MIXED_LINKS_TEST_NUM_LINKS) { H5_FAILED(); - HDprintf(" some links were not iterated over!\n"); + printf(" some links were not iterated over!\n"); PART_ERROR(H5Literate_link_creation_decreasing); } @@ -21002,13 +20879,13 @@ test_link_iterate_mixed_links(void) file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_ITER_MIXED_LINKS_TEST_SUBGROUP_NAME, H5_INDEX_NAME, H5_ITER_INC, NULL, link_iter_mixed_links_cb, &i, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" H5Literate_by_name2 by index type name in increasing order failed\n"); + printf(" H5Literate_by_name2 by index type name in increasing order failed\n"); PART_ERROR(H5Literate_by_name_link_name_increasing); } if (i != LINK_ITER_MIXED_LINKS_TEST_NUM_LINKS) { H5_FAILED(); - HDprintf(" some links were not iterated over!\n"); + printf(" some links were not iterated over!\n"); PART_ERROR(H5Literate_by_name_link_name_increasing); } @@ -21027,13 +20904,13 @@ test_link_iterate_mixed_links(void) file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_ITER_MIXED_LINKS_TEST_SUBGROUP_NAME, H5_INDEX_NAME, H5_ITER_DEC, NULL, link_iter_mixed_links_cb, &i, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" H5Literate_by_name2 by index type name in decreasing order failed\n"); + printf(" H5Literate_by_name2 by index type name in decreasing order failed\n"); PART_ERROR(H5Literate_by_name_link_name_decreasing); } if (i != 2 * LINK_ITER_MIXED_LINKS_TEST_NUM_LINKS) { H5_FAILED(); - HDprintf(" some links were not iterated over!\n"); + printf(" some links were not iterated over!\n"); PART_ERROR(H5Literate_by_name_link_name_decreasing); } @@ -21047,7 +20924,7 @@ test_link_iterate_mixed_links(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" creation order tracking isn't supported with this VOL connector\n"); + printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Literate_by_name_creation_increasing); } @@ -21058,13 +20935,13 @@ test_link_iterate_mixed_links(void) file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_ITER_MIXED_LINKS_TEST_SUBGROUP_NAME, H5_INDEX_CRT_ORDER, H5_ITER_INC, NULL, link_iter_mixed_links_cb, &i, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" H5Literate_by_name2 by index type creation order in increasing order failed\n"); + printf(" H5Literate_by_name2 by index type creation order in increasing order failed\n"); PART_ERROR(H5Literate_by_name_creation_increasing); } if (i != 3 * LINK_ITER_MIXED_LINKS_TEST_NUM_LINKS) { H5_FAILED(); - HDprintf(" some links were not iterated over!\n"); + printf(" some links were not iterated over!\n"); PART_ERROR(H5Literate_by_name_creation_increasing); } @@ -21078,7 +20955,7 @@ test_link_iterate_mixed_links(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" creation order tracking isn't supported with this VOL connector\n"); + printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Literate_by_name_creation_decreasing); } @@ -21089,13 +20966,13 @@ test_link_iterate_mixed_links(void) file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_ITER_MIXED_LINKS_TEST_SUBGROUP_NAME, H5_INDEX_CRT_ORDER, H5_ITER_DEC, NULL, link_iter_mixed_links_cb, &i, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" H5Literate_by_name2 by index type creation order in decreasing order failed\n"); + printf(" H5Literate_by_name2 by index type creation order in decreasing order failed\n"); PART_ERROR(H5Literate_by_name_creation_decreasing); } if (i != 4 * LINK_ITER_MIXED_LINKS_TEST_NUM_LINKS) { H5_FAILED(); - HDprintf(" some links were not iterated over!\n"); + printf(" some links were not iterated over!\n"); PART_ERROR(H5Literate_by_name_creation_decreasing); } @@ -21109,7 +20986,7 @@ test_link_iterate_mixed_links(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" creation order tracking isn't supported with this VOL connector\n"); + printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Literate_index_saving_increasing); } @@ -21120,20 +20997,20 @@ test_link_iterate_mixed_links(void) if (H5Literate2(group_id, H5_INDEX_CRT_ORDER, H5_ITER_INC, &saved_idx, link_iter_idx_saving_cb, &halted) < 0) { H5_FAILED(); - HDprintf(" H5Literate2 index-saving capability test failed\n"); + printf(" H5Literate2 index-saving capability test failed\n"); PART_ERROR(H5Literate_index_saving_increasing); } if (saved_idx != 2) { H5_FAILED(); - HDprintf(" saved index after iteration was wrong\n"); + printf(" saved index after iteration was wrong\n"); PART_ERROR(H5Literate_index_saving_increasing); } if (H5Literate2(group_id, H5_INDEX_CRT_ORDER, H5_ITER_INC, &saved_idx, link_iter_idx_saving_cb, &halted) < 0) { H5_FAILED(); - HDprintf(" couldn't finish iterating when beginning from saved index\n"); + printf(" couldn't finish iterating when beginning from saved index\n"); PART_ERROR(H5Literate_index_saving_increasing); } @@ -21147,7 +21024,7 @@ test_link_iterate_mixed_links(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" creation order tracking isn't supported with this VOL connector\n"); + printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Literate_index_saving_decreasing); } @@ -21157,20 +21034,20 @@ test_link_iterate_mixed_links(void) if (H5Literate2(group_id, H5_INDEX_CRT_ORDER, H5_ITER_DEC, &saved_idx, link_iter_idx_saving_cb, &halted) < 0) { H5_FAILED(); - HDprintf(" H5Literate2 index-saving capability test failed\n"); + printf(" H5Literate2 index-saving capability test failed\n"); PART_ERROR(H5Literate_index_saving_decreasing); } if (saved_idx != 2) { H5_FAILED(); - HDprintf(" saved index after iteration was wrong\n"); + printf(" saved index after iteration was wrong\n"); PART_ERROR(H5Literate_index_saving_decreasing); } if (H5Literate2(group_id, H5_INDEX_CRT_ORDER, H5_ITER_DEC, &saved_idx, link_iter_idx_saving_cb, &halted) < 0) { H5_FAILED(); - HDprintf(" couldn't finish iterating when beginning from saved index\n"); + printf(" couldn't finish iterating when beginning from saved index\n"); PART_ERROR(H5Literate_index_saving_decreasing); } @@ -21244,9 +21121,8 @@ test_link_iterate_invalid_params(void) !(vol_cap_flags_g & H5VL_CAP_FLAG_SOFT_LINKS) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ITERATE) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC)) { SKIPPED(); - HDprintf( - " API functions for basic file, group, dataset, link, soft link, external link, or iterate " - "aren't supported with this connector\n"); + printf(" API functions for basic file, group, dataset, link, soft link, external link, or iterate " + "aren't supported with this connector\n"); return 0; } @@ -21256,7 +21132,7 @@ test_link_iterate_invalid_params(void) if ((file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); + printf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); goto error; } @@ -21265,21 +21141,20 @@ test_link_iterate_invalid_params(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, LINK_ITER_INVALID_PARAMS_TEST_SUBGROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container subgroup '%s'\n", - LINK_ITER_INVALID_PARAMS_TEST_SUBGROUP_NAME); + printf(" couldn't create container subgroup '%s'\n", LINK_ITER_INVALID_PARAMS_TEST_SUBGROUP_NAME); goto error; } @@ -21293,7 +21168,7 @@ test_link_iterate_invalid_params(void) if ((dset_id = H5Dcreate2(group_id, LINK_ITER_INVALID_PARAMS_TEST_HARD_LINK_NAME, dset_dtype, dset_dspace, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create hard link '%s'\n", LINK_ITER_INVALID_PARAMS_TEST_HARD_LINK_NAME); + printf(" couldn't create hard link '%s'\n", LINK_ITER_INVALID_PARAMS_TEST_HARD_LINK_NAME); goto error; } @@ -21302,50 +21177,48 @@ test_link_iterate_invalid_params(void) group_id, LINK_ITER_INVALID_PARAMS_TEST_SOFT_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create soft link '%s'\n", LINK_ITER_INVALID_PARAMS_TEST_SOFT_LINK_NAME); + printf(" couldn't create soft link '%s'\n", LINK_ITER_INVALID_PARAMS_TEST_SOFT_LINK_NAME); goto error; } if (H5Lcreate_external(ext_link_filename, "/", group_id, LINK_ITER_INVALID_PARAMS_TEST_EXT_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create external link '%s'\n", LINK_ITER_INVALID_PARAMS_TEST_EXT_LINK_NAME); + printf(" couldn't create external link '%s'\n", LINK_ITER_INVALID_PARAMS_TEST_EXT_LINK_NAME); goto error; } /* Verify the links have been created */ if ((link_exists = H5Lexists(group_id, LINK_ITER_INVALID_PARAMS_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if link '%s' exists\n", - LINK_ITER_INVALID_PARAMS_TEST_HARD_LINK_NAME); + printf(" couldn't determine if link '%s' exists\n", LINK_ITER_INVALID_PARAMS_TEST_HARD_LINK_NAME); goto error; } if (!link_exists) { H5_FAILED(); - HDprintf(" first link did not exist\n"); + printf(" first link did not exist\n"); goto error; } if ((link_exists = H5Lexists(group_id, LINK_ITER_INVALID_PARAMS_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if link '%s' exists\n", - LINK_ITER_INVALID_PARAMS_TEST_SOFT_LINK_NAME); + printf(" couldn't determine if link '%s' exists\n", LINK_ITER_INVALID_PARAMS_TEST_SOFT_LINK_NAME); goto error; } if (!link_exists) { H5_FAILED(); - HDprintf(" second link did not exist\n"); + printf(" second link did not exist\n"); goto error; } if ((link_exists = H5Lexists(group_id, LINK_ITER_INVALID_PARAMS_TEST_EXT_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if link '%s' exists\n", LINK_ITER_INVALID_PARAMS_TEST_EXT_LINK_NAME); + printf(" couldn't determine if link '%s' exists\n", LINK_ITER_INVALID_PARAMS_TEST_EXT_LINK_NAME); goto error; } if (!link_exists) { H5_FAILED(); - HDprintf(" third link did not exist\n"); + printf(" third link did not exist\n"); goto error; } @@ -21368,7 +21241,7 @@ test_link_iterate_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Literate2 succeeded with an invalid group ID!\n"); + printf(" H5Literate2 succeeded with an invalid group ID!\n"); PART_ERROR(H5Literate_invalid_grp_id); } @@ -21389,7 +21262,7 @@ test_link_iterate_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Literate2 succeeded with invalid index type H5_INDEX_UNKNOWN!\n"); + printf(" H5Literate2 succeeded with invalid index type H5_INDEX_UNKNOWN!\n"); PART_ERROR(H5Literate_invalid_index_type); } @@ -21402,7 +21275,7 @@ test_link_iterate_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Literate2 succeeded with invalid index type H5_INDEX_N!\n"); + printf(" H5Literate2 succeeded with invalid index type H5_INDEX_N!\n"); PART_ERROR(H5Literate_invalid_index_type); } @@ -21423,7 +21296,7 @@ test_link_iterate_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Literate2 succeeded with invalid iteration ordering H5_ITER_UNKNOWN!\n"); + printf(" H5Literate2 succeeded with invalid iteration ordering H5_ITER_UNKNOWN!\n"); PART_ERROR(H5Literate_invalid_iter_order); } @@ -21436,7 +21309,7 @@ test_link_iterate_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Literate2 succeeded with invalid iteration ordering H5_ITER_N!\n"); + printf(" H5Literate2 succeeded with invalid iteration ordering H5_ITER_N!\n"); PART_ERROR(H5Literate_invalid_iter_order); } @@ -21458,7 +21331,7 @@ test_link_iterate_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Literate_by_name2 succeeded with an invalid location ID!\n"); + printf(" H5Literate_by_name2 succeeded with an invalid location ID!\n"); PART_ERROR(H5Literate_by_name_invalid_loc_id); } @@ -21479,7 +21352,7 @@ test_link_iterate_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Literate_by_name2 succeeded with a NULL group name!\n"); + printf(" H5Literate_by_name2 succeeded with a NULL group name!\n"); PART_ERROR(H5Literate_by_name_invalid_grp_name); } @@ -21492,7 +21365,7 @@ test_link_iterate_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Literate_by_name2 succeeded with an invalid group name of ''!\n"); + printf(" H5Literate_by_name2 succeeded with an invalid group name of ''!\n"); PART_ERROR(H5Literate_by_name_invalid_grp_name); } @@ -21514,7 +21387,7 @@ test_link_iterate_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Literate_by_name2 succeeded with invalid index type H5_INDEX_UNKNOWN!\n"); + printf(" H5Literate_by_name2 succeeded with invalid index type H5_INDEX_UNKNOWN!\n"); PART_ERROR(H5Literate_by_name_invalid_index_type); } @@ -21528,7 +21401,7 @@ test_link_iterate_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Literate_by_name2 succeeded with invalid index type H5_INDEX_N!\n"); + printf(" H5Literate_by_name2 succeeded with invalid index type H5_INDEX_N!\n"); PART_ERROR(H5Literate_by_name_invalid_index_type); } @@ -21550,7 +21423,7 @@ test_link_iterate_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf( + printf( " H5Literate_by_name2 succeeded with invalid iteration ordering H5_ITER_UNKNOWN!\n"); PART_ERROR(H5Literate_by_name_invalid_iter_order); } @@ -21565,7 +21438,7 @@ test_link_iterate_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Literate_by_name2 succeeded with invalid iteration ordering H5_ITER_N!\n"); + printf(" H5Literate_by_name2 succeeded with invalid iteration ordering H5_ITER_N!\n"); PART_ERROR(H5Literate_by_name_invalid_iter_order); } @@ -21587,7 +21460,7 @@ test_link_iterate_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Literate_by_name2 succeeded with an invalid LAPL!\n"); + printf(" H5Literate_by_name2 succeeded with an invalid LAPL!\n"); PART_ERROR(H5Literate_by_name_invalid_lapl); } @@ -21648,8 +21521,8 @@ test_link_iterate_0_links(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ITERATE)) { SKIPPED(); - HDprintf(" API functions for basic file, group, or iterate aren't supported " - "with this connector\n"); + printf(" API functions for basic file, group, or iterate aren't supported " + "with this connector\n"); return 0; } @@ -21657,26 +21530,26 @@ test_link_iterate_0_links(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); goto error; } if ((gcpl_id = H5Pcreate(H5P_GROUP_CREATE)) < 0) { H5_FAILED(); - HDprintf(" couldn't create GCPL for link creation order tracking\n"); + printf(" couldn't create GCPL for link creation order tracking\n"); goto error; } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (H5Pset_link_creation_order(gcpl_id, H5P_CRT_ORDER_TRACKED) < 0) { H5_FAILED(); - HDprintf(" couldn't set link creation order tracking\n"); + printf(" couldn't set link creation order tracking\n"); goto error; } } @@ -21684,7 +21557,7 @@ test_link_iterate_0_links(void) if ((group_id = H5Gcreate2(container_group, LINK_ITER_0_LINKS_TEST_SUBGROUP_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container subgroup '%s'\n", LINK_ITER_0_LINKS_TEST_SUBGROUP_NAME); + printf(" couldn't create container subgroup '%s'\n", LINK_ITER_0_LINKS_TEST_SUBGROUP_NAME); goto error; } @@ -21699,7 +21572,7 @@ test_link_iterate_0_links(void) /* Test basic link iteration capability using both index types and both index orders */ if (H5Literate2(group_id, H5_INDEX_NAME, H5_ITER_INC, NULL, link_iter_0_links_cb, NULL) < 0) { H5_FAILED(); - HDprintf(" H5Literate2 by index type name in increasing order failed\n"); + printf(" H5Literate2 by index type name in increasing order failed\n"); PART_ERROR(H5Literate_0_links_name_increasing); } @@ -21713,7 +21586,7 @@ test_link_iterate_0_links(void) if (H5Literate2(group_id, H5_INDEX_NAME, H5_ITER_DEC, NULL, link_iter_0_links_cb, NULL) < 0) { H5_FAILED(); - HDprintf(" H5Literate2 by index type name in decreasing order failed\n"); + printf(" H5Literate2 by index type name in decreasing order failed\n"); PART_ERROR(H5Literate_0_links_name_decreasing); } @@ -21727,14 +21600,14 @@ test_link_iterate_0_links(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" creation order tracking isn't supported with this VOL connector\n"); + printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Literate_0_links_creation_increasing); } if (H5Literate2(group_id, H5_INDEX_CRT_ORDER, H5_ITER_INC, NULL, link_iter_0_links_cb, NULL) < 0) { H5_FAILED(); - HDprintf(" H5Literate2 by index type creation order in increasing order failed\n"); + printf(" H5Literate2 by index type creation order in increasing order failed\n"); PART_ERROR(H5Literate_0_links_creation_increasing); } @@ -21748,14 +21621,14 @@ test_link_iterate_0_links(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" creation order tracking isn't supported with this VOL connector\n"); + printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Literate_0_links_creation_decreasing); } if (H5Literate2(group_id, H5_INDEX_CRT_ORDER, H5_ITER_DEC, NULL, link_iter_0_links_cb, NULL) < 0) { H5_FAILED(); - HDprintf(" H5Literate2 by index type creation order in decreasing order failed\n"); + printf(" H5Literate2 by index type creation order in decreasing order failed\n"); PART_ERROR(H5Literate_0_links_creation_decreasing); } @@ -21771,7 +21644,7 @@ test_link_iterate_0_links(void) file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_ITER_0_LINKS_TEST_SUBGROUP_NAME, H5_INDEX_NAME, H5_ITER_INC, NULL, link_iter_0_links_cb, NULL, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" H5Literate_by_name2 by index type name in increasing order failed\n"); + printf(" H5Literate_by_name2 by index type name in increasing order failed\n"); PART_ERROR(H5Literate_by_name_0_links_name_increasing); } @@ -21787,7 +21660,7 @@ test_link_iterate_0_links(void) file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_ITER_0_LINKS_TEST_SUBGROUP_NAME, H5_INDEX_NAME, H5_ITER_DEC, NULL, link_iter_0_links_cb, NULL, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" H5Literate_by_name2 by index type name in decreasing order failed\n"); + printf(" H5Literate_by_name2 by index type name in decreasing order failed\n"); PART_ERROR(H5Literate_by_name_0_links_name_decreasing); } @@ -21801,7 +21674,7 @@ test_link_iterate_0_links(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" creation order tracking isn't supported with this VOL connector\n"); + printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Literate_by_name_0_links_creation_increasing); } @@ -21809,7 +21682,7 @@ test_link_iterate_0_links(void) file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_ITER_0_LINKS_TEST_SUBGROUP_NAME, H5_INDEX_CRT_ORDER, H5_ITER_INC, NULL, link_iter_0_links_cb, NULL, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" H5Literate_by_name2 by index type creation order in increasing order failed\n"); + printf(" H5Literate_by_name2 by index type creation order in increasing order failed\n"); PART_ERROR(H5Literate_by_name_0_links_creation_increasing); } @@ -21823,7 +21696,7 @@ test_link_iterate_0_links(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" creation order tracking isn't supported with this VOL connector\n"); + printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Literate_by_name_0_links_creation_decreasing); } @@ -21831,7 +21704,7 @@ test_link_iterate_0_links(void) file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_ITER_0_LINKS_TEST_SUBGROUP_NAME, H5_INDEX_CRT_ORDER, H5_ITER_DEC, NULL, link_iter_0_links_cb, NULL, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" H5Literate_by_name2 by index type creation order in decreasing order failed\n"); + printf(" H5Literate_by_name2 by index type creation order in decreasing order failed\n"); PART_ERROR(H5Literate_by_name_0_links_creation_decreasing); } @@ -21896,8 +21769,8 @@ test_link_visit_hard_links_no_cycles(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ITERATE)) { SKIPPED(); - HDprintf(" API functions for basic file, group, dataset, or link iterate aren't " - "supported with this connector\n"); + printf(" API functions for basic file, group, dataset, or link iterate aren't " + "supported with this connector\n"); return 0; } @@ -21905,26 +21778,26 @@ test_link_visit_hard_links_no_cycles(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); goto error; } if ((gcpl_id = H5Pcreate(H5P_GROUP_CREATE)) < 0) { H5_FAILED(); - HDprintf(" couldn't create a GCPL\n"); + printf(" couldn't create a GCPL\n"); goto error; } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (H5Pset_link_creation_order(gcpl_id, H5P_CRT_ORDER_TRACKED | H5P_CRT_ORDER_INDEXED) < 0) { H5_FAILED(); - HDprintf(" couldn't enable link creation order tracking and indexing on GCPL\n"); + printf(" couldn't enable link creation order tracking and indexing on GCPL\n"); goto error; } } @@ -21932,8 +21805,8 @@ test_link_visit_hard_links_no_cycles(void) if ((group_id = H5Gcreate2(container_group, LINK_VISIT_HARD_LINKS_NO_CYCLE_TEST_SUBGROUP_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container subgroup '%s'\n", - LINK_VISIT_HARD_LINKS_NO_CYCLE_TEST_SUBGROUP_NAME); + printf(" couldn't create container subgroup '%s'\n", + LINK_VISIT_HARD_LINKS_NO_CYCLE_TEST_SUBGROUP_NAME); goto error; } @@ -21955,7 +21828,7 @@ test_link_visit_hard_links_no_cycles(void) if ((subgroup_id = H5Gcreate2(group_id, grp_name, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create subgroup '%s'\n", grp_name); + printf(" couldn't create subgroup '%s'\n", grp_name); goto error; } @@ -21970,33 +21843,33 @@ test_link_visit_hard_links_no_cycles(void) if ((dset_id = H5Dcreate2(subgroup_id, dset_name, dset_dtype, dset_dspace, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create hard link '%s'\n", dset_name); + printf(" couldn't create hard link '%s'\n", dset_name); goto error; } /* Verify the link has been created */ if ((link_exists = H5Lexists(subgroup_id, dset_name, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if link '%s' exists\n", dset_name); + printf(" couldn't determine if link '%s' exists\n", dset_name); goto error; } if (!link_exists) { H5_FAILED(); - HDprintf(" link '%s' did not exist\n", dset_name); + printf(" link '%s' did not exist\n", dset_name); goto error; } if (H5Dclose(dset_id) < 0) { H5_FAILED(); - HDprintf(" couldn't close dataset '%s'\n", dset_name); + printf(" couldn't close dataset '%s'\n", dset_name); goto error; } } if (H5Gclose(subgroup_id) < 0) { H5_FAILED(); - HDprintf(" couldn't close subgroup '%s'\n", grp_name); + printf(" couldn't close subgroup '%s'\n", grp_name); goto error; } } @@ -22020,13 +21893,13 @@ test_link_visit_hard_links_no_cycles(void) if (H5Lvisit2(group_id, H5_INDEX_NAME, H5_ITER_INC, link_visit_hard_links_no_cycles_cb, &i) < 0) { H5_FAILED(); - HDprintf(" H5Lvisit2 by index type name in increasing order failed\n"); + printf(" H5Lvisit2 by index type name in increasing order failed\n"); PART_ERROR(H5Lvisit_no_cycles_link_name_increasing); } if (i != LINK_VISIT_HARD_LINKS_NO_CYCLE_TEST_NUM_LINKS_PER_TEST) { H5_FAILED(); - HDprintf(" some links were not visited!\n"); + printf(" some links were not visited!\n"); PART_ERROR(H5Lvisit_no_cycles_link_name_increasing); } @@ -22043,13 +21916,13 @@ test_link_visit_hard_links_no_cycles(void) if (H5Lvisit2(group_id, H5_INDEX_NAME, H5_ITER_DEC, link_visit_hard_links_no_cycles_cb, &i) < 0) { H5_FAILED(); - HDprintf(" H5Lvisit2 by index type name in decreasing order failed\n"); + printf(" H5Lvisit2 by index type name in decreasing order failed\n"); PART_ERROR(H5Lvisit_no_cycles_link_name_decreasing); } if (i != 2 * LINK_VISIT_HARD_LINKS_NO_CYCLE_TEST_NUM_LINKS_PER_TEST) { H5_FAILED(); - HDprintf(" some links were not visited!\n"); + printf(" some links were not visited!\n"); PART_ERROR(H5Lvisit_no_cycles_link_name_decreasing); } @@ -22063,7 +21936,7 @@ test_link_visit_hard_links_no_cycles(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" creation order tracking isn't supported with this VOL connector\n"); + printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Lvisit_no_cycles_link_creation_increasing); } @@ -22073,13 +21946,13 @@ test_link_visit_hard_links_no_cycles(void) if (H5Lvisit2(group_id, H5_INDEX_CRT_ORDER, H5_ITER_INC, link_visit_hard_links_no_cycles_cb, &i) < 0) { H5_FAILED(); - HDprintf(" H5Lvisit2 by index type creation order in increasing order failed\n"); + printf(" H5Lvisit2 by index type creation order in increasing order failed\n"); PART_ERROR(H5Lvisit_no_cycles_link_creation_increasing); } if (i != 3 * LINK_VISIT_HARD_LINKS_NO_CYCLE_TEST_NUM_LINKS_PER_TEST) { H5_FAILED(); - HDprintf(" some links were not visited!\n"); + printf(" some links were not visited!\n"); PART_ERROR(H5Lvisit_no_cycles_link_creation_increasing); } @@ -22093,7 +21966,7 @@ test_link_visit_hard_links_no_cycles(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" creation order tracking isn't supported with this VOL connector\n"); + printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Lvisit_no_cycles_link_creation_decreasing); } @@ -22103,13 +21976,13 @@ test_link_visit_hard_links_no_cycles(void) if (H5Lvisit2(group_id, H5_INDEX_CRT_ORDER, H5_ITER_DEC, link_visit_hard_links_no_cycles_cb, &i) < 0) { H5_FAILED(); - HDprintf(" H5Lvisit2 by index type creation order in decreasing order failed\n"); + printf(" H5Lvisit2 by index type creation order in decreasing order failed\n"); PART_ERROR(H5Lvisit_no_cycles_link_creation_decreasing); } if (i != 4 * LINK_VISIT_HARD_LINKS_NO_CYCLE_TEST_NUM_LINKS_PER_TEST) { H5_FAILED(); - HDprintf(" some links were not visited!\n"); + printf(" some links were not visited!\n"); PART_ERROR(H5Lvisit_no_cycles_link_creation_decreasing); } @@ -22128,13 +22001,13 @@ test_link_visit_hard_links_no_cycles(void) file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_VISIT_HARD_LINKS_NO_CYCLE_TEST_SUBGROUP_NAME, H5_INDEX_NAME, H5_ITER_INC, link_visit_hard_links_no_cycles_cb, &i, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" H5Lvisit_by_name2 by index type name in increasing order failed\n"); + printf(" H5Lvisit_by_name2 by index type name in increasing order failed\n"); PART_ERROR(H5Lvisit_by_name_no_cycles_link_name_increasing); } if (i != LINK_VISIT_HARD_LINKS_NO_CYCLE_TEST_NUM_LINKS_PER_TEST) { H5_FAILED(); - HDprintf(" some links were not visited!\n"); + printf(" some links were not visited!\n"); PART_ERROR(H5Lvisit_by_name_no_cycles_link_name_increasing); } @@ -22153,13 +22026,13 @@ test_link_visit_hard_links_no_cycles(void) file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_VISIT_HARD_LINKS_NO_CYCLE_TEST_SUBGROUP_NAME, H5_INDEX_NAME, H5_ITER_DEC, link_visit_hard_links_no_cycles_cb, &i, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" H5Lvisit_by_name2 by index type name in decreasing order failed\n"); + printf(" H5Lvisit_by_name2 by index type name in decreasing order failed\n"); PART_ERROR(H5Lvisit_by_name_no_cycles_link_name_decreasing); } if (i != 2 * LINK_VISIT_HARD_LINKS_NO_CYCLE_TEST_NUM_LINKS_PER_TEST) { H5_FAILED(); - HDprintf(" some links were not visited!\n"); + printf(" some links were not visited!\n"); PART_ERROR(H5Lvisit_by_name_no_cycles_link_name_decreasing); } @@ -22173,7 +22046,7 @@ test_link_visit_hard_links_no_cycles(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" creation order tracking isn't supported with this VOL connector\n"); + printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Lvisit_by_name_no_cycles_link_creation_increasing); } @@ -22185,13 +22058,13 @@ test_link_visit_hard_links_no_cycles(void) H5_INDEX_CRT_ORDER, H5_ITER_INC, link_visit_hard_links_no_cycles_cb, &i, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" H5Lvisit_by_name2 by index type creation order in increasing order failed\n"); + printf(" H5Lvisit_by_name2 by index type creation order in increasing order failed\n"); PART_ERROR(H5Lvisit_by_name_no_cycles_link_creation_increasing); } if (i != 3 * LINK_VISIT_HARD_LINKS_NO_CYCLE_TEST_NUM_LINKS_PER_TEST) { H5_FAILED(); - HDprintf(" some links were not visited!\n"); + printf(" some links were not visited!\n"); PART_ERROR(H5Lvisit_by_name_no_cycles_link_creation_increasing); } @@ -22205,7 +22078,7 @@ test_link_visit_hard_links_no_cycles(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" creation order tracking isn't supported with this VOL connector\n"); + printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Lvisit_by_name_no_cycles_link_creation_decreasing); } @@ -22217,13 +22090,13 @@ test_link_visit_hard_links_no_cycles(void) H5_INDEX_CRT_ORDER, H5_ITER_DEC, link_visit_hard_links_no_cycles_cb, &i, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" H5Lvisit_by_name2 by index type creation order in decreasing order failed\n"); + printf(" H5Lvisit_by_name2 by index type creation order in decreasing order failed\n"); PART_ERROR(H5Lvisit_by_name_no_cycles_link_creation_decreasing); } if (i != 4 * LINK_VISIT_HARD_LINKS_NO_CYCLE_TEST_NUM_LINKS_PER_TEST) { H5_FAILED(); - HDprintf(" some links were not visited!\n"); + printf(" some links were not visited!\n"); PART_ERROR(H5Lvisit_by_name_no_cycles_link_creation_decreasing); } @@ -22294,8 +22167,8 @@ test_link_visit_soft_links_no_cycles(void) !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_SOFT_LINKS) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ITERATE)) { SKIPPED(); - HDprintf(" API functions for basic file, group, link, soft link, or iterate " - "aren't supported with this connector\n"); + printf(" API functions for basic file, group, link, soft link, or iterate " + "aren't supported with this connector\n"); return 0; } @@ -22303,26 +22176,26 @@ test_link_visit_soft_links_no_cycles(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); goto error; } if ((gcpl_id = H5Pcreate(H5P_GROUP_CREATE)) < 0) { H5_FAILED(); - HDprintf(" couldn't create a GCPL\n"); + printf(" couldn't create a GCPL\n"); goto error; } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (H5Pset_link_creation_order(gcpl_id, H5P_CRT_ORDER_TRACKED | H5P_CRT_ORDER_INDEXED) < 0) { H5_FAILED(); - HDprintf(" couldn't enable link creation order tracking and indexing on GCPL\n"); + printf(" couldn't enable link creation order tracking and indexing on GCPL\n"); goto error; } } @@ -22330,8 +22203,8 @@ test_link_visit_soft_links_no_cycles(void) if ((group_id = H5Gcreate2(container_group, LINK_VISIT_SOFT_LINKS_NO_CYCLE_TEST_SUBGROUP_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container subgroup '%s'\n", - LINK_VISIT_SOFT_LINKS_NO_CYCLE_TEST_SUBGROUP_NAME); + printf(" couldn't create container subgroup '%s'\n", + LINK_VISIT_SOFT_LINKS_NO_CYCLE_TEST_SUBGROUP_NAME); goto error; } @@ -22346,7 +22219,7 @@ test_link_visit_soft_links_no_cycles(void) if ((subgroup_id = H5Gcreate2(group_id, grp_name, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create subgroup '%s'\n", grp_name); + printf(" couldn't create subgroup '%s'\n", grp_name); goto error; } @@ -22364,27 +22237,27 @@ test_link_visit_soft_links_no_cycles(void) if (H5Lcreate_soft(link_target, subgroup_id, link_name, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create soft link '%s'\n", link_name); + printf(" couldn't create soft link '%s'\n", link_name); goto error; } /* Verify the link has been created */ if ((link_exists = H5Lexists(subgroup_id, link_name, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if link '%s' exists\n", link_name); + printf(" couldn't determine if link '%s' exists\n", link_name); goto error; } if (!link_exists) { H5_FAILED(); - HDprintf(" link '%s' did not exist\n", link_name); + printf(" link '%s' did not exist\n", link_name); goto error; } } if (H5Gclose(subgroup_id) < 0) { H5_FAILED(); - HDprintf(" couldn't close subgroup '%s'\n", grp_name); + printf(" couldn't close subgroup '%s'\n", grp_name); goto error; } } @@ -22408,13 +22281,13 @@ test_link_visit_soft_links_no_cycles(void) if (H5Lvisit2(group_id, H5_INDEX_NAME, H5_ITER_INC, link_visit_soft_links_no_cycles_cb, &i) < 0) { H5_FAILED(); - HDprintf(" H5Lvisit2 by index type name in increasing order failed\n"); + printf(" H5Lvisit2 by index type name in increasing order failed\n"); PART_ERROR(H5Lvisit_no_cycles_link_name_increasing); } if (i != LINK_VISIT_SOFT_LINKS_NO_CYCLE_TEST_NUM_LINKS_PER_TEST) { H5_FAILED(); - HDprintf(" some links were not visited!\n"); + printf(" some links were not visited!\n"); PART_ERROR(H5Lvisit_no_cycles_link_name_increasing); } @@ -22431,13 +22304,13 @@ test_link_visit_soft_links_no_cycles(void) if (H5Lvisit2(group_id, H5_INDEX_NAME, H5_ITER_DEC, link_visit_soft_links_no_cycles_cb, &i) < 0) { H5_FAILED(); - HDprintf(" H5Lvisit2 by index type name in decreasing order failed\n"); + printf(" H5Lvisit2 by index type name in decreasing order failed\n"); PART_ERROR(H5Lvisit_no_cycles_link_name_decreasing); } if (i != 2 * LINK_VISIT_SOFT_LINKS_NO_CYCLE_TEST_NUM_LINKS_PER_TEST) { H5_FAILED(); - HDprintf(" some links were not visited!\n"); + printf(" some links were not visited!\n"); PART_ERROR(H5Lvisit_no_cycles_link_name_decreasing); } @@ -22451,7 +22324,7 @@ test_link_visit_soft_links_no_cycles(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" creation order tracking isn't supported with this VOL connector\n"); + printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Lvisit_no_cycles_link_creation_increasing); } @@ -22461,13 +22334,13 @@ test_link_visit_soft_links_no_cycles(void) if (H5Lvisit2(group_id, H5_INDEX_CRT_ORDER, H5_ITER_INC, link_visit_soft_links_no_cycles_cb, &i) < 0) { H5_FAILED(); - HDprintf(" H5Lvisit2 by index type creation order in increasing order failed\n"); + printf(" H5Lvisit2 by index type creation order in increasing order failed\n"); PART_ERROR(H5Lvisit_no_cycles_link_creation_increasing); } if (i != 3 * LINK_VISIT_SOFT_LINKS_NO_CYCLE_TEST_NUM_LINKS_PER_TEST) { H5_FAILED(); - HDprintf(" some links were not visited!\n"); + printf(" some links were not visited!\n"); PART_ERROR(H5Lvisit_no_cycles_link_creation_increasing); } @@ -22481,7 +22354,7 @@ test_link_visit_soft_links_no_cycles(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" creation order tracking isn't supported with this VOL connector\n"); + printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Lvisit_no_cycles_link_creation_decreasing); } @@ -22491,13 +22364,13 @@ test_link_visit_soft_links_no_cycles(void) if (H5Lvisit2(group_id, H5_INDEX_CRT_ORDER, H5_ITER_DEC, link_visit_soft_links_no_cycles_cb, &i) < 0) { H5_FAILED(); - HDprintf(" H5Lvisit2 by index type creation order in decreasing order failed\n"); + printf(" H5Lvisit2 by index type creation order in decreasing order failed\n"); PART_ERROR(H5Lvisit_no_cycles_link_creation_decreasing); } if (i != 4 * LINK_VISIT_SOFT_LINKS_NO_CYCLE_TEST_NUM_LINKS_PER_TEST) { H5_FAILED(); - HDprintf(" some links were not visited!\n"); + printf(" some links were not visited!\n"); PART_ERROR(H5Lvisit_no_cycles_link_creation_decreasing); } @@ -22515,13 +22388,13 @@ test_link_visit_soft_links_no_cycles(void) file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_VISIT_SOFT_LINKS_NO_CYCLE_TEST_SUBGROUP_NAME, H5_INDEX_NAME, H5_ITER_INC, link_visit_soft_links_no_cycles_cb, &i, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" H5Lvisit_by_name2 by index type name in increasing order failed\n"); + printf(" H5Lvisit_by_name2 by index type name in increasing order failed\n"); PART_ERROR(H5Lvisit_by_name_no_cycles_link_name_increasing); } if (i != LINK_VISIT_SOFT_LINKS_NO_CYCLE_TEST_NUM_LINKS_PER_TEST) { H5_FAILED(); - HDprintf(" some links were not visited!\n"); + printf(" some links were not visited!\n"); PART_ERROR(H5Lvisit_by_name_no_cycles_link_name_increasing); } @@ -22540,13 +22413,13 @@ test_link_visit_soft_links_no_cycles(void) file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_VISIT_SOFT_LINKS_NO_CYCLE_TEST_SUBGROUP_NAME, H5_INDEX_NAME, H5_ITER_DEC, link_visit_soft_links_no_cycles_cb, &i, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" H5Lvisit_by_name2 by index type name in decreasing order failed\n"); + printf(" H5Lvisit_by_name2 by index type name in decreasing order failed\n"); PART_ERROR(H5Lvisit_by_name_no_cycles_link_name_decreasing); } if (i != 2 * LINK_VISIT_SOFT_LINKS_NO_CYCLE_TEST_NUM_LINKS_PER_TEST) { H5_FAILED(); - HDprintf(" some links were not visited!\n"); + printf(" some links were not visited!\n"); PART_ERROR(H5Lvisit_by_name_no_cycles_link_name_decreasing); } @@ -22560,7 +22433,7 @@ test_link_visit_soft_links_no_cycles(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" creation order tracking isn't supported with this VOL connector\n"); + printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Lvisit_by_name_no_cycles_link_creation_increasing); } @@ -22572,13 +22445,13 @@ test_link_visit_soft_links_no_cycles(void) H5_INDEX_CRT_ORDER, H5_ITER_INC, link_visit_soft_links_no_cycles_cb, &i, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" H5Lvisit_by_name2 by index type creation order in increasing order failed\n"); + printf(" H5Lvisit_by_name2 by index type creation order in increasing order failed\n"); PART_ERROR(H5Lvisit_by_name_no_cycles_link_creation_increasing); } if (i != 3 * LINK_VISIT_SOFT_LINKS_NO_CYCLE_TEST_NUM_LINKS_PER_TEST) { H5_FAILED(); - HDprintf(" some links were not visited!\n"); + printf(" some links were not visited!\n"); PART_ERROR(H5Lvisit_by_name_no_cycles_link_creation_increasing); } @@ -22592,7 +22465,7 @@ test_link_visit_soft_links_no_cycles(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" creation order tracking isn't supported with this VOL connector\n"); + printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Lvisit_by_name_no_cycles_link_creation_decreasing); } @@ -22604,13 +22477,13 @@ test_link_visit_soft_links_no_cycles(void) H5_INDEX_CRT_ORDER, H5_ITER_DEC, link_visit_soft_links_no_cycles_cb, &i, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" H5Lvisit_by_name2 by index type creation order in decreasing order failed\n"); + printf(" H5Lvisit_by_name2 by index type creation order in decreasing order failed\n"); PART_ERROR(H5Lvisit_by_name_no_cycles_link_creation_decreasing); } if (i != 4 * LINK_VISIT_SOFT_LINKS_NO_CYCLE_TEST_NUM_LINKS_PER_TEST) { H5_FAILED(); - HDprintf(" some links were not visited!\n"); + printf(" some links were not visited!\n"); PART_ERROR(H5Lvisit_by_name_no_cycles_link_creation_decreasing); } @@ -22675,8 +22548,8 @@ test_link_visit_external_links_no_cycles(void) !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_EXTERNAL_LINKS) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ITERATE)) { SKIPPED(); - HDprintf(" API functions for basic file, group, link, external link, or iterate " - "aren't supported with this connector\n"); + printf(" API functions for basic file, group, link, external link, or iterate " + "aren't supported with this connector\n"); return 0; } @@ -22686,7 +22559,7 @@ test_link_visit_external_links_no_cycles(void) if ((file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); + printf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); goto error; } @@ -22695,26 +22568,26 @@ test_link_visit_external_links_no_cycles(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); goto error; } if ((gcpl_id = H5Pcreate(H5P_GROUP_CREATE)) < 0) { H5_FAILED(); - HDprintf(" couldn't create a GCPL\n"); + printf(" couldn't create a GCPL\n"); goto error; } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (H5Pset_link_creation_order(gcpl_id, H5P_CRT_ORDER_TRACKED | H5P_CRT_ORDER_INDEXED) < 0) { H5_FAILED(); - HDprintf(" couldn't enable link creation order tracking and indexing on GCPL\n"); + printf(" couldn't enable link creation order tracking and indexing on GCPL\n"); goto error; } } @@ -22722,8 +22595,8 @@ test_link_visit_external_links_no_cycles(void) if ((group_id = H5Gcreate2(container_group, LINK_VISIT_EXT_LINKS_NO_CYCLE_TEST_SUBGROUP_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container subgroup '%s'\n", - LINK_VISIT_EXT_LINKS_NO_CYCLE_TEST_SUBGROUP_NAME); + printf(" couldn't create container subgroup '%s'\n", + LINK_VISIT_EXT_LINKS_NO_CYCLE_TEST_SUBGROUP_NAME); goto error; } @@ -22738,7 +22611,7 @@ test_link_visit_external_links_no_cycles(void) if ((subgroup_id = H5Gcreate2(group_id, grp_name, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create subgroup '%s'\n", grp_name); + printf(" couldn't create subgroup '%s'\n", grp_name); goto error; } @@ -22753,27 +22626,27 @@ test_link_visit_external_links_no_cycles(void) if (H5Lcreate_external(ext_link_filename, "/", subgroup_id, link_name, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create external link '%s'\n", link_name); + printf(" couldn't create external link '%s'\n", link_name); goto error; } /* Verify the link has been created */ if ((link_exists = H5Lexists(subgroup_id, link_name, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if link '%s' exists\n", link_name); + printf(" couldn't determine if link '%s' exists\n", link_name); goto error; } if (!link_exists) { H5_FAILED(); - HDprintf(" link '%s' did not exist\n", link_name); + printf(" link '%s' did not exist\n", link_name); goto error; } } if (H5Gclose(subgroup_id) < 0) { H5_FAILED(); - HDprintf(" couldn't close subgroup '%s'\n", grp_name); + printf(" couldn't close subgroup '%s'\n", grp_name); goto error; } } @@ -22798,13 +22671,13 @@ test_link_visit_external_links_no_cycles(void) if (H5Lvisit2(group_id, H5_INDEX_NAME, H5_ITER_INC, link_visit_external_links_no_cycles_cb, &i) < 0) { H5_FAILED(); - HDprintf(" H5Lvisit2 by index type name in increasing order failed\n"); + printf(" H5Lvisit2 by index type name in increasing order failed\n"); PART_ERROR(H5Lvisit_no_cycles_link_name_increasing); } if (i != LINK_VISIT_EXT_LINKS_NO_CYCLE_TEST_NUM_LINKS_PER_TEST) { H5_FAILED(); - HDprintf(" some links were not visited!\n"); + printf(" some links were not visited!\n"); PART_ERROR(H5Lvisit_no_cycles_link_name_increasing); } @@ -22822,13 +22695,13 @@ test_link_visit_external_links_no_cycles(void) if (H5Lvisit2(group_id, H5_INDEX_NAME, H5_ITER_DEC, link_visit_external_links_no_cycles_cb, &i) < 0) { H5_FAILED(); - HDprintf(" H5Lvisit2 by index type name in decreasing order failed\n"); + printf(" H5Lvisit2 by index type name in decreasing order failed\n"); PART_ERROR(H5Lvisit_no_cycles_link_name_decreasing); } if (i != 2 * LINK_VISIT_EXT_LINKS_NO_CYCLE_TEST_NUM_LINKS_PER_TEST) { H5_FAILED(); - HDprintf(" some links were not visited!\n"); + printf(" some links were not visited!\n"); PART_ERROR(H5Lvisit_no_cycles_link_name_decreasing); } @@ -22842,7 +22715,7 @@ test_link_visit_external_links_no_cycles(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" creation order tracking isn't supported with this VOL connector\n"); + printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Lvisit_no_cycles_link_creation_increasing); } @@ -22852,13 +22725,13 @@ test_link_visit_external_links_no_cycles(void) if (H5Lvisit2(group_id, H5_INDEX_CRT_ORDER, H5_ITER_INC, link_visit_external_links_no_cycles_cb, &i) < 0) { H5_FAILED(); - HDprintf(" H5Lvisit2 by index type creation order in increasing order failed\n"); + printf(" H5Lvisit2 by index type creation order in increasing order failed\n"); PART_ERROR(H5Lvisit_no_cycles_link_creation_increasing); } if (i != 3 * LINK_VISIT_EXT_LINKS_NO_CYCLE_TEST_NUM_LINKS_PER_TEST) { H5_FAILED(); - HDprintf(" some links were not visited!\n"); + printf(" some links were not visited!\n"); PART_ERROR(H5Lvisit_no_cycles_link_creation_increasing); } @@ -22872,7 +22745,7 @@ test_link_visit_external_links_no_cycles(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" creation order tracking isn't supported with this VOL connector\n"); + printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Lvisit_no_cycles_link_creation_decreasing); } @@ -22882,13 +22755,13 @@ test_link_visit_external_links_no_cycles(void) if (H5Lvisit2(group_id, H5_INDEX_CRT_ORDER, H5_ITER_DEC, link_visit_external_links_no_cycles_cb, &i) < 0) { H5_FAILED(); - HDprintf(" H5Lvisit2 by index type creation order in decreasing order failed\n"); + printf(" H5Lvisit2 by index type creation order in decreasing order failed\n"); PART_ERROR(H5Lvisit_no_cycles_link_creation_decreasing); } if (i != 4 * LINK_VISIT_EXT_LINKS_NO_CYCLE_TEST_NUM_LINKS_PER_TEST) { H5_FAILED(); - HDprintf(" some links were not visited!\n"); + printf(" some links were not visited!\n"); PART_ERROR(H5Lvisit_no_cycles_link_creation_decreasing); } @@ -22908,13 +22781,13 @@ test_link_visit_external_links_no_cycles(void) H5_INDEX_NAME, H5_ITER_INC, link_visit_external_links_no_cycles_cb, &i, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" H5Lvisit_by_name2 by index type name in increasing order failed\n"); + printf(" H5Lvisit_by_name2 by index type name in increasing order failed\n"); PART_ERROR(H5Lvisit_by_name_no_cycles_link_name_increasing); } if (i != LINK_VISIT_EXT_LINKS_NO_CYCLE_TEST_NUM_LINKS_PER_TEST) { H5_FAILED(); - HDprintf(" some links were not visited!\n"); + printf(" some links were not visited!\n"); PART_ERROR(H5Lvisit_by_name_no_cycles_link_name_increasing); } @@ -22934,13 +22807,13 @@ test_link_visit_external_links_no_cycles(void) H5_INDEX_NAME, H5_ITER_DEC, link_visit_external_links_no_cycles_cb, &i, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" H5Lvisit_by_name2 by index type name in decreasing order failed\n"); + printf(" H5Lvisit_by_name2 by index type name in decreasing order failed\n"); PART_ERROR(H5Lvisit_by_name_no_cycles_link_name_decreasing); } if (i != 2 * LINK_VISIT_EXT_LINKS_NO_CYCLE_TEST_NUM_LINKS_PER_TEST) { H5_FAILED(); - HDprintf(" some links were not visited!\n"); + printf(" some links were not visited!\n"); PART_ERROR(H5Lvisit_by_name_no_cycles_link_name_decreasing); } @@ -22954,7 +22827,7 @@ test_link_visit_external_links_no_cycles(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" creation order tracking isn't supported with this VOL connector\n"); + printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Lvisit_by_name_no_cycles_link_creation_increasing); } @@ -22966,13 +22839,13 @@ test_link_visit_external_links_no_cycles(void) H5_INDEX_CRT_ORDER, H5_ITER_INC, link_visit_external_links_no_cycles_cb, &i, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" H5Lvisit_by_name2 by index type creation order in increasing order failed\n"); + printf(" H5Lvisit_by_name2 by index type creation order in increasing order failed\n"); PART_ERROR(H5Lvisit_by_name_no_cycles_link_creation_increasing); } if (i != 3 * LINK_VISIT_EXT_LINKS_NO_CYCLE_TEST_NUM_LINKS_PER_TEST) { H5_FAILED(); - HDprintf(" some links were not visited!\n"); + printf(" some links were not visited!\n"); PART_ERROR(H5Lvisit_by_name_no_cycles_link_creation_increasing); } @@ -22986,7 +22859,7 @@ test_link_visit_external_links_no_cycles(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" creation order tracking isn't supported with this VOL connector\n"); + printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Lvisit_by_name_no_cycles_link_creation_decreasing); } @@ -22998,13 +22871,13 @@ test_link_visit_external_links_no_cycles(void) H5_INDEX_CRT_ORDER, H5_ITER_DEC, link_visit_external_links_no_cycles_cb, &i, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" H5Lvisit_by_name2 by index type creation order in decreasing order failed\n"); + printf(" H5Lvisit_by_name2 by index type creation order in decreasing order failed\n"); PART_ERROR(H5Lvisit_by_name_no_cycles_link_creation_decreasing); } if (i != 4 * LINK_VISIT_EXT_LINKS_NO_CYCLE_TEST_NUM_LINKS_PER_TEST) { H5_FAILED(); - HDprintf(" some links were not visited!\n"); + printf(" some links were not visited!\n"); PART_ERROR(H5Lvisit_by_name_no_cycles_link_creation_decreasing); } @@ -23102,7 +22975,7 @@ test_link_visit_mixed_links_no_cycles(void) !(vol_cap_flags_g & H5VL_CAP_FLAG_HARD_LINKS) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ITERATE) || !(vol_cap_flags_g & H5VL_CAP_FLAG_UD_LINKS)) { SKIPPED(); - HDprintf( + printf( " API functions for basic file, group, link, hard link, soft link, external link, or iterate " "aren't supported with this connector\n"); return 0; @@ -23114,7 +22987,7 @@ test_link_visit_mixed_links_no_cycles(void) if ((file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); + printf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); goto error; } @@ -23123,26 +22996,26 @@ test_link_visit_mixed_links_no_cycles(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); goto error; } if ((gcpl_id = H5Pcreate(H5P_GROUP_CREATE)) < 0) { H5_FAILED(); - HDprintf(" couldn't create a GCPL\n"); + printf(" couldn't create a GCPL\n"); goto error; } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (H5Pset_link_creation_order(gcpl_id, H5P_CRT_ORDER_TRACKED | H5P_CRT_ORDER_INDEXED) < 0) { H5_FAILED(); - HDprintf(" couldn't enable link creation order tracking and indexing on GCPL\n"); + printf(" couldn't enable link creation order tracking and indexing on GCPL\n"); goto error; } } @@ -23150,24 +23023,24 @@ test_link_visit_mixed_links_no_cycles(void) if ((group_id = H5Gcreate2(container_group, LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_SUBGROUP_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container subgroup '%s'\n", - LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_SUBGROUP_NAME); + printf(" couldn't create container subgroup '%s'\n", + LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_SUBGROUP_NAME); goto error; } if ((subgroup1 = H5Gcreate2(group_id, LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_SUBGROUP_NAME2, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create first subgroup '%s'\n", - LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_SUBGROUP_NAME2); + printf(" couldn't create first subgroup '%s'\n", + LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_SUBGROUP_NAME2); goto error; } if ((subgroup2 = H5Gcreate2(group_id, LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_SUBGROUP_NAME3, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create second subgroup '%s'\n", - LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_SUBGROUP_NAME3); + printf(" couldn't create second subgroup '%s'\n", + LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_SUBGROUP_NAME3); goto error; } @@ -23181,7 +23054,7 @@ test_link_visit_mixed_links_no_cycles(void) if ((dset_id = H5Dcreate2(subgroup1, LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_DSET_NAME, dset_dtype, fspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create first dataset '%s'\n", LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_DSET_NAME); + printf(" couldn't create first dataset '%s'\n", LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_DSET_NAME); } if (H5Dclose(dset_id) < 0) @@ -23190,7 +23063,7 @@ test_link_visit_mixed_links_no_cycles(void) if ((dset_id = H5Dcreate2(subgroup2, LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_DSET_NAME2, dset_dtype, fspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create second dataset '%s'\n", LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_DSET_NAME); + printf(" couldn't create second dataset '%s'\n", LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_DSET_NAME); } if (H5Dclose(dset_id) < 0) @@ -23199,30 +23072,29 @@ test_link_visit_mixed_links_no_cycles(void) if (H5Lcreate_hard(subgroup1, LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_DSET_NAME, subgroup1, LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_LINK_NAME1, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create first hard link '%s'\n", - LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_LINK_NAME1); + printf(" couldn't create first hard link '%s'\n", LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_LINK_NAME1); goto error; } if (H5Lcreate_soft(LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_DSET_NAME, subgroup1, LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create soft link '%s'\n", LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_LINK_NAME2); + printf(" couldn't create soft link '%s'\n", LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_LINK_NAME2); goto error; } if (H5Lcreate_external(ext_link_filename, "/", subgroup2, LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create external link '%s'\n", LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_LINK_NAME3); + printf(" couldn't create external link '%s'\n", LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_LINK_NAME3); goto error; } if (H5Lcreate_hard(subgroup2, LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_DSET_NAME2, subgroup2, LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_LINK_NAME4, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create second hard link '%s'\n", - LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_LINK_NAME4); + printf(" couldn't create second hard link '%s'\n", + LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_LINK_NAME4); goto error; } @@ -23230,56 +23102,56 @@ test_link_visit_mixed_links_no_cycles(void) if ((link_exists = H5Lexists(subgroup1, LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_LINK_NAME1, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if first link '%s' exists\n", - LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_LINK_NAME1); + printf(" couldn't determine if first link '%s' exists\n", + LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_LINK_NAME1); goto error; } if (!link_exists) { H5_FAILED(); - HDprintf(" link 1 did not exist\n"); + printf(" link 1 did not exist\n"); goto error; } if ((link_exists = H5Lexists(subgroup1, LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_LINK_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if second link '%s' exists\n", - LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_LINK_NAME2); + printf(" couldn't determine if second link '%s' exists\n", + LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_LINK_NAME2); goto error; } if (!link_exists) { H5_FAILED(); - HDprintf(" link 2 did not exist\n"); + printf(" link 2 did not exist\n"); goto error; } if ((link_exists = H5Lexists(subgroup2, LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_LINK_NAME3, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if third link '%s' exists\n", - LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_LINK_NAME3); + printf(" couldn't determine if third link '%s' exists\n", + LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_LINK_NAME3); goto error; } if (!link_exists) { H5_FAILED(); - HDprintf(" link 3 did not exist\n"); + printf(" link 3 did not exist\n"); goto error; } if ((link_exists = H5Lexists(subgroup2, LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_LINK_NAME4, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if fourth link '%s' exists\n", - LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_LINK_NAME4); + printf(" couldn't determine if fourth link '%s' exists\n", + LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_LINK_NAME4); goto error; } if (!link_exists) { H5_FAILED(); - HDprintf(" link 4 did not exist\n"); + printf(" link 4 did not exist\n"); goto error; } @@ -23303,13 +23175,13 @@ test_link_visit_mixed_links_no_cycles(void) if (H5Lvisit2(group_id, H5_INDEX_NAME, H5_ITER_INC, link_visit_mixed_links_no_cycles_cb, &i) < 0) { H5_FAILED(); - HDprintf(" H5Lvisit2 by index type name in increasing order failed\n"); + printf(" H5Lvisit2 by index type name in increasing order failed\n"); PART_ERROR(H5Lvisit_no_cycles_link_name_increasing); } if (i != LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_NUM_LINKS) { H5_FAILED(); - HDprintf(" some links were not visited!\n"); + printf(" some links were not visited!\n"); PART_ERROR(H5Lvisit_no_cycles_link_name_increasing); } @@ -23327,13 +23199,13 @@ test_link_visit_mixed_links_no_cycles(void) if (H5Lvisit2(group_id, H5_INDEX_NAME, H5_ITER_DEC, link_visit_mixed_links_no_cycles_cb, &i) < 0) { H5_FAILED(); - HDprintf(" H5Lvisit2 by index type name in decreasing order failed\n"); + printf(" H5Lvisit2 by index type name in decreasing order failed\n"); PART_ERROR(H5Lvisit_no_cycles_link_name_decreasing); } if (i != 2 * LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_NUM_LINKS) { H5_FAILED(); - HDprintf(" some links were not visited!\n"); + printf(" some links were not visited!\n"); PART_ERROR(H5Lvisit_no_cycles_link_name_decreasing); } @@ -23347,7 +23219,7 @@ test_link_visit_mixed_links_no_cycles(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" creation order tracking isn't supported with this VOL connector\n"); + printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Lvisit_no_cycles_link_creation_increasing); } @@ -23357,13 +23229,13 @@ test_link_visit_mixed_links_no_cycles(void) if (H5Lvisit2(group_id, H5_INDEX_CRT_ORDER, H5_ITER_INC, link_visit_mixed_links_no_cycles_cb, &i) < 0) { H5_FAILED(); - HDprintf(" H5Lvisit2 by index type creation order in increasing order failed\n"); + printf(" H5Lvisit2 by index type creation order in increasing order failed\n"); PART_ERROR(H5Lvisit_no_cycles_link_creation_increasing); } if (i != 3 * LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_NUM_LINKS) { H5_FAILED(); - HDprintf(" some links were not visited!\n"); + printf(" some links were not visited!\n"); PART_ERROR(H5Lvisit_no_cycles_link_creation_increasing); } @@ -23377,7 +23249,7 @@ test_link_visit_mixed_links_no_cycles(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" creation order tracking isn't supported with this VOL connector\n"); + printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Lvisit_no_cycles_link_creation_decreasing); } @@ -23387,13 +23259,13 @@ test_link_visit_mixed_links_no_cycles(void) if (H5Lvisit2(group_id, H5_INDEX_CRT_ORDER, H5_ITER_DEC, link_visit_mixed_links_no_cycles_cb, &i) < 0) { H5_FAILED(); - HDprintf(" H5Lvisit2 by index type creation order in decreasing order failed\n"); + printf(" H5Lvisit2 by index type creation order in decreasing order failed\n"); PART_ERROR(H5Lvisit_no_cycles_link_creation_decreasing); } if (i != 4 * LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_NUM_LINKS) { H5_FAILED(); - HDprintf(" some links were not visited!\n"); + printf(" some links were not visited!\n"); PART_ERROR(H5Lvisit_no_cycles_link_creation_decreasing); } @@ -23411,13 +23283,13 @@ test_link_visit_mixed_links_no_cycles(void) file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_SUBGROUP_NAME, H5_INDEX_NAME, H5_ITER_INC, link_visit_mixed_links_no_cycles_cb, &i, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" H5Lvisit_by_name2 by index type name in increasing order failed\n"); + printf(" H5Lvisit_by_name2 by index type name in increasing order failed\n"); PART_ERROR(H5Lvisit_by_name_no_cycles_link_name_increasing); } if (i != LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_NUM_LINKS) { H5_FAILED(); - HDprintf(" some links were not visited!\n"); + printf(" some links were not visited!\n"); PART_ERROR(H5Lvisit_by_name_no_cycles_link_name_increasing); } @@ -23436,13 +23308,13 @@ test_link_visit_mixed_links_no_cycles(void) file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_SUBGROUP_NAME, H5_INDEX_NAME, H5_ITER_DEC, link_visit_mixed_links_no_cycles_cb, &i, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" H5Lvisit_by_name2 by index type name in decreasing order failed\n"); + printf(" H5Lvisit_by_name2 by index type name in decreasing order failed\n"); PART_ERROR(H5Lvisit_by_name_no_cycles_link_name_decreasing); } if (i != 2 * LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_NUM_LINKS) { H5_FAILED(); - HDprintf(" some links were not visited!\n"); + printf(" some links were not visited!\n"); PART_ERROR(H5Lvisit_by_name_no_cycles_link_name_decreasing); } @@ -23456,7 +23328,7 @@ test_link_visit_mixed_links_no_cycles(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" creation order tracking isn't supported with this VOL connector\n"); + printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Lvisit_by_name_no_cycles_link_creation_increasing); } @@ -23468,13 +23340,13 @@ test_link_visit_mixed_links_no_cycles(void) H5_INDEX_CRT_ORDER, H5_ITER_INC, link_visit_mixed_links_no_cycles_cb, &i, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" H5Lvisit_by_name2 by index type creation order in increasing order failed\n"); + printf(" H5Lvisit_by_name2 by index type creation order in increasing order failed\n"); PART_ERROR(H5Lvisit_by_name_no_cycles_link_creation_increasing); } if (i != 3 * LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_NUM_LINKS) { H5_FAILED(); - HDprintf(" some links were not visited!\n"); + printf(" some links were not visited!\n"); PART_ERROR(H5Lvisit_by_name_no_cycles_link_creation_increasing); } @@ -23488,7 +23360,7 @@ test_link_visit_mixed_links_no_cycles(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" creation order tracking isn't supported with this VOL connector\n"); + printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Lvisit_by_name_no_cycles_link_creation_decreasing); } @@ -23500,13 +23372,13 @@ test_link_visit_mixed_links_no_cycles(void) H5_INDEX_CRT_ORDER, H5_ITER_DEC, link_visit_mixed_links_no_cycles_cb, &i, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" H5Lvisit_by_name2 by index type creation order in decreasing order failed\n"); + printf(" H5Lvisit_by_name2 by index type creation order in decreasing order failed\n"); PART_ERROR(H5Lvisit_by_name_no_cycles_link_creation_decreasing); } if (i != 4 * LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_NUM_LINKS) { H5_FAILED(); - HDprintf(" some links were not visited!\n"); + printf(" some links were not visited!\n"); PART_ERROR(H5Lvisit_by_name_no_cycles_link_creation_decreasing); } @@ -23581,8 +23453,8 @@ test_link_visit_hard_links_cycles(void) !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_HARD_LINKS) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ITERATE)) { SKIPPED(); - HDprintf(" API functions for basic file, group, link, hard link, or iterate " - "aren't supported with this connector\n"); + printf(" API functions for basic file, group, link, hard link, or iterate " + "aren't supported with this connector\n"); return 0; } @@ -23590,26 +23462,26 @@ test_link_visit_hard_links_cycles(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); goto error; } if ((gcpl_id = H5Pcreate(H5P_GROUP_CREATE)) < 0) { H5_FAILED(); - HDprintf(" couldn't create a GCPL\n"); + printf(" couldn't create a GCPL\n"); goto error; } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (H5Pset_link_creation_order(gcpl_id, H5P_CRT_ORDER_TRACKED | H5P_CRT_ORDER_INDEXED) < 0) { H5_FAILED(); - HDprintf(" couldn't enable link creation order tracking and indexing on GCPL\n"); + printf(" couldn't enable link creation order tracking and indexing on GCPL\n"); goto error; } } @@ -23617,8 +23489,8 @@ test_link_visit_hard_links_cycles(void) if ((group_id = H5Gcreate2(container_group, LINK_VISIT_HARD_LINKS_CYCLE_TEST_SUBGROUP_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container subgroup '%s'\n", - LINK_VISIT_HARD_LINKS_CYCLE_TEST_SUBGROUP_NAME); + printf(" couldn't create container subgroup '%s'\n", + LINK_VISIT_HARD_LINKS_CYCLE_TEST_SUBGROUP_NAME); goto error; } @@ -23633,7 +23505,7 @@ test_link_visit_hard_links_cycles(void) if ((subgroup_id = H5Gcreate2(group_id, grp_name, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create subgroup '%s'\n", grp_name); + printf(" couldn't create subgroup '%s'\n", grp_name); goto error; } @@ -23647,27 +23519,27 @@ test_link_visit_hard_links_cycles(void) if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, link_name, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create hard link '%s'\n", link_name); + printf(" couldn't create hard link '%s'\n", link_name); goto error; } /* Verify the link has been created */ if ((link_exists = H5Lexists(subgroup_id, link_name, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if link '%s' exists\n", link_name); + printf(" couldn't determine if link '%s' exists\n", link_name); goto error; } if (!link_exists) { H5_FAILED(); - HDprintf(" link '%s' did not exist\n", link_name); + printf(" link '%s' did not exist\n", link_name); goto error; } } if (H5Gclose(subgroup_id) < 0) { H5_FAILED(); - HDprintf(" couldn't close subgroup '%s'\n", grp_name); + printf(" couldn't close subgroup '%s'\n", grp_name); goto error; } } @@ -23691,13 +23563,13 @@ test_link_visit_hard_links_cycles(void) if (H5Lvisit2(group_id, H5_INDEX_NAME, H5_ITER_INC, link_visit_hard_links_cycles_cb, &i) < 0) { H5_FAILED(); - HDprintf(" H5Lvisit2 by index type name in increasing order failed\n"); + printf(" H5Lvisit2 by index type name in increasing order failed\n"); PART_ERROR(H5Lvisit_cycles_link_name_increasing); } if (i != LINK_VISIT_HARD_LINKS_CYCLE_TEST_NUM_LINKS_PER_TEST) { H5_FAILED(); - HDprintf(" some links were not visited!\n"); + printf(" some links were not visited!\n"); PART_ERROR(H5Lvisit_cycles_link_name_increasing); } @@ -23714,13 +23586,13 @@ test_link_visit_hard_links_cycles(void) if (H5Lvisit2(group_id, H5_INDEX_NAME, H5_ITER_DEC, link_visit_hard_links_cycles_cb, &i) < 0) { H5_FAILED(); - HDprintf(" H5Lvisit2 by index type name in decreasing order failed\n"); + printf(" H5Lvisit2 by index type name in decreasing order failed\n"); PART_ERROR(H5Lvisit_cycles_link_name_decreasing); } if (i != 2 * LINK_VISIT_HARD_LINKS_CYCLE_TEST_NUM_LINKS_PER_TEST) { H5_FAILED(); - HDprintf(" some links were not visited!\n"); + printf(" some links were not visited!\n"); PART_ERROR(H5Lvisit_cycles_link_name_decreasing); } @@ -23734,7 +23606,7 @@ test_link_visit_hard_links_cycles(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" creation order tracking isn't supported with this VOL connector\n"); + printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Lvisit_cycles_link_creation_increasing); } @@ -23744,13 +23616,13 @@ test_link_visit_hard_links_cycles(void) if (H5Lvisit2(group_id, H5_INDEX_CRT_ORDER, H5_ITER_INC, link_visit_hard_links_cycles_cb, &i) < 0) { H5_FAILED(); - HDprintf(" H5Lvisit2 by index type creation order in increasing order failed\n"); + printf(" H5Lvisit2 by index type creation order in increasing order failed\n"); PART_ERROR(H5Lvisit_cycles_link_creation_increasing); } if (i != 3 * LINK_VISIT_HARD_LINKS_CYCLE_TEST_NUM_LINKS_PER_TEST) { H5_FAILED(); - HDprintf(" some links were not visited!\n"); + printf(" some links were not visited!\n"); PART_ERROR(H5Lvisit_cycles_link_creation_increasing); } @@ -23764,7 +23636,7 @@ test_link_visit_hard_links_cycles(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" creation order tracking isn't supported with this VOL connector\n"); + printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Lvisit_cycles_link_creation_decreasing); } @@ -23774,13 +23646,13 @@ test_link_visit_hard_links_cycles(void) if (H5Lvisit2(group_id, H5_INDEX_CRT_ORDER, H5_ITER_DEC, link_visit_hard_links_cycles_cb, &i) < 0) { H5_FAILED(); - HDprintf(" H5Lvisit2 by index type creation order in decreasing order failed\n"); + printf(" H5Lvisit2 by index type creation order in decreasing order failed\n"); PART_ERROR(H5Lvisit_cycles_link_creation_decreasing); } if (i != 4 * LINK_VISIT_HARD_LINKS_CYCLE_TEST_NUM_LINKS_PER_TEST) { H5_FAILED(); - HDprintf(" some links were not visited!\n"); + printf(" some links were not visited!\n"); PART_ERROR(H5Lvisit_cycles_link_creation_decreasing); } @@ -23798,13 +23670,13 @@ test_link_visit_hard_links_cycles(void) file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_VISIT_HARD_LINKS_CYCLE_TEST_SUBGROUP_NAME, H5_INDEX_NAME, H5_ITER_INC, link_visit_hard_links_cycles_cb, &i, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" H5Lvisit_by_name2 by index type name in increasing order failed\n"); + printf(" H5Lvisit_by_name2 by index type name in increasing order failed\n"); PART_ERROR(H5Lvisit_by_name_cycles_link_name_increasing); } if (i != LINK_VISIT_HARD_LINKS_CYCLE_TEST_NUM_LINKS_PER_TEST) { H5_FAILED(); - HDprintf(" some links were not visited!\n"); + printf(" some links were not visited!\n"); PART_ERROR(H5Lvisit_by_name_cycles_link_name_increasing); } @@ -23823,13 +23695,13 @@ test_link_visit_hard_links_cycles(void) file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_VISIT_HARD_LINKS_CYCLE_TEST_SUBGROUP_NAME, H5_INDEX_NAME, H5_ITER_DEC, link_visit_hard_links_cycles_cb, &i, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" H5Lvisit_by_name2 by index type name in decreasing order failed\n"); + printf(" H5Lvisit_by_name2 by index type name in decreasing order failed\n"); PART_ERROR(H5Lvisit_by_name_cycles_link_name_decreasing); } if (i != 2 * LINK_VISIT_HARD_LINKS_CYCLE_TEST_NUM_LINKS_PER_TEST) { H5_FAILED(); - HDprintf(" some links were not visited!\n"); + printf(" some links were not visited!\n"); PART_ERROR(H5Lvisit_by_name_cycles_link_name_decreasing); } @@ -23843,7 +23715,7 @@ test_link_visit_hard_links_cycles(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" creation order tracking isn't supported with this VOL connector\n"); + printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Lvisit_by_name_cycles_link_creation_increasing); } @@ -23854,13 +23726,13 @@ test_link_visit_hard_links_cycles(void) file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_VISIT_HARD_LINKS_CYCLE_TEST_SUBGROUP_NAME, H5_INDEX_CRT_ORDER, H5_ITER_INC, link_visit_hard_links_cycles_cb, &i, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" H5Lvisit_by_name2 by index type creation order in increasing order failed\n"); + printf(" H5Lvisit_by_name2 by index type creation order in increasing order failed\n"); PART_ERROR(H5Lvisit_by_name_cycles_link_creation_increasing); } if (i != 3 * LINK_VISIT_HARD_LINKS_CYCLE_TEST_NUM_LINKS_PER_TEST) { H5_FAILED(); - HDprintf(" some links were not visited!\n"); + printf(" some links were not visited!\n"); PART_ERROR(H5Lvisit_by_name_cycles_link_creation_increasing); } @@ -23874,7 +23746,7 @@ test_link_visit_hard_links_cycles(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" creation order tracking isn't supported with this VOL connector\n"); + printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Lvisit_by_name_cycles_link_creation_decreasing); } @@ -23885,13 +23757,13 @@ test_link_visit_hard_links_cycles(void) file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_VISIT_HARD_LINKS_CYCLE_TEST_SUBGROUP_NAME, H5_INDEX_CRT_ORDER, H5_ITER_DEC, link_visit_hard_links_cycles_cb, &i, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" H5Lvisit_by_name2 by index type creation order in decreasing order failed\n"); + printf(" H5Lvisit_by_name2 by index type creation order in decreasing order failed\n"); PART_ERROR(H5Lvisit_by_name_cycles_link_creation_decreasing); } if (i != 4 * LINK_VISIT_HARD_LINKS_CYCLE_TEST_NUM_LINKS_PER_TEST) { H5_FAILED(); - HDprintf(" some links were not visited!\n"); + printf(" some links were not visited!\n"); PART_ERROR(H5Lvisit_by_name_cycles_link_creation_decreasing); } @@ -23954,8 +23826,8 @@ test_link_visit_soft_links_cycles(void) !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_SOFT_LINKS) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ITERATE)) { SKIPPED(); - HDprintf(" API functions for basic file, group, link, soft link, or iterate " - "aren't supported with this connector\n"); + printf(" API functions for basic file, group, link, soft link, or iterate " + "aren't supported with this connector\n"); return 0; } @@ -23963,26 +23835,26 @@ test_link_visit_soft_links_cycles(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); goto error; } if ((gcpl_id = H5Pcreate(H5P_GROUP_CREATE)) < 0) { H5_FAILED(); - HDprintf(" couldn't create a GCPL\n"); + printf(" couldn't create a GCPL\n"); goto error; } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (H5Pset_link_creation_order(gcpl_id, H5P_CRT_ORDER_TRACKED | H5P_CRT_ORDER_INDEXED) < 0) { H5_FAILED(); - HDprintf(" couldn't enable link creation order tracking and indexing on GCPL\n"); + printf(" couldn't enable link creation order tracking and indexing on GCPL\n"); goto error; } } @@ -23990,8 +23862,8 @@ test_link_visit_soft_links_cycles(void) if ((group_id = H5Gcreate2(container_group, LINK_VISIT_SOFT_LINKS_CYCLE_TEST_SUBGROUP_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container subgroup '%s'\n", - LINK_VISIT_SOFT_LINKS_CYCLE_TEST_SUBGROUP_NAME); + printf(" couldn't create container subgroup '%s'\n", + LINK_VISIT_SOFT_LINKS_CYCLE_TEST_SUBGROUP_NAME); goto error; } @@ -24006,7 +23878,7 @@ test_link_visit_soft_links_cycles(void) if ((subgroup_id = H5Gcreate2(group_id, grp_name, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create subgroup '%s'\n", grp_name); + printf(" couldn't create subgroup '%s'\n", grp_name); goto error; } @@ -24025,27 +23897,27 @@ test_link_visit_soft_links_cycles(void) if (H5Lcreate_soft(link_target, subgroup_id, link_name, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create soft link '%s'\n", link_name); + printf(" couldn't create soft link '%s'\n", link_name); goto error; } /* Verify the link has been created */ if ((link_exists = H5Lexists(subgroup_id, link_name, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if link '%s' exists\n", link_name); + printf(" couldn't determine if link '%s' exists\n", link_name); goto error; } if (!link_exists) { H5_FAILED(); - HDprintf(" link '%s' did not exist\n", link_name); + printf(" link '%s' did not exist\n", link_name); goto error; } } if (H5Gclose(subgroup_id) < 0) { H5_FAILED(); - HDprintf(" couldn't close subgroup '%s'\n", grp_name); + printf(" couldn't close subgroup '%s'\n", grp_name); goto error; } } @@ -24069,13 +23941,13 @@ test_link_visit_soft_links_cycles(void) if (H5Lvisit2(group_id, H5_INDEX_NAME, H5_ITER_INC, link_visit_soft_links_cycles_cb, &i) < 0) { H5_FAILED(); - HDprintf(" H5Lvisit2 by index type name in increasing order failed\n"); + printf(" H5Lvisit2 by index type name in increasing order failed\n"); PART_ERROR(H5Lvisit_cycles_link_name_increasing); } if (i != LINK_VISIT_SOFT_LINKS_CYCLE_TEST_NUM_LINKS_PER_TEST) { H5_FAILED(); - HDprintf(" some links were not visited!\n"); + printf(" some links were not visited!\n"); PART_ERROR(H5Lvisit_cycles_link_name_increasing); } @@ -24092,13 +23964,13 @@ test_link_visit_soft_links_cycles(void) if (H5Lvisit2(group_id, H5_INDEX_NAME, H5_ITER_DEC, link_visit_soft_links_cycles_cb, &i) < 0) { H5_FAILED(); - HDprintf(" H5Lvisit2 by index type name in decreasing order failed\n"); + printf(" H5Lvisit2 by index type name in decreasing order failed\n"); PART_ERROR(H5Lvisit_cycles_link_name_decreasing); } if (i != 2 * LINK_VISIT_SOFT_LINKS_CYCLE_TEST_NUM_LINKS_PER_TEST) { H5_FAILED(); - HDprintf(" some links were not visited!\n"); + printf(" some links were not visited!\n"); PART_ERROR(H5Lvisit_cycles_link_name_decreasing); } @@ -24112,7 +23984,7 @@ test_link_visit_soft_links_cycles(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" creation order tracking isn't supported with this VOL connector\n"); + printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Lvisit_cycles_link_creation_increasing); } @@ -24122,13 +23994,13 @@ test_link_visit_soft_links_cycles(void) if (H5Lvisit2(group_id, H5_INDEX_CRT_ORDER, H5_ITER_INC, link_visit_soft_links_cycles_cb, &i) < 0) { H5_FAILED(); - HDprintf(" H5Lvisit2 by index type creation order in increasing order failed\n"); + printf(" H5Lvisit2 by index type creation order in increasing order failed\n"); PART_ERROR(H5Lvisit_cycles_link_creation_increasing); } if (i != 3 * LINK_VISIT_SOFT_LINKS_CYCLE_TEST_NUM_LINKS_PER_TEST) { H5_FAILED(); - HDprintf(" some links were not visited!\n"); + printf(" some links were not visited!\n"); PART_ERROR(H5Lvisit_cycles_link_creation_increasing); } @@ -24142,7 +24014,7 @@ test_link_visit_soft_links_cycles(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" creation order tracking isn't supported with this VOL connector\n"); + printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Lvisit_cycles_link_creation_decreasing); } @@ -24152,13 +24024,13 @@ test_link_visit_soft_links_cycles(void) if (H5Lvisit2(group_id, H5_INDEX_CRT_ORDER, H5_ITER_DEC, link_visit_soft_links_cycles_cb, &i) < 0) { H5_FAILED(); - HDprintf(" H5Lvisit2 by index type creation order in decreasing order failed\n"); + printf(" H5Lvisit2 by index type creation order in decreasing order failed\n"); PART_ERROR(H5Lvisit_cycles_link_creation_decreasing); } if (i != 4 * LINK_VISIT_SOFT_LINKS_CYCLE_TEST_NUM_LINKS_PER_TEST) { H5_FAILED(); - HDprintf(" some links were not visited!\n"); + printf(" some links were not visited!\n"); PART_ERROR(H5Lvisit_cycles_link_creation_decreasing); } @@ -24177,13 +24049,13 @@ test_link_visit_soft_links_cycles(void) file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_VISIT_SOFT_LINKS_CYCLE_TEST_SUBGROUP_NAME, H5_INDEX_NAME, H5_ITER_INC, link_visit_soft_links_cycles_cb, &i, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" H5Lvisit_by_name2 by index type name in increasing order failed\n"); + printf(" H5Lvisit_by_name2 by index type name in increasing order failed\n"); PART_ERROR(H5Lvisit_by_name_cycles_link_name_increasing); } if (i != LINK_VISIT_SOFT_LINKS_CYCLE_TEST_NUM_LINKS_PER_TEST) { H5_FAILED(); - HDprintf(" some links were not visited!\n"); + printf(" some links were not visited!\n"); PART_ERROR(H5Lvisit_by_name_cycles_link_name_increasing); } @@ -24202,13 +24074,13 @@ test_link_visit_soft_links_cycles(void) file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_VISIT_SOFT_LINKS_CYCLE_TEST_SUBGROUP_NAME, H5_INDEX_NAME, H5_ITER_DEC, link_visit_soft_links_cycles_cb, &i, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" H5Lvisit_by_name2 by index type name in decreasing order failed\n"); + printf(" H5Lvisit_by_name2 by index type name in decreasing order failed\n"); PART_ERROR(H5Lvisit_by_name_cycles_link_name_decreasing); } if (i != 2 * LINK_VISIT_SOFT_LINKS_CYCLE_TEST_NUM_LINKS_PER_TEST) { H5_FAILED(); - HDprintf(" some links were not visited!\n"); + printf(" some links were not visited!\n"); PART_ERROR(H5Lvisit_by_name_cycles_link_name_decreasing); } @@ -24222,7 +24094,7 @@ test_link_visit_soft_links_cycles(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" creation order tracking isn't supported with this VOL connector\n"); + printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Lvisit_by_name_cycles_link_creation_increasing); } @@ -24233,13 +24105,13 @@ test_link_visit_soft_links_cycles(void) file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_VISIT_SOFT_LINKS_CYCLE_TEST_SUBGROUP_NAME, H5_INDEX_CRT_ORDER, H5_ITER_INC, link_visit_soft_links_cycles_cb, &i, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" H5Lvisit_by_name2 by index type creation order in increasing order failed\n"); + printf(" H5Lvisit_by_name2 by index type creation order in increasing order failed\n"); PART_ERROR(H5Lvisit_by_name_cycles_link_creation_increasing); } if (i != 3 * LINK_VISIT_SOFT_LINKS_CYCLE_TEST_NUM_LINKS_PER_TEST) { H5_FAILED(); - HDprintf(" some links were not visited!\n"); + printf(" some links were not visited!\n"); PART_ERROR(H5Lvisit_by_name_cycles_link_creation_increasing); } @@ -24253,7 +24125,7 @@ test_link_visit_soft_links_cycles(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" creation order tracking isn't supported with this VOL connector\n"); + printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Lvisit_by_name_cycles_link_creation_decreasing); } @@ -24264,13 +24136,13 @@ test_link_visit_soft_links_cycles(void) file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_VISIT_SOFT_LINKS_CYCLE_TEST_SUBGROUP_NAME, H5_INDEX_CRT_ORDER, H5_ITER_DEC, link_visit_soft_links_cycles_cb, &i, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" H5Lvisit_by_name2 by index type creation order in decreasing order failed\n"); + printf(" H5Lvisit_by_name2 by index type creation order in decreasing order failed\n"); PART_ERROR(H5Lvisit_by_name_cycles_link_creation_decreasing); } if (i != 4 * LINK_VISIT_SOFT_LINKS_CYCLE_TEST_NUM_LINKS_PER_TEST) { H5_FAILED(); - HDprintf(" some links were not visited!\n"); + printf(" some links were not visited!\n"); PART_ERROR(H5Lvisit_by_name_cycles_link_creation_decreasing); } @@ -24334,8 +24206,8 @@ test_link_visit_external_links_cycles(void) !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_EXTERNAL_LINKS) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ITERATE)) { SKIPPED(); - HDprintf(" API functions for basic file, group, link, external link, or iterate " - "aren't supported with this connector\n"); + printf(" API functions for basic file, group, link, external link, or iterate " + "aren't supported with this connector\n"); return 0; } @@ -24343,26 +24215,26 @@ test_link_visit_external_links_cycles(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); goto error; } if ((gcpl_id = H5Pcreate(H5P_GROUP_CREATE)) < 0) { H5_FAILED(); - HDprintf(" couldn't create a GCPL\n"); + printf(" couldn't create a GCPL\n"); goto error; } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (H5Pset_link_creation_order(gcpl_id, H5P_CRT_ORDER_TRACKED | H5P_CRT_ORDER_INDEXED) < 0) { H5_FAILED(); - HDprintf(" couldn't enable link creation order tracking and indexing on GCPL\n"); + printf(" couldn't enable link creation order tracking and indexing on GCPL\n"); goto error; } } @@ -24370,8 +24242,8 @@ test_link_visit_external_links_cycles(void) if ((group_id = H5Gcreate2(container_group, LINK_VISIT_EXT_LINKS_CYCLE_TEST_SUBGROUP_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container subgroup '%s'\n", - LINK_VISIT_EXT_LINKS_CYCLE_TEST_SUBGROUP_NAME); + printf(" couldn't create container subgroup '%s'\n", + LINK_VISIT_EXT_LINKS_CYCLE_TEST_SUBGROUP_NAME); goto error; } @@ -24386,7 +24258,7 @@ test_link_visit_external_links_cycles(void) if ((subgroup_id = H5Gcreate2(group_id, grp_name, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create subgroup '%s'\n", grp_name); + printf(" couldn't create subgroup '%s'\n", grp_name); goto error; } @@ -24406,27 +24278,27 @@ test_link_visit_external_links_cycles(void) if (H5Lcreate_external(H5_api_test_filename, link_target_obj, subgroup_id, link_name, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create external link '%s'\n", link_name); + printf(" couldn't create external link '%s'\n", link_name); goto error; } /* Verify the link has been created */ if ((link_exists = H5Lexists(subgroup_id, link_name, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if link '%s' exists\n", link_name); + printf(" couldn't determine if link '%s' exists\n", link_name); goto error; } if (!link_exists) { H5_FAILED(); - HDprintf(" link '%s' did not exist\n", link_name); + printf(" link '%s' did not exist\n", link_name); goto error; } } if (H5Gclose(subgroup_id) < 0) { H5_FAILED(); - HDprintf(" couldn't close subgroup '%s'\n", grp_name); + printf(" couldn't close subgroup '%s'\n", grp_name); goto error; } } @@ -24451,13 +24323,13 @@ test_link_visit_external_links_cycles(void) if (H5Lvisit2(group_id, H5_INDEX_NAME, H5_ITER_INC, link_visit_external_links_cycles_cb, &i) < 0) { H5_FAILED(); - HDprintf(" H5Lvisit2 by index type name in increasing order failed\n"); + printf(" H5Lvisit2 by index type name in increasing order failed\n"); PART_ERROR(H5Lvisit_cycles_link_name_increasing); } if (i != LINK_VISIT_EXT_LINKS_CYCLE_TEST_NUM_LINKS_PER_TEST) { H5_FAILED(); - HDprintf(" some links were not visited!\n"); + printf(" some links were not visited!\n"); PART_ERROR(H5Lvisit_cycles_link_name_increasing); } @@ -24475,13 +24347,13 @@ test_link_visit_external_links_cycles(void) if (H5Lvisit2(group_id, H5_INDEX_NAME, H5_ITER_DEC, link_visit_external_links_cycles_cb, &i) < 0) { H5_FAILED(); - HDprintf(" H5Lvisit2 by index type name in decreasing order failed\n"); + printf(" H5Lvisit2 by index type name in decreasing order failed\n"); PART_ERROR(H5Lvisit_cycles_link_name_decreasing); } if (i != 2 * LINK_VISIT_EXT_LINKS_CYCLE_TEST_NUM_LINKS_PER_TEST) { H5_FAILED(); - HDprintf(" some links were not visited!\n"); + printf(" some links were not visited!\n"); PART_ERROR(H5Lvisit_cycles_link_name_decreasing); } @@ -24495,7 +24367,7 @@ test_link_visit_external_links_cycles(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" creation order tracking isn't supported with this VOL connector\n"); + printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Lvisit_cycles_link_creation_increasing); } @@ -24505,13 +24377,13 @@ test_link_visit_external_links_cycles(void) if (H5Lvisit2(group_id, H5_INDEX_CRT_ORDER, H5_ITER_INC, link_visit_external_links_cycles_cb, &i) < 0) { H5_FAILED(); - HDprintf(" H5Lvisit2 by index type creation order in increasing order failed\n"); + printf(" H5Lvisit2 by index type creation order in increasing order failed\n"); PART_ERROR(H5Lvisit_cycles_link_creation_increasing); } if (i != 3 * LINK_VISIT_EXT_LINKS_CYCLE_TEST_NUM_LINKS_PER_TEST) { H5_FAILED(); - HDprintf(" some links were not visited!\n"); + printf(" some links were not visited!\n"); PART_ERROR(H5Lvisit_cycles_link_creation_increasing); } @@ -24525,7 +24397,7 @@ test_link_visit_external_links_cycles(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" creation order tracking isn't supported with this VOL connector\n"); + printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Lvisit_cycles_link_creation_decreasing); } @@ -24535,13 +24407,13 @@ test_link_visit_external_links_cycles(void) if (H5Lvisit2(group_id, H5_INDEX_CRT_ORDER, H5_ITER_DEC, link_visit_external_links_cycles_cb, &i) < 0) { H5_FAILED(); - HDprintf(" H5Lvisit2 by index type creation order in decreasing order failed\n"); + printf(" H5Lvisit2 by index type creation order in decreasing order failed\n"); PART_ERROR(H5Lvisit_cycles_link_creation_decreasing); } if (i != 4 * LINK_VISIT_EXT_LINKS_CYCLE_TEST_NUM_LINKS_PER_TEST) { H5_FAILED(); - HDprintf(" some links were not visited!\n"); + printf(" some links were not visited!\n"); PART_ERROR(H5Lvisit_cycles_link_creation_decreasing); } @@ -24560,13 +24432,13 @@ test_link_visit_external_links_cycles(void) file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_VISIT_EXT_LINKS_CYCLE_TEST_SUBGROUP_NAME, H5_INDEX_NAME, H5_ITER_INC, link_visit_external_links_cycles_cb, &i, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" H5Lvisit_by_name2 by index type name in increasing order failed\n"); + printf(" H5Lvisit_by_name2 by index type name in increasing order failed\n"); PART_ERROR(H5Lvisit_by_name_cycles_link_name_increasing); } if (i != LINK_VISIT_EXT_LINKS_CYCLE_TEST_NUM_LINKS_PER_TEST) { H5_FAILED(); - HDprintf(" some links were not visited!\n"); + printf(" some links were not visited!\n"); PART_ERROR(H5Lvisit_by_name_cycles_link_name_increasing); } @@ -24585,13 +24457,13 @@ test_link_visit_external_links_cycles(void) file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_VISIT_EXT_LINKS_CYCLE_TEST_SUBGROUP_NAME, H5_INDEX_NAME, H5_ITER_DEC, link_visit_external_links_cycles_cb, &i, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" H5Lvisit_by_name2 by index type name in decreasing order failed\n"); + printf(" H5Lvisit_by_name2 by index type name in decreasing order failed\n"); PART_ERROR(H5Lvisit_by_name_cycles_link_name_decreasing); } if (i != 2 * LINK_VISIT_EXT_LINKS_CYCLE_TEST_NUM_LINKS_PER_TEST) { H5_FAILED(); - HDprintf(" some links were not visited!\n"); + printf(" some links were not visited!\n"); PART_ERROR(H5Lvisit_by_name_cycles_link_name_decreasing); } @@ -24605,7 +24477,7 @@ test_link_visit_external_links_cycles(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" creation order tracking isn't supported with this VOL connector\n"); + printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Lvisit_by_name_cycles_link_creation_increasing); } @@ -24617,13 +24489,13 @@ test_link_visit_external_links_cycles(void) H5_INDEX_CRT_ORDER, H5_ITER_INC, link_visit_external_links_cycles_cb, &i, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" H5Lvisit_by_name2 by index type creation order in increasing order failed\n"); + printf(" H5Lvisit_by_name2 by index type creation order in increasing order failed\n"); PART_ERROR(H5Lvisit_by_name_cycles_link_creation_increasing); } if (i != 3 * LINK_VISIT_EXT_LINKS_CYCLE_TEST_NUM_LINKS_PER_TEST) { H5_FAILED(); - HDprintf(" some links were not visited!\n"); + printf(" some links were not visited!\n"); PART_ERROR(H5Lvisit_by_name_cycles_link_creation_increasing); } @@ -24637,7 +24509,7 @@ test_link_visit_external_links_cycles(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" creation order tracking isn't supported with this VOL connector\n"); + printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Lvisit_by_name_cycles_link_creation_decreasing); } @@ -24649,13 +24521,13 @@ test_link_visit_external_links_cycles(void) H5_INDEX_CRT_ORDER, H5_ITER_DEC, link_visit_external_links_cycles_cb, &i, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" H5Lvisit_by_name2 by index type creation order in decreasing order failed\n"); + printf(" H5Lvisit_by_name2 by index type creation order in decreasing order failed\n"); PART_ERROR(H5Lvisit_by_name_cycles_link_creation_decreasing); } if (i != 4 * LINK_VISIT_EXT_LINKS_CYCLE_TEST_NUM_LINKS_PER_TEST) { H5_FAILED(); - HDprintf(" some links were not visited!\n"); + printf(" some links were not visited!\n"); PART_ERROR(H5Lvisit_by_name_cycles_link_creation_decreasing); } @@ -24744,9 +24616,8 @@ test_link_visit_mixed_links_cycles(void) !(vol_cap_flags_g & H5VL_CAP_FLAG_HARD_LINKS) || !(vol_cap_flags_g & H5VL_CAP_FLAG_SOFT_LINKS) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ITERATE) || !(vol_cap_flags_g & H5VL_CAP_FLAG_UD_LINKS)) { SKIPPED(); - HDprintf( - " API functions for basic file, group, link, hard link, soft link, external link, iterate, " - "or user defined link aren't supported with this connector\n"); + printf(" API functions for basic file, group, link, hard link, soft link, external link, iterate, " + "or user defined link aren't supported with this connector\n"); return 0; } @@ -24756,7 +24627,7 @@ test_link_visit_mixed_links_cycles(void) if ((file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); + printf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); goto error; } @@ -24765,26 +24636,26 @@ test_link_visit_mixed_links_cycles(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); goto error; } if ((gcpl_id = H5Pcreate(H5P_GROUP_CREATE)) < 0) { H5_FAILED(); - HDprintf(" couldn't create a GCPL\n"); + printf(" couldn't create a GCPL\n"); goto error; } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (H5Pset_link_creation_order(gcpl_id, H5P_CRT_ORDER_TRACKED | H5P_CRT_ORDER_INDEXED) < 0) { H5_FAILED(); - HDprintf(" couldn't enable link creation order tracking and indexing on GCPL\n"); + printf(" couldn't enable link creation order tracking and indexing on GCPL\n"); goto error; } } @@ -24792,31 +24663,30 @@ test_link_visit_mixed_links_cycles(void) if ((group_id = H5Gcreate2(container_group, LINK_VISIT_MIXED_LINKS_CYCLE_TEST_SUBGROUP_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container subgroup '%s'\n", - LINK_VISIT_MIXED_LINKS_CYCLE_TEST_SUBGROUP_NAME); + printf(" couldn't create container subgroup '%s'\n", + LINK_VISIT_MIXED_LINKS_CYCLE_TEST_SUBGROUP_NAME); goto error; } if ((subgroup1 = H5Gcreate2(group_id, LINK_VISIT_MIXED_LINKS_CYCLE_TEST_SUBGROUP_NAME2, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create first subgroup '%s'\n", - LINK_VISIT_MIXED_LINKS_CYCLE_TEST_SUBGROUP_NAME2); + printf(" couldn't create first subgroup '%s'\n", LINK_VISIT_MIXED_LINKS_CYCLE_TEST_SUBGROUP_NAME2); goto error; } if ((subgroup2 = H5Gcreate2(group_id, LINK_VISIT_MIXED_LINKS_CYCLE_TEST_SUBGROUP_NAME3, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create second subgroup '%s'\n", - LINK_VISIT_MIXED_LINKS_CYCLE_TEST_SUBGROUP_NAME3); + printf(" couldn't create second subgroup '%s'\n", + LINK_VISIT_MIXED_LINKS_CYCLE_TEST_SUBGROUP_NAME3); goto error; } if (H5Lcreate_hard(group_id, LINK_VISIT_MIXED_LINKS_CYCLE_TEST_SUBGROUP_NAME2, subgroup1, LINK_VISIT_MIXED_LINKS_CYCLE_TEST_LINK_NAME1, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create first hard link '%s'\n", LINK_VISIT_MIXED_LINKS_CYCLE_TEST_LINK_NAME1); + printf(" couldn't create first hard link '%s'\n", LINK_VISIT_MIXED_LINKS_CYCLE_TEST_LINK_NAME1); goto error; } @@ -24825,74 +24695,74 @@ test_link_visit_mixed_links_cycles(void) subgroup1, LINK_VISIT_MIXED_LINKS_CYCLE_TEST_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create soft link '%s'\n", LINK_VISIT_MIXED_LINKS_CYCLE_TEST_LINK_NAME2); + printf(" couldn't create soft link '%s'\n", LINK_VISIT_MIXED_LINKS_CYCLE_TEST_LINK_NAME2); goto error; } if (H5Lcreate_external(ext_link_filename, "/", subgroup2, LINK_VISIT_MIXED_LINKS_CYCLE_TEST_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create external link '%s'\n", LINK_VISIT_MIXED_LINKS_CYCLE_TEST_LINK_NAME3); + printf(" couldn't create external link '%s'\n", LINK_VISIT_MIXED_LINKS_CYCLE_TEST_LINK_NAME3); goto error; } if (H5Lcreate_hard(group_id, LINK_VISIT_MIXED_LINKS_CYCLE_TEST_SUBGROUP_NAME3, subgroup2, LINK_VISIT_MIXED_LINKS_CYCLE_TEST_LINK_NAME4, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create second hard link '%s'\n", LINK_VISIT_MIXED_LINKS_CYCLE_TEST_LINK_NAME4); + printf(" couldn't create second hard link '%s'\n", LINK_VISIT_MIXED_LINKS_CYCLE_TEST_LINK_NAME4); goto error; } /* Verify the links have been created */ if ((link_exists = H5Lexists(subgroup1, LINK_VISIT_MIXED_LINKS_CYCLE_TEST_LINK_NAME1, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if first link '%s' exists\n", - LINK_VISIT_MIXED_LINKS_CYCLE_TEST_LINK_NAME1); + printf(" couldn't determine if first link '%s' exists\n", + LINK_VISIT_MIXED_LINKS_CYCLE_TEST_LINK_NAME1); goto error; } if (!link_exists) { H5_FAILED(); - HDprintf(" first link '%s' did not exist\n", LINK_VISIT_MIXED_LINKS_CYCLE_TEST_LINK_NAME1); + printf(" first link '%s' did not exist\n", LINK_VISIT_MIXED_LINKS_CYCLE_TEST_LINK_NAME1); goto error; } if ((link_exists = H5Lexists(subgroup1, LINK_VISIT_MIXED_LINKS_CYCLE_TEST_LINK_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if second link '%s' exists\n", - LINK_VISIT_MIXED_LINKS_CYCLE_TEST_LINK_NAME2); + printf(" couldn't determine if second link '%s' exists\n", + LINK_VISIT_MIXED_LINKS_CYCLE_TEST_LINK_NAME2); goto error; } if (!link_exists) { H5_FAILED(); - HDprintf(" second link '%s' did not exist\n", LINK_VISIT_MIXED_LINKS_CYCLE_TEST_LINK_NAME2); + printf(" second link '%s' did not exist\n", LINK_VISIT_MIXED_LINKS_CYCLE_TEST_LINK_NAME2); goto error; } if ((link_exists = H5Lexists(subgroup2, LINK_VISIT_MIXED_LINKS_CYCLE_TEST_LINK_NAME3, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if third link '%s' exists\n", - LINK_VISIT_MIXED_LINKS_CYCLE_TEST_LINK_NAME3); + printf(" couldn't determine if third link '%s' exists\n", + LINK_VISIT_MIXED_LINKS_CYCLE_TEST_LINK_NAME3); goto error; } if (!link_exists) { H5_FAILED(); - HDprintf(" third link '%s' did not exist\n", LINK_VISIT_MIXED_LINKS_CYCLE_TEST_LINK_NAME3); + printf(" third link '%s' did not exist\n", LINK_VISIT_MIXED_LINKS_CYCLE_TEST_LINK_NAME3); goto error; } if ((link_exists = H5Lexists(subgroup2, LINK_VISIT_MIXED_LINKS_CYCLE_TEST_LINK_NAME4, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if fourth link '%s' exists\n", - LINK_VISIT_MIXED_LINKS_CYCLE_TEST_LINK_NAME4); + printf(" couldn't determine if fourth link '%s' exists\n", + LINK_VISIT_MIXED_LINKS_CYCLE_TEST_LINK_NAME4); goto error; } if (!link_exists) { H5_FAILED(); - HDprintf(" fourth link '%s' did not exist\n", LINK_VISIT_MIXED_LINKS_CYCLE_TEST_LINK_NAME4); + printf(" fourth link '%s' did not exist\n", LINK_VISIT_MIXED_LINKS_CYCLE_TEST_LINK_NAME4); goto error; } @@ -24915,13 +24785,13 @@ test_link_visit_mixed_links_cycles(void) if (H5Lvisit2(group_id, H5_INDEX_NAME, H5_ITER_INC, link_visit_mixed_links_cycles_cb, &i) < 0) { H5_FAILED(); - HDprintf(" H5Lvisit2 by index type name in increasing order failed\n"); + printf(" H5Lvisit2 by index type name in increasing order failed\n"); PART_ERROR(H5Lvisit_cycles_link_name_increasing); } if (i != LINK_VISIT_MIXED_LINKS_CYCLE_TEST_NUM_LINKS) { H5_FAILED(); - HDprintf(" some links were not visited!\n"); + printf(" some links were not visited!\n"); PART_ERROR(H5Lvisit_cycles_link_name_increasing); } @@ -24938,13 +24808,13 @@ test_link_visit_mixed_links_cycles(void) if (H5Lvisit2(group_id, H5_INDEX_NAME, H5_ITER_DEC, link_visit_mixed_links_cycles_cb, &i) < 0) { H5_FAILED(); - HDprintf(" H5Lvisit2 by index type name in decreasing order failed\n"); + printf(" H5Lvisit2 by index type name in decreasing order failed\n"); PART_ERROR(H5Lvisit_cycles_link_name_decreasing); } if (i != 2 * LINK_VISIT_MIXED_LINKS_CYCLE_TEST_NUM_LINKS) { H5_FAILED(); - HDprintf(" some links were not visited!\n"); + printf(" some links were not visited!\n"); PART_ERROR(H5Lvisit_cycles_link_name_decreasing); } @@ -24958,7 +24828,7 @@ test_link_visit_mixed_links_cycles(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" creation order tracking isn't supported with this VOL connector\n"); + printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Lvisit_cycles_link_creation_increasing); } @@ -24968,13 +24838,13 @@ test_link_visit_mixed_links_cycles(void) if (H5Lvisit2(group_id, H5_INDEX_CRT_ORDER, H5_ITER_INC, link_visit_mixed_links_cycles_cb, &i) < 0) { H5_FAILED(); - HDprintf(" H5Lvisit2 by index type creation order in increasing order failed\n"); + printf(" H5Lvisit2 by index type creation order in increasing order failed\n"); PART_ERROR(H5Lvisit_cycles_link_creation_increasing); } if (i != 3 * LINK_VISIT_MIXED_LINKS_CYCLE_TEST_NUM_LINKS) { H5_FAILED(); - HDprintf(" some links were not visited!\n"); + printf(" some links were not visited!\n"); PART_ERROR(H5Lvisit_cycles_link_creation_increasing); } @@ -24988,7 +24858,7 @@ test_link_visit_mixed_links_cycles(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" creation order tracking isn't supported with this VOL connector\n"); + printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Lvisit_cycles_link_creation_decreasing); } @@ -24998,13 +24868,13 @@ test_link_visit_mixed_links_cycles(void) if (H5Lvisit2(group_id, H5_INDEX_CRT_ORDER, H5_ITER_DEC, link_visit_mixed_links_cycles_cb, &i) < 0) { H5_FAILED(); - HDprintf(" H5Lvisit2 by index type creation order in decreasing order failed\n"); + printf(" H5Lvisit2 by index type creation order in decreasing order failed\n"); PART_ERROR(H5Lvisit_cycles_link_creation_decreasing); } if (i != 4 * LINK_VISIT_MIXED_LINKS_CYCLE_TEST_NUM_LINKS) { H5_FAILED(); - HDprintf(" some links were not visited!\n"); + printf(" some links were not visited!\n"); PART_ERROR(H5Lvisit_cycles_link_creation_decreasing); } @@ -25022,13 +24892,13 @@ test_link_visit_mixed_links_cycles(void) file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_VISIT_MIXED_LINKS_CYCLE_TEST_SUBGROUP_NAME, H5_INDEX_NAME, H5_ITER_INC, link_visit_mixed_links_cycles_cb, &i, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" H5Lvisit_by_name2 by index type name in increasing order failed\n"); + printf(" H5Lvisit_by_name2 by index type name in increasing order failed\n"); PART_ERROR(H5Lvisit_by_name_cycles_link_name_increasing); } if (i != LINK_VISIT_MIXED_LINKS_CYCLE_TEST_NUM_LINKS) { H5_FAILED(); - HDprintf(" some links were not visited!\n"); + printf(" some links were not visited!\n"); PART_ERROR(H5Lvisit_by_name_cycles_link_name_increasing); } @@ -25047,13 +24917,13 @@ test_link_visit_mixed_links_cycles(void) file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_VISIT_MIXED_LINKS_CYCLE_TEST_SUBGROUP_NAME, H5_INDEX_NAME, H5_ITER_DEC, link_visit_mixed_links_cycles_cb, &i, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" H5Lvisit_by_name2 by index type name in decreasing order failed\n"); + printf(" H5Lvisit_by_name2 by index type name in decreasing order failed\n"); PART_ERROR(H5Lvisit_by_name_cycles_link_name_decreasing); } if (i != 2 * LINK_VISIT_MIXED_LINKS_CYCLE_TEST_NUM_LINKS) { H5_FAILED(); - HDprintf(" some links were not visited!\n"); + printf(" some links were not visited!\n"); PART_ERROR(H5Lvisit_by_name_cycles_link_name_decreasing); } @@ -25067,7 +24937,7 @@ test_link_visit_mixed_links_cycles(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" creation order tracking isn't supported with this VOL connector\n"); + printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Lvisit_by_name_cycles_link_creation_increasing); } @@ -25078,13 +24948,13 @@ test_link_visit_mixed_links_cycles(void) file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_VISIT_MIXED_LINKS_CYCLE_TEST_SUBGROUP_NAME, H5_INDEX_CRT_ORDER, H5_ITER_INC, link_visit_mixed_links_cycles_cb, &i, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" H5Lvisit_by_name2 by index type creation order in increasing order failed\n"); + printf(" H5Lvisit_by_name2 by index type creation order in increasing order failed\n"); PART_ERROR(H5Lvisit_by_name_cycles_link_creation_increasing); } if (i != 3 * LINK_VISIT_MIXED_LINKS_CYCLE_TEST_NUM_LINKS) { H5_FAILED(); - HDprintf(" some links were not visited!\n"); + printf(" some links were not visited!\n"); PART_ERROR(H5Lvisit_by_name_cycles_link_creation_increasing); } @@ -25098,7 +24968,7 @@ test_link_visit_mixed_links_cycles(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" creation order tracking isn't supported with this VOL connector\n"); + printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Lvisit_by_name_cycles_link_creation_decreasing); } @@ -25109,13 +24979,13 @@ test_link_visit_mixed_links_cycles(void) file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_VISIT_MIXED_LINKS_CYCLE_TEST_SUBGROUP_NAME, H5_INDEX_CRT_ORDER, H5_ITER_DEC, link_visit_mixed_links_cycles_cb, &i, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" H5Lvisit_by_name2 by index type creation order in decreasing order failed\n"); + printf(" H5Lvisit_by_name2 by index type creation order in decreasing order failed\n"); PART_ERROR(H5Lvisit_by_name_cycles_link_creation_decreasing); } if (i != 4 * LINK_VISIT_MIXED_LINKS_CYCLE_TEST_NUM_LINKS) { H5_FAILED(); - HDprintf(" some links were not visited!\n"); + printf(" some links were not visited!\n"); PART_ERROR(H5Lvisit_by_name_cycles_link_creation_decreasing); } @@ -25183,8 +25053,8 @@ test_link_visit_invalid_params(void) !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_EXTERNAL_LINKS) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ITERATE)) { SKIPPED(); - HDprintf(" API functions for basic file, group, dataset, link, external link, or iterate " - "aren't supported with this connector\n"); + printf(" API functions for basic file, group, dataset, link, external link, or iterate " + "aren't supported with this connector\n"); return 0; } @@ -25194,7 +25064,7 @@ test_link_visit_invalid_params(void) if ((file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); + printf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); goto error; } @@ -25203,35 +25073,34 @@ test_link_visit_invalid_params(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, LINK_VISIT_INVALID_PARAMS_TEST_SUBGROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container subgroup '%s'\n", - LINK_VISIT_INVALID_PARAMS_TEST_SUBGROUP_NAME); + printf(" couldn't create container subgroup '%s'\n", LINK_VISIT_INVALID_PARAMS_TEST_SUBGROUP_NAME); goto error; } if ((subgroup1 = H5Gcreate2(group_id, LINK_VISIT_INVALID_PARAMS_TEST_SUBGROUP_NAME2, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create first subgroup '%s'\n", LINK_VISIT_INVALID_PARAMS_TEST_SUBGROUP_NAME2); + printf(" couldn't create first subgroup '%s'\n", LINK_VISIT_INVALID_PARAMS_TEST_SUBGROUP_NAME2); goto error; } if ((subgroup2 = H5Gcreate2(group_id, LINK_VISIT_INVALID_PARAMS_TEST_SUBGROUP_NAME3, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create second subgroup '%s'\n", LINK_VISIT_INVALID_PARAMS_TEST_SUBGROUP_NAME3); + printf(" couldn't create second subgroup '%s'\n", LINK_VISIT_INVALID_PARAMS_TEST_SUBGROUP_NAME3); goto error; } @@ -25245,7 +25114,7 @@ test_link_visit_invalid_params(void) if ((dset_id = H5Dcreate2(subgroup1, LINK_VISIT_INVALID_PARAMS_TEST_DSET_NAME, dset_dtype, fspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create first dataset '%s'\n", LINK_VISIT_INVALID_PARAMS_TEST_DSET_NAME); + printf(" couldn't create first dataset '%s'\n", LINK_VISIT_INVALID_PARAMS_TEST_DSET_NAME); } if (H5Dclose(dset_id) < 0) @@ -25254,7 +25123,7 @@ test_link_visit_invalid_params(void) if ((dset_id = H5Dcreate2(subgroup2, LINK_VISIT_INVALID_PARAMS_TEST_DSET_NAME, dset_dtype, fspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create second dataset '%s'\n", LINK_VISIT_INVALID_PARAMS_TEST_DSET_NAME); + printf(" couldn't create second dataset '%s'\n", LINK_VISIT_INVALID_PARAMS_TEST_DSET_NAME); } if (H5Dclose(dset_id) < 0) @@ -25263,79 +25132,79 @@ test_link_visit_invalid_params(void) if (H5Lcreate_hard(subgroup1, LINK_VISIT_INVALID_PARAMS_TEST_DSET_NAME, subgroup1, LINK_VISIT_INVALID_PARAMS_TEST_LINK_NAME1, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create first hard link '%s'\n", LINK_VISIT_INVALID_PARAMS_TEST_LINK_NAME1); + printf(" couldn't create first hard link '%s'\n", LINK_VISIT_INVALID_PARAMS_TEST_LINK_NAME1); goto error; } if (H5Lcreate_soft(LINK_VISIT_INVALID_PARAMS_TEST_DSET_NAME, subgroup1, LINK_VISIT_INVALID_PARAMS_TEST_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create soft link '%s'\n", LINK_VISIT_INVALID_PARAMS_TEST_LINK_NAME2); + printf(" couldn't create soft link '%s'\n", LINK_VISIT_INVALID_PARAMS_TEST_LINK_NAME2); goto error; } if (H5Lcreate_external(ext_link_filename, "/", subgroup2, LINK_VISIT_INVALID_PARAMS_TEST_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create external link '%s'\n", LINK_VISIT_INVALID_PARAMS_TEST_LINK_NAME3); + printf(" couldn't create external link '%s'\n", LINK_VISIT_INVALID_PARAMS_TEST_LINK_NAME3); goto error; } if (H5Lcreate_hard(subgroup2, LINK_VISIT_INVALID_PARAMS_TEST_DSET_NAME, subgroup2, LINK_VISIT_INVALID_PARAMS_TEST_LINK_NAME4, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create second hard link '%s'\n", LINK_VISIT_INVALID_PARAMS_TEST_LINK_NAME4); + printf(" couldn't create second hard link '%s'\n", LINK_VISIT_INVALID_PARAMS_TEST_LINK_NAME4); goto error; } /* Verify the links have been created */ if ((link_exists = H5Lexists(subgroup1, LINK_VISIT_INVALID_PARAMS_TEST_LINK_NAME1, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if first link '%s' exists\n", - LINK_VISIT_INVALID_PARAMS_TEST_LINK_NAME1); + printf(" couldn't determine if first link '%s' exists\n", + LINK_VISIT_INVALID_PARAMS_TEST_LINK_NAME1); goto error; } if (!link_exists) { H5_FAILED(); - HDprintf(" link 1 did not exist\n"); + printf(" link 1 did not exist\n"); goto error; } if ((link_exists = H5Lexists(subgroup1, LINK_VISIT_INVALID_PARAMS_TEST_LINK_NAME2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if second link '%s' exists\n", - LINK_VISIT_INVALID_PARAMS_TEST_LINK_NAME2); + printf(" couldn't determine if second link '%s' exists\n", + LINK_VISIT_INVALID_PARAMS_TEST_LINK_NAME2); goto error; } if (!link_exists) { H5_FAILED(); - HDprintf(" link 2 did not exist\n"); + printf(" link 2 did not exist\n"); goto error; } if ((link_exists = H5Lexists(subgroup2, LINK_VISIT_INVALID_PARAMS_TEST_LINK_NAME3, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if third link '%s' exists\n", - LINK_VISIT_INVALID_PARAMS_TEST_LINK_NAME3); + printf(" couldn't determine if third link '%s' exists\n", + LINK_VISIT_INVALID_PARAMS_TEST_LINK_NAME3); goto error; } if (!link_exists) { H5_FAILED(); - HDprintf(" link 3 did not exist\n"); + printf(" link 3 did not exist\n"); goto error; } if ((link_exists = H5Lexists(subgroup2, LINK_VISIT_INVALID_PARAMS_TEST_LINK_NAME4, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if fourth link '%s' exists\n", - LINK_VISIT_INVALID_PARAMS_TEST_LINK_NAME4); + printf(" couldn't determine if fourth link '%s' exists\n", + LINK_VISIT_INVALID_PARAMS_TEST_LINK_NAME4); goto error; } if (!link_exists) { H5_FAILED(); - HDprintf(" link 4 did not exist\n"); + printf(" link 4 did not exist\n"); goto error; } @@ -25356,7 +25225,7 @@ test_link_visit_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Lvisit2 succeeded with an invalid group ID!\n"); + printf(" H5Lvisit2 succeeded with an invalid group ID!\n"); PART_ERROR(H5Lvisit_invalid_grp_id); } @@ -25377,7 +25246,7 @@ test_link_visit_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Lvisit2 succeeded with invalid index type H5_INDEX_UNKNOWN!\n"); + printf(" H5Lvisit2 succeeded with invalid index type H5_INDEX_UNKNOWN!\n"); PART_ERROR(H5Lvisit_invalid_index_type); } @@ -25389,7 +25258,7 @@ test_link_visit_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Lvisit2 succeeded with invalid index type H5_INDEX_N!\n"); + printf(" H5Lvisit2 succeeded with invalid index type H5_INDEX_N!\n"); PART_ERROR(H5Lvisit_invalid_index_type); } @@ -25410,7 +25279,7 @@ test_link_visit_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Lvisit2 succeeded with invalid iteration ordering H5_ITER_UNKNOWN!\n"); + printf(" H5Lvisit2 succeeded with invalid iteration ordering H5_ITER_UNKNOWN!\n"); PART_ERROR(H5Lvisit_invalid_iter_order); } @@ -25422,7 +25291,7 @@ test_link_visit_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Lvisit2 succeeded with invalid iteration ordering H5_ITER_N!\n"); + printf(" H5Lvisit2 succeeded with invalid iteration ordering H5_ITER_N!\n"); PART_ERROR(H5Lvisit_invalid_iter_order); } @@ -25445,7 +25314,7 @@ test_link_visit_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Lvisit_by_name2 succeeded with an invalid location ID!\n"); + printf(" H5Lvisit_by_name2 succeeded with an invalid location ID!\n"); PART_ERROR(H5Lvisit_by_name_invalid_loc_id); } @@ -25466,7 +25335,7 @@ test_link_visit_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Lvisit_by_name2 succeeded with a NULL group name!\n"); + printf(" H5Lvisit_by_name2 succeeded with a NULL group name!\n"); PART_ERROR(H5Lvisit_by_name_invalid_grp_name); } @@ -25479,7 +25348,7 @@ test_link_visit_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Lvisit_by_name2 succeeded with an invalid group name of ''!\n"); + printf(" H5Lvisit_by_name2 succeeded with an invalid group name of ''!\n"); PART_ERROR(H5Lvisit_by_name_invalid_grp_name); } @@ -25501,7 +25370,7 @@ test_link_visit_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Lvisit_by_name2 succeeded with invalid index type H5_INDEX_UNKNOWN!\n"); + printf(" H5Lvisit_by_name2 succeeded with invalid index type H5_INDEX_UNKNOWN!\n"); PART_ERROR(H5Lvisit_by_name_invalid_index_type); } @@ -25515,7 +25384,7 @@ test_link_visit_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Lvisit_by_name2 succeeded with invalid index type H5_INDEX_N!\n"); + printf(" H5Lvisit_by_name2 succeeded with invalid index type H5_INDEX_N!\n"); PART_ERROR(H5Lvisit_by_name_invalid_index_type); } @@ -25537,8 +25406,7 @@ test_link_visit_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf( - " H5Lvisit_by_name2 succeeded with invalid iteration ordering H5_ITER_UNKNOWN!\n"); + printf(" H5Lvisit_by_name2 succeeded with invalid iteration ordering H5_ITER_UNKNOWN!\n"); PART_ERROR(H5Lvisit_by_name_invalid_iter_order); } @@ -25552,7 +25420,7 @@ test_link_visit_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Lvisit_by_name2 succeeded with invalid iteration ordering H5_ITER_N!\n"); + printf(" H5Lvisit_by_name2 succeeded with invalid iteration ordering H5_ITER_N!\n"); PART_ERROR(H5Lvisit_by_name_invalid_iter_order); } @@ -25574,7 +25442,7 @@ test_link_visit_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Lvisit_by_name2 succeeded with an invalid LAPL!\n"); + printf(" H5Lvisit_by_name2 succeeded with an invalid LAPL!\n"); PART_ERROR(H5Lvisit_by_name_invalid_lapl); } @@ -25640,8 +25508,8 @@ test_link_visit_0_links(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ITERATE)) { SKIPPED(); - HDprintf(" API functions for basic file, group, or link iterate aren't supported " - "with this connector\n"); + printf(" API functions for basic file, group, or link iterate aren't supported " + "with this connector\n"); return 0; } @@ -25649,26 +25517,26 @@ test_link_visit_0_links(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); goto error; } if ((gcpl_id = H5Pcreate(H5P_GROUP_CREATE)) < 0) { H5_FAILED(); - HDprintf(" couldn't create a GCPL\n"); + printf(" couldn't create a GCPL\n"); goto error; } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (H5Pset_link_creation_order(gcpl_id, H5P_CRT_ORDER_TRACKED | H5P_CRT_ORDER_INDEXED) < 0) { H5_FAILED(); - HDprintf(" couldn't enable link creation order tracking and indexing on GCPL\n"); + printf(" couldn't enable link creation order tracking and indexing on GCPL\n"); goto error; } } @@ -25676,7 +25544,7 @@ test_link_visit_0_links(void) if ((group_id = H5Gcreate2(container_group, LINK_VISIT_0_LINKS_TEST_SUBGROUP_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container subgroup '%s'\n", LINK_VISIT_0_LINKS_TEST_SUBGROUP_NAME); + printf(" couldn't create container subgroup '%s'\n", LINK_VISIT_0_LINKS_TEST_SUBGROUP_NAME); goto error; } @@ -25690,7 +25558,7 @@ test_link_visit_0_links(void) if (H5Lvisit2(group_id, H5_INDEX_NAME, H5_ITER_INC, link_visit_0_links_cb, NULL) < 0) { H5_FAILED(); - HDprintf(" H5Lvisit2 by index type name in increasing order failed\n"); + printf(" H5Lvisit2 by index type name in increasing order failed\n"); PART_ERROR(H5Lvisit_0_links_name_increasing); } @@ -25704,7 +25572,7 @@ test_link_visit_0_links(void) if (H5Lvisit2(group_id, H5_INDEX_NAME, H5_ITER_DEC, link_visit_0_links_cb, NULL) < 0) { H5_FAILED(); - HDprintf(" H5Lvisit2 by index type name in decreasing order failed\n"); + printf(" H5Lvisit2 by index type name in decreasing order failed\n"); PART_ERROR(H5Lvisit_0_links_name_decreasing); } @@ -25718,13 +25586,13 @@ test_link_visit_0_links(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" creation order tracking isn't supported with this VOL connector\n"); + printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Lvisit_0_links_creation_increasing); } if (H5Lvisit2(group_id, H5_INDEX_CRT_ORDER, H5_ITER_INC, link_visit_0_links_cb, NULL) < 0) { H5_FAILED(); - HDprintf(" H5Lvisit2 by index type creation order in increasing order failed\n"); + printf(" H5Lvisit2 by index type creation order in increasing order failed\n"); PART_ERROR(H5Lvisit_0_links_creation_increasing); } @@ -25738,13 +25606,13 @@ test_link_visit_0_links(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" creation order tracking isn't supported with this VOL connector\n"); + printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Lvisit_0_links_creation_decreasing); } if (H5Lvisit2(group_id, H5_INDEX_CRT_ORDER, H5_ITER_DEC, link_visit_0_links_cb, NULL) < 0) { H5_FAILED(); - HDprintf(" H5Lvisit2 by index type creation order in decreasing order failed\n"); + printf(" H5Lvisit2 by index type creation order in decreasing order failed\n"); PART_ERROR(H5Lvisit_0_links_creation_decreasing); } @@ -25759,7 +25627,7 @@ test_link_visit_0_links(void) if (H5Lvisit_by_name2(file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_VISIT_0_LINKS_TEST_SUBGROUP_NAME, H5_INDEX_NAME, H5_ITER_INC, link_visit_0_links_cb, NULL, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" H5Lvisit_by_name2 by index type name in increasing order failed\n"); + printf(" H5Lvisit_by_name2 by index type name in increasing order failed\n"); PART_ERROR(H5Lvisit_by_name_0_links_name_increasing); } @@ -25774,7 +25642,7 @@ test_link_visit_0_links(void) if (H5Lvisit_by_name2(file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_VISIT_0_LINKS_TEST_SUBGROUP_NAME, H5_INDEX_NAME, H5_ITER_DEC, link_visit_0_links_cb, NULL, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" H5Lvisit_by_name2 by index type name in decreasing order failed\n"); + printf(" H5Lvisit_by_name2 by index type name in decreasing order failed\n"); PART_ERROR(H5Lvisit_by_name_0_links_name_decreasing); } @@ -25788,7 +25656,7 @@ test_link_visit_0_links(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" creation order tracking isn't supported with this VOL connector\n"); + printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Lvisit_by_name_0_links_creation_increasing); } @@ -25796,7 +25664,7 @@ test_link_visit_0_links(void) H5_INDEX_CRT_ORDER, H5_ITER_INC, link_visit_0_links_cb, NULL, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" H5Lvisit_by_name2 by index type creation order in increasing order failed\n"); + printf(" H5Lvisit_by_name2 by index type creation order in increasing order failed\n"); PART_ERROR(H5Lvisit_by_name_0_links_creation_increasing); } @@ -25810,7 +25678,7 @@ test_link_visit_0_links(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" creation order tracking isn't supported with this VOL connector\n"); + printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Lvisit_by_name_0_links_creation_decreasing); } @@ -25818,7 +25686,7 @@ test_link_visit_0_links(void) H5_INDEX_CRT_ORDER, H5_ITER_DEC, link_visit_0_links_cb, NULL, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" H5Lvisit_by_name2 by index type creation order in decreasing order failed\n"); + printf(" H5Lvisit_by_name2 by index type creation order in decreasing order failed\n"); PART_ERROR(H5Lvisit_by_name_0_links_creation_decreasing); } @@ -25875,7 +25743,7 @@ link_iter_hard_links_cb(hid_t group_id, const char *name, const H5L_info2_t *inf if (H5L_TYPE_HARD != info->type) { ret_val = H5_ITER_ERROR; - HDprintf(" link type for link '%s' was not H5L_TYPE_HARD!\n", name); + printf(" link type for link '%s' was not H5L_TYPE_HARD!\n", name); goto done; } @@ -25905,7 +25773,7 @@ link_iter_hard_links_cb(hid_t group_id, const char *name, const H5L_info2_t *inf } if (HDstrncmp(name, expected_link_name, LINK_ITER_HARD_LINKS_TEST_BUF_SIZE)) { - HDprintf(" link name '%s' didn't match expected name '%s'\n", name, expected_link_name); + printf(" link name '%s' didn't match expected name '%s'\n", name, expected_link_name); ret_val = H5_ITER_ERROR; goto done; } @@ -25935,7 +25803,7 @@ link_iter_soft_links_cb(hid_t group_id, const char *name, const H5L_info2_t *inf if (H5L_TYPE_SOFT != info->type) { ret_val = H5_ITER_ERROR; - HDprintf(" link type for link '%s' was not H5L_TYPE_SOFT!\n", name); + printf(" link type for link '%s' was not H5L_TYPE_SOFT!\n", name); goto done; } @@ -25965,7 +25833,7 @@ link_iter_soft_links_cb(hid_t group_id, const char *name, const H5L_info2_t *inf } if (HDstrncmp(name, expected_link_name, LINK_ITER_SOFT_LINKS_TEST_BUF_SIZE)) { - HDprintf(" link name '%s' didn't match expected name '%s'\n", name, expected_link_name); + printf(" link name '%s' didn't match expected name '%s'\n", name, expected_link_name); ret_val = H5_ITER_ERROR; goto done; } @@ -25992,8 +25860,8 @@ link_iter_external_links_cb(hid_t group_id, const char *name, const H5L_info2_t if (!(vol_cap_flags_g & H5VL_CAP_FLAG_EXTERNAL_LINKS)) { SKIPPED(); - HDprintf(" API functions for external links aren't supported with this " - "connector\n"); + printf(" API functions for external links aren't supported with this " + "connector\n"); return 1; } @@ -26002,7 +25870,7 @@ link_iter_external_links_cb(hid_t group_id, const char *name, const H5L_info2_t if (H5L_TYPE_EXTERNAL != info->type) { ret_val = H5_ITER_ERROR; - HDprintf(" link type for link '%s' was not H5L_TYPE_EXTERNAL!\n", name); + printf(" link type for link '%s' was not H5L_TYPE_EXTERNAL!\n", name); goto done; } @@ -26032,7 +25900,7 @@ link_iter_external_links_cb(hid_t group_id, const char *name, const H5L_info2_t } if (HDstrncmp(name, expected_link_name, LINK_ITER_EXT_LINKS_TEST_BUF_SIZE)) { - HDprintf(" link name '%s' didn't match expected name '%s'\n", name, expected_link_name); + printf(" link name '%s' didn't match expected name '%s'\n", name, expected_link_name); ret_val = H5_ITER_ERROR; goto done; } @@ -26057,8 +25925,8 @@ link_iter_mixed_links_cb(hid_t group_id, const char *name, const H5L_info2_t *in if (!(vol_cap_flags_g & H5VL_CAP_FLAG_EXTERNAL_LINKS) || !(vol_cap_flags_g & H5VL_CAP_FLAG_UD_LINKS)) { SKIPPED(); - HDprintf(" API functions for external or user-defined link aren't supported with this " - "connector\n"); + printf(" API functions for external or user-defined link aren't supported with this " + "connector\n"); return 1; } @@ -26069,7 +25937,7 @@ link_iter_mixed_links_cb(hid_t group_id, const char *name, const H5L_info2_t *in (counter_val == 1 || counter_val == 4 || counter_val == 6 || counter_val == 11)) { if (H5L_TYPE_HARD != info->type) { ret_val = -1; - HDprintf(" link type for link '%s' was not H5L_TYPE_HARD!\n", name); + printf(" link type for link '%s' was not H5L_TYPE_HARD!\n", name); } goto done; @@ -26079,7 +25947,7 @@ link_iter_mixed_links_cb(hid_t group_id, const char *name, const H5L_info2_t *in (counter_val == 2 || counter_val == 3 || counter_val == 7 || counter_val == 10)) { if (H5L_TYPE_SOFT != info->type) { ret_val = -1; - HDprintf(" link type for link '%s' was not H5L_TYPE_SOFT!\n", name); + printf(" link type for link '%s' was not H5L_TYPE_SOFT!\n", name); } goto done; @@ -26089,13 +25957,13 @@ link_iter_mixed_links_cb(hid_t group_id, const char *name, const H5L_info2_t *in (counter_val == 0 || counter_val == 5 || counter_val == 8 || counter_val == 9)) { if (H5L_TYPE_EXTERNAL != info->type) { ret_val = -1; - HDprintf(" link type for link '%s' was not H5L_TYPE_EXTERNAL!\n", name); + printf(" link type for link '%s' was not H5L_TYPE_EXTERNAL!\n", name); } goto done; } - HDprintf(" link name '%s' didn't match known names or came in an incorrect order\n", name); + printf(" link name '%s' didn't match known names or came in an incorrect order\n", name); ret_val = -1; @@ -26146,8 +26014,8 @@ link_iter_idx_saving_cb(hid_t group_id, const char *name, const H5L_info2_t *inf if (!(vol_cap_flags_g & H5VL_CAP_FLAG_EXTERNAL_LINKS) || !(vol_cap_flags_g & H5VL_CAP_FLAG_UD_LINKS)) { SKIPPED(); - HDprintf(" API functions for external or user-defined link aren't supported with this " - "connector\n"); + printf(" API functions for external or user-defined link aren't supported with this " + "connector\n"); return 1; } @@ -26163,7 +26031,7 @@ link_iter_idx_saving_cb(hid_t group_id, const char *name, const H5L_info2_t *inf strlen(LINK_ITER_MIXED_LINKS_TEST_HARD_LINK_NAME) + 1)) { if (H5L_TYPE_HARD != info->type) { H5_FAILED(); - HDprintf(" link type did not match\n"); + printf(" link type did not match\n"); goto error; } } @@ -26171,7 +26039,7 @@ link_iter_idx_saving_cb(hid_t group_id, const char *name, const H5L_info2_t *inf strlen(LINK_ITER_MIXED_LINKS_TEST_SOFT_LINK_NAME) + 1)) { if (H5L_TYPE_SOFT != info->type) { H5_FAILED(); - HDprintf(" link type did not match\n"); + printf(" link type did not match\n"); goto error; } } @@ -26179,13 +26047,13 @@ link_iter_idx_saving_cb(hid_t group_id, const char *name, const H5L_info2_t *inf strlen(LINK_ITER_MIXED_LINKS_TEST_EXT_LINK_NAME) + 1)) { if (H5L_TYPE_EXTERNAL != info->type) { H5_FAILED(); - HDprintf(" link type did not match\n"); + printf(" link type did not match\n"); goto error; } } else { H5_FAILED(); - HDprintf(" link name didn't match known names\n"); + printf(" link name didn't match known names\n"); goto error; } @@ -26217,7 +26085,7 @@ link_visit_hard_links_no_cycles_cb(hid_t group_id, const char *name, const H5L_i if (H5L_TYPE_HARD != info->type) { ret_val = H5_ITER_ERROR; - HDprintf(" link type for link '%s' was not H5L_TYPE_HARD!\n", name); + printf(" link type for link '%s' was not H5L_TYPE_HARD!\n", name); goto done; } @@ -26287,7 +26155,7 @@ link_visit_hard_links_no_cycles_cb(hid_t group_id, const char *name, const H5L_i } if (HDstrncmp(name, expected_link_name, LINK_VISIT_HARD_LINKS_NO_CYCLE_TEST_BUF_SIZE)) { - HDprintf(" link name '%s' didn't match expected name '%s'\n", name, expected_link_name); + printf(" link name '%s' didn't match expected name '%s'\n", name, expected_link_name); ret_val = H5_ITER_ERROR; goto done; } @@ -26324,14 +26192,14 @@ link_visit_soft_links_no_cycles_cb(hid_t group_id, const char *name, const H5L_i if (is_subgroup_link) { if (H5L_TYPE_HARD != info->type) { ret_val = H5_ITER_ERROR; - HDprintf(" link type for link '%s' was not H5L_TYPE_HARD!\n", name); + printf(" link type for link '%s' was not H5L_TYPE_HARD!\n", name); goto done; } } else { if (H5L_TYPE_SOFT != info->type) { ret_val = H5_ITER_ERROR; - HDprintf(" link type for link '%s' was not H5L_TYPE_SOFT!\n", name); + printf(" link type for link '%s' was not H5L_TYPE_SOFT!\n", name); goto done; } } @@ -26400,7 +26268,7 @@ link_visit_soft_links_no_cycles_cb(hid_t group_id, const char *name, const H5L_i } if (HDstrncmp(name, expected_link_name, LINK_VISIT_SOFT_LINKS_NO_CYCLE_TEST_BUF_SIZE)) { - HDprintf(" link name '%s' didn't match expected name '%s'\n", name, expected_link_name); + printf(" link name '%s' didn't match expected name '%s'\n", name, expected_link_name); ret_val = H5_ITER_ERROR; goto done; } @@ -26431,8 +26299,8 @@ link_visit_external_links_no_cycles_cb(hid_t group_id, const char *name, const H if (!(vol_cap_flags_g & H5VL_CAP_FLAG_EXTERNAL_LINKS)) { SKIPPED(); - HDprintf(" API functions for external links aren't supported with this " - "connector\n"); + printf(" API functions for external links aren't supported with this " + "connector\n"); return 1; } @@ -26445,14 +26313,14 @@ link_visit_external_links_no_cycles_cb(hid_t group_id, const char *name, const H if (is_subgroup_link) { if (H5L_TYPE_HARD != info->type) { ret_val = H5_ITER_ERROR; - HDprintf(" link type for link '%s' was not H5L_TYPE_HARD!\n", name); + printf(" link type for link '%s' was not H5L_TYPE_HARD!\n", name); goto done; } } else { if (H5L_TYPE_EXTERNAL != info->type) { ret_val = H5_ITER_ERROR; - HDprintf(" link type for link '%s' was not H5L_TYPE_EXTERNAL!\n", name); + printf(" link type for link '%s' was not H5L_TYPE_EXTERNAL!\n", name); goto done; } } @@ -26521,7 +26389,7 @@ link_visit_external_links_no_cycles_cb(hid_t group_id, const char *name, const H } if (HDstrncmp(name, expected_link_name, LINK_VISIT_EXT_LINKS_NO_CYCLE_TEST_BUF_SIZE)) { - HDprintf(" link name '%s' didn't match expected name '%s'\n", name, expected_link_name); + printf(" link name '%s' didn't match expected name '%s'\n", name, expected_link_name); ret_val = H5_ITER_ERROR; goto done; } @@ -26546,8 +26414,8 @@ link_visit_mixed_links_no_cycles_cb(hid_t group_id, const char *name, const H5L_ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_EXTERNAL_LINKS) || !(vol_cap_flags_g & H5VL_CAP_FLAG_UD_LINKS)) { SKIPPED(); - HDprintf(" API functions for external or user-defined link aren't supported with this " - "connector\n"); + printf(" API functions for external or user-defined link aren't supported with this " + "connector\n"); return 1; } @@ -26563,9 +26431,9 @@ link_visit_mixed_links_no_cycles_cb(hid_t group_id, const char *name, const H5L_ (counter_val == 2 || counter_val == 14 || counter_val == 18 || counter_val == 30)) { if (H5L_TYPE_HARD != info->type) { ret_val = -1; - HDprintf(" link type for link '%s' was not H5L_TYPE_HARD!\n", - LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_SUBGROUP_NAME2 - "/" LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_LINK_NAME1); + printf(" link type for link '%s' was not H5L_TYPE_HARD!\n", + LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_SUBGROUP_NAME2 + "/" LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_LINK_NAME1); } goto done; @@ -26579,9 +26447,9 @@ link_visit_mixed_links_no_cycles_cb(hid_t group_id, const char *name, const H5L_ (counter_val == 3 || counter_val == 13 || counter_val == 19 || counter_val == 29)) { if (H5L_TYPE_SOFT != info->type) { ret_val = -1; - HDprintf(" link type for link '%s' was not H5L_TYPE_SOFT!\n", - LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_SUBGROUP_NAME2 - "/" LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_LINK_NAME2); + printf(" link type for link '%s' was not H5L_TYPE_SOFT!\n", + LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_SUBGROUP_NAME2 + "/" LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_LINK_NAME2); } goto done; @@ -26595,9 +26463,9 @@ link_visit_mixed_links_no_cycles_cb(hid_t group_id, const char *name, const H5L_ (counter_val == 6 || counter_val == 10 || counter_val == 22 || counter_val == 26)) { if (H5L_TYPE_EXTERNAL != info->type) { ret_val = -1; - HDprintf(" link type for link '%s' was not H5L_TYPE_EXTERNAL!\n", - LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_SUBGROUP_NAME3 - "/" LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_LINK_NAME3); + printf(" link type for link '%s' was not H5L_TYPE_EXTERNAL!\n", + LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_SUBGROUP_NAME3 + "/" LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_LINK_NAME3); } goto done; @@ -26611,9 +26479,9 @@ link_visit_mixed_links_no_cycles_cb(hid_t group_id, const char *name, const H5L_ (counter_val == 7 || counter_val == 9 || counter_val == 23 || counter_val == 25)) { if (H5L_TYPE_HARD != info->type) { ret_val = -1; - HDprintf(" link type for link '%s' was not H5L_TYPE_HARD!\n", - LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_SUBGROUP_NAME3 - "/" LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_LINK_NAME4); + printf(" link type for link '%s' was not H5L_TYPE_HARD!\n", + LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_SUBGROUP_NAME3 + "/" LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_LINK_NAME4); } goto done; @@ -26627,9 +26495,9 @@ link_visit_mixed_links_no_cycles_cb(hid_t group_id, const char *name, const H5L_ (counter_val == 1 || counter_val == 15 || counter_val == 17 || counter_val == 31)) { if (H5L_TYPE_HARD != info->type) { ret_val = -1; - HDprintf(" link type for link '%s' was not H5L_TYPE_HARD!\n", - LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_SUBGROUP_NAME2 - "/" LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_DSET_NAME); + printf(" link type for link '%s' was not H5L_TYPE_HARD!\n", + LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_SUBGROUP_NAME2 + "/" LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_DSET_NAME); } goto done; @@ -26643,9 +26511,9 @@ link_visit_mixed_links_no_cycles_cb(hid_t group_id, const char *name, const H5L_ (counter_val == 5 || counter_val == 11 || counter_val == 21 || counter_val == 27)) { if (H5L_TYPE_HARD != info->type) { ret_val = -1; - HDprintf(" link type for link '%s' was not H5L_TYPE_HARD!\n", - LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_SUBGROUP_NAME3 - "/" LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_DSET_NAME2); + printf(" link type for link '%s' was not H5L_TYPE_HARD!\n", + LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_SUBGROUP_NAME3 + "/" LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_DSET_NAME2); } goto done; @@ -26655,8 +26523,8 @@ link_visit_mixed_links_no_cycles_cb(hid_t group_id, const char *name, const H5L_ (counter_val == 0 || counter_val == 12 || counter_val == 16 || counter_val == 28)) { if (H5L_TYPE_HARD != info->type) { ret_val = -1; - HDprintf(" link type for link '%s' was not H5L_TYPE_HARD!\n", - LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_SUBGROUP_NAME2); + printf(" link type for link '%s' was not H5L_TYPE_HARD!\n", + LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_SUBGROUP_NAME2); } goto done; @@ -26666,14 +26534,14 @@ link_visit_mixed_links_no_cycles_cb(hid_t group_id, const char *name, const H5L_ (counter_val == 4 || counter_val == 8 || counter_val == 20 || counter_val == 24)) { if (H5L_TYPE_HARD != info->type) { ret_val = -1; - HDprintf(" link type for link '%s' was not H5L_TYPE_HARD!\n", - LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_SUBGROUP_NAME3); + printf(" link type for link '%s' was not H5L_TYPE_HARD!\n", + LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_SUBGROUP_NAME3); } goto done; } - HDprintf(" link name '%s' didn't match known names or came in an incorrect order\n", name); + printf(" link name '%s' didn't match known names or came in an incorrect order\n", name); ret_val = -1; @@ -26705,7 +26573,7 @@ link_visit_hard_links_cycles_cb(hid_t group_id, const char *name, const H5L_info if (H5L_TYPE_HARD != info->type) { ret_val = H5_ITER_ERROR; - HDprintf(" link type for link '%s' was not H5L_TYPE_HARD!\n", name); + printf(" link type for link '%s' was not H5L_TYPE_HARD!\n", name); goto done; } @@ -26775,7 +26643,7 @@ link_visit_hard_links_cycles_cb(hid_t group_id, const char *name, const H5L_info } if (HDstrncmp(name, expected_link_name, LINK_VISIT_HARD_LINKS_CYCLE_TEST_BUF_SIZE)) { - HDprintf(" link name '%s' didn't match expected name '%s'\n", name, expected_link_name); + printf(" link name '%s' didn't match expected name '%s'\n", name, expected_link_name); ret_val = H5_ITER_ERROR; goto done; } @@ -26812,14 +26680,14 @@ link_visit_soft_links_cycles_cb(hid_t group_id, const char *name, const H5L_info if (is_subgroup_link) { if (H5L_TYPE_HARD != info->type) { ret_val = H5_ITER_ERROR; - HDprintf(" link type for link '%s' was not H5L_TYPE_HARD!\n", name); + printf(" link type for link '%s' was not H5L_TYPE_HARD!\n", name); goto done; } } else { if (H5L_TYPE_SOFT != info->type) { ret_val = H5_ITER_ERROR; - HDprintf(" link type for link '%s' was not H5L_TYPE_SOFT!\n", name); + printf(" link type for link '%s' was not H5L_TYPE_SOFT!\n", name); goto done; } } @@ -26888,7 +26756,7 @@ link_visit_soft_links_cycles_cb(hid_t group_id, const char *name, const H5L_info } if (HDstrncmp(name, expected_link_name, LINK_VISIT_SOFT_LINKS_CYCLE_TEST_BUF_SIZE)) { - HDprintf(" link name '%s' didn't match expected name '%s'\n", name, expected_link_name); + printf(" link name '%s' didn't match expected name '%s'\n", name, expected_link_name); ret_val = H5_ITER_ERROR; goto done; } @@ -26918,8 +26786,8 @@ link_visit_external_links_cycles_cb(hid_t group_id, const char *name, const H5L_ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_EXTERNAL_LINKS)) { SKIPPED(); - HDprintf(" API functions for external links aren't supported with this " - "connector\n"); + printf(" API functions for external links aren't supported with this " + "connector\n"); return 1; } @@ -26932,14 +26800,14 @@ link_visit_external_links_cycles_cb(hid_t group_id, const char *name, const H5L_ if (is_subgroup_link) { if (H5L_TYPE_HARD != info->type) { ret_val = H5_ITER_ERROR; - HDprintf(" link type for link '%s' was not H5L_TYPE_HARD!\n", name); + printf(" link type for link '%s' was not H5L_TYPE_HARD!\n", name); goto done; } } else { if (H5L_TYPE_EXTERNAL != info->type) { ret_val = H5_ITER_ERROR; - HDprintf(" link type for link '%s' was not H5L_TYPE_EXTERNAL!\n", name); + printf(" link type for link '%s' was not H5L_TYPE_EXTERNAL!\n", name); goto done; } } @@ -27008,7 +26876,7 @@ link_visit_external_links_cycles_cb(hid_t group_id, const char *name, const H5L_ } if (HDstrncmp(name, expected_link_name, LINK_VISIT_EXT_LINKS_CYCLE_TEST_BUF_SIZE)) { - HDprintf(" link name '%s' didn't match expected name '%s'\n", name, expected_link_name); + printf(" link name '%s' didn't match expected name '%s'\n", name, expected_link_name); ret_val = H5_ITER_ERROR; goto done; } @@ -27033,8 +26901,8 @@ link_visit_mixed_links_cycles_cb(hid_t group_id, const char *name, const H5L_inf if (!(vol_cap_flags_g & H5VL_CAP_FLAG_EXTERNAL_LINKS) || !(vol_cap_flags_g & H5VL_CAP_FLAG_UD_LINKS)) { SKIPPED(); - HDprintf(" API functions for external or user-defined link aren't supported with this " - "connector\n"); + printf(" API functions for external or user-defined link aren't supported with this " + "connector\n"); return 1; } @@ -27050,9 +26918,9 @@ link_visit_mixed_links_cycles_cb(hid_t group_id, const char *name, const H5L_inf (counter_val == 1 || counter_val == 11 || counter_val == 13 || counter_val == 23)) { if (H5L_TYPE_HARD != info->type) { ret_val = -1; - HDprintf(" link type for link '%s' was not H5L_TYPE_HARD!\n", - LINK_VISIT_MIXED_LINKS_CYCLE_TEST_SUBGROUP_NAME2 - "/" LINK_VISIT_MIXED_LINKS_CYCLE_TEST_LINK_NAME1); + printf(" link type for link '%s' was not H5L_TYPE_HARD!\n", + LINK_VISIT_MIXED_LINKS_CYCLE_TEST_SUBGROUP_NAME2 + "/" LINK_VISIT_MIXED_LINKS_CYCLE_TEST_LINK_NAME1); } goto done; @@ -27066,9 +26934,9 @@ link_visit_mixed_links_cycles_cb(hid_t group_id, const char *name, const H5L_inf (counter_val == 2 || counter_val == 10 || counter_val == 14 || counter_val == 22)) { if (H5L_TYPE_SOFT != info->type) { ret_val = -1; - HDprintf(" link type for link '%s' was not H5L_TYPE_SOFT!\n", - LINK_VISIT_MIXED_LINKS_CYCLE_TEST_SUBGROUP_NAME2 - "/" LINK_VISIT_MIXED_LINKS_CYCLE_TEST_LINK_NAME2); + printf(" link type for link '%s' was not H5L_TYPE_SOFT!\n", + LINK_VISIT_MIXED_LINKS_CYCLE_TEST_SUBGROUP_NAME2 + "/" LINK_VISIT_MIXED_LINKS_CYCLE_TEST_LINK_NAME2); } goto done; @@ -27082,9 +26950,9 @@ link_visit_mixed_links_cycles_cb(hid_t group_id, const char *name, const H5L_inf (counter_val == 4 || counter_val == 8 || counter_val == 16 || counter_val == 20)) { if (H5L_TYPE_EXTERNAL != info->type) { ret_val = -1; - HDprintf(" link type for link '%s' was not H5L_TYPE_EXTERNAL!\n", - LINK_VISIT_MIXED_LINKS_CYCLE_TEST_SUBGROUP_NAME3 - "/" LINK_VISIT_MIXED_LINKS_CYCLE_TEST_LINK_NAME3); + printf(" link type for link '%s' was not H5L_TYPE_EXTERNAL!\n", + LINK_VISIT_MIXED_LINKS_CYCLE_TEST_SUBGROUP_NAME3 + "/" LINK_VISIT_MIXED_LINKS_CYCLE_TEST_LINK_NAME3); } goto done; @@ -27098,9 +26966,9 @@ link_visit_mixed_links_cycles_cb(hid_t group_id, const char *name, const H5L_inf (counter_val == 5 || counter_val == 7 || counter_val == 17 || counter_val == 19)) { if (H5L_TYPE_HARD != info->type) { ret_val = -1; - HDprintf(" link type for link '%s' was not H5L_TYPE_HARD!\n", - LINK_VISIT_MIXED_LINKS_CYCLE_TEST_SUBGROUP_NAME3 - "/" LINK_VISIT_MIXED_LINKS_CYCLE_TEST_LINK_NAME4); + printf(" link type for link '%s' was not H5L_TYPE_HARD!\n", + LINK_VISIT_MIXED_LINKS_CYCLE_TEST_SUBGROUP_NAME3 + "/" LINK_VISIT_MIXED_LINKS_CYCLE_TEST_LINK_NAME4); } goto done; @@ -27110,8 +26978,8 @@ link_visit_mixed_links_cycles_cb(hid_t group_id, const char *name, const H5L_inf (counter_val == 0 || counter_val == 9 || counter_val == 12 || counter_val == 21)) { if (H5L_TYPE_HARD != info->type) { ret_val = -1; - HDprintf(" link type for link '%s' was not H5L_TYPE_HARD!\n", - LINK_VISIT_MIXED_LINKS_CYCLE_TEST_SUBGROUP_NAME2); + printf(" link type for link '%s' was not H5L_TYPE_HARD!\n", + LINK_VISIT_MIXED_LINKS_CYCLE_TEST_SUBGROUP_NAME2); } goto done; @@ -27121,14 +26989,14 @@ link_visit_mixed_links_cycles_cb(hid_t group_id, const char *name, const H5L_inf (counter_val == 3 || counter_val == 6 || counter_val == 15 || counter_val == 18)) { if (H5L_TYPE_HARD != info->type) { ret_val = -1; - HDprintf(" link type for link '%s' was not H5L_TYPE_HARD!\n", - LINK_VISIT_MIXED_LINKS_CYCLE_TEST_SUBGROUP_NAME3); + printf(" link type for link '%s' was not H5L_TYPE_HARD!\n", + LINK_VISIT_MIXED_LINKS_CYCLE_TEST_SUBGROUP_NAME3); } goto done; } - HDprintf(" link name '%s' didn't match known names or came in an incorrect order\n", name); + printf(" link name '%s' didn't match known names or came in an incorrect order\n", name); ret_val = -1; @@ -27184,19 +27052,19 @@ H5_api_link_test(void) size_t i; int nerrors; - HDprintf("**********************************************\n"); - HDprintf("* *\n"); - HDprintf("* API Link Tests *\n"); - HDprintf("* *\n"); - HDprintf("**********************************************\n\n"); + printf("**********************************************\n"); + printf("* *\n"); + printf("* API Link Tests *\n"); + printf("* *\n"); + printf("**********************************************\n\n"); for (i = 0, nerrors = 0; i < ARRAY_LENGTH(link_tests); i++) { nerrors += (*link_tests[i])() ? 1 : 0; } - HDprintf("\n"); + printf("\n"); - HDprintf("Cleaning up testing files\n"); + printf("Cleaning up testing files\n"); cleanup_files(); return nerrors; diff --git a/test/API/H5_api_misc_test.c b/test/API/H5_api_misc_test.c index 256550b..37b98ab 100644 --- a/test/API/H5_api_misc_test.c +++ b/test/API/H5_api_misc_test.c @@ -44,20 +44,19 @@ test_open_link_without_leading_slash(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC)) { SKIPPED(); - HDprintf( - " API functions for basic file, group, or dataset aren't supported with this connector\n"); + printf(" API functions for basic file, group, or dataset aren't supported with this connector\n"); return 0; } if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file\n"); + printf(" couldn't open file\n"); goto error; } if ((container_group = H5Gopen2(file_id, MISCELLANEOUS_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group\n"); + printf(" couldn't open container group\n"); goto error; } @@ -71,7 +70,7 @@ test_open_link_without_leading_slash(void) if ((dset_id = H5Dcreate2(container_group, OPEN_LINK_WITHOUT_SLASH_DSET_NAME, dset_dtype, space_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create dataset\n"); + printf(" couldn't create dataset\n"); goto error; } @@ -86,20 +85,20 @@ test_open_link_without_leading_slash(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file\n"); + printf(" couldn't open file\n"); goto error; } if ((group_id = H5Gopen2(file_id, "/", H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open root group\n"); + printf(" couldn't open root group\n"); goto error; } if ((dset_id = H5Dopen2(group_id, MISCELLANEOUS_TEST_GROUP_NAME "/" OPEN_LINK_WITHOUT_SLASH_DSET_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open dataset\n"); + printf(" couldn't open dataset\n"); goto error; } @@ -149,8 +148,8 @@ test_object_creation_by_absolute_path(void) !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_STORED_DATATYPES)) { SKIPPED(); - HDprintf(" API functions for basic file, group, dataset, link, or stored datatype aren't " - "supported with this connector\n"); + printf(" API functions for basic file, group, dataset, link, or stored datatype aren't " + "supported with this connector\n"); return 0; } @@ -158,13 +157,13 @@ test_object_creation_by_absolute_path(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file\n"); + printf(" couldn't open file\n"); goto error; } if ((container_group = H5Gopen2(file_id, MISCELLANEOUS_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group\n"); + printf(" couldn't open container group\n"); goto error; } @@ -172,7 +171,7 @@ test_object_creation_by_absolute_path(void) if ((group_id = H5Gcreate2(container_group, OBJECT_CREATE_BY_ABSOLUTE_PATH_TEST_CONTAINER_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container group\n"); + printf(" couldn't create container group\n"); goto error; } @@ -181,13 +180,13 @@ test_object_creation_by_absolute_path(void) "/" OBJECT_CREATE_BY_ABSOLUTE_PATH_TEST_CONTAINER_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if link exists\n"); + printf(" couldn't determine if link exists\n"); goto error; } if (!link_exists) { H5_FAILED(); - HDprintf(" container group didn't exist at the correct location\n"); + printf(" container group didn't exist at the correct location\n"); goto error; } @@ -206,7 +205,7 @@ test_object_creation_by_absolute_path(void) "/" OBJECT_CREATE_BY_ABSOLUTE_PATH_TEST_SUBGROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create subgroup by absolute pathname\n"); + printf(" couldn't create subgroup by absolute pathname\n"); PART_ERROR(H5Gcreate_using_absolute_path); } @@ -216,13 +215,13 @@ test_object_creation_by_absolute_path(void) "/" OBJECT_CREATE_BY_ABSOLUTE_PATH_TEST_SUBGROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if link exists\n"); + printf(" couldn't determine if link exists\n"); PART_ERROR(H5Gcreate_using_absolute_path); } if (!link_exists) { H5_FAILED(); - HDprintf(" subgroup didn't exist at the correct location\n"); + printf(" subgroup didn't exist at the correct location\n"); PART_ERROR(H5Gcreate_using_absolute_path); } @@ -238,13 +237,13 @@ test_object_creation_by_absolute_path(void) if ((fspace_id = generate_random_dataspace(OBJECT_CREATE_BY_ABSOLUTE_PATH_TEST_DSET_SPACE_RANK, NULL, NULL, FALSE)) < 0) { H5_FAILED(); - HDprintf(" failed to generate dataspace\n"); + printf(" failed to generate dataspace\n"); PART_ERROR(H5Dcreate_using_absolute_path); } if ((dset_dtype = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) { H5_FAILED(); - HDprintf(" failed to generate datatype\n"); + printf(" failed to generate datatype\n"); PART_ERROR(H5Dcreate_using_absolute_path); } @@ -255,7 +254,7 @@ test_object_creation_by_absolute_path(void) "/" OBJECT_CREATE_BY_ABSOLUTE_PATH_TEST_DSET_NAME, dset_dtype, fspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create dataset\n"); + printf(" couldn't create dataset\n"); PART_ERROR(H5Dcreate_using_absolute_path); } @@ -266,13 +265,13 @@ test_object_creation_by_absolute_path(void) "/" OBJECT_CREATE_BY_ABSOLUTE_PATH_TEST_DSET_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if link exists\n"); + printf(" couldn't determine if link exists\n"); PART_ERROR(H5Dcreate_using_absolute_path); } if (!link_exists) { H5_FAILED(); - HDprintf(" dataset didn't exist at the correct location\n"); + printf(" dataset didn't exist at the correct location\n"); PART_ERROR(H5Dcreate_using_absolute_path); } @@ -287,7 +286,7 @@ test_object_creation_by_absolute_path(void) /* 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) { H5_FAILED(); - HDprintf(" couldn't create datatype\n"); + printf(" couldn't create datatype\n"); PART_ERROR(H5Tcommit_using_absolute_path); } @@ -298,7 +297,7 @@ test_object_creation_by_absolute_path(void) "/" OBJECT_CREATE_BY_ABSOLUTE_PATH_TEST_DTYPE_NAME, dtype_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't commit datatype\n"); + printf(" couldn't commit datatype\n"); PART_ERROR(H5Tcommit_using_absolute_path); } @@ -309,13 +308,13 @@ test_object_creation_by_absolute_path(void) "/" OBJECT_CREATE_BY_ABSOLUTE_PATH_TEST_DTYPE_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if link exists\n"); + printf(" couldn't determine if link exists\n"); PART_ERROR(H5Tcommit_using_absolute_path); } if (!link_exists) { H5_FAILED(); - HDprintf(" datatype didn't exist at the correct location\n"); + printf(" datatype didn't exist at the correct location\n"); PART_ERROR(H5Tcommit_using_absolute_path); } @@ -384,8 +383,8 @@ test_absolute_vs_relative_path(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC)) { SKIPPED(); - HDprintf(" API functions for basic file, group, dataset, or link aren't supported with this " - "connector\n"); + printf(" API functions for basic file, group, dataset, or link aren't supported with this " + "connector\n"); return 0; } @@ -393,13 +392,13 @@ test_absolute_vs_relative_path(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file\n"); + printf(" couldn't open file\n"); goto error; } if ((container_group = H5Gopen2(file_id, MISCELLANEOUS_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group\n"); + printf(" couldn't open container group\n"); goto error; } @@ -407,7 +406,7 @@ test_absolute_vs_relative_path(void) if ((group_id = H5Gcreate2(container_group, ABSOLUTE_VS_RELATIVE_PATH_TEST_CONTAINER_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container group\n"); + printf(" couldn't create container group\n"); goto error; } @@ -443,7 +442,7 @@ test_absolute_vs_relative_path(void) "/" ABSOLUTE_VS_RELATIVE_PATH_TEST_DSET1_NAME, dset_dtype1, fspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create dataset by absolute path from root\n"); + printf(" couldn't create dataset by absolute path from root\n"); PART_ERROR(H5Dcreate_absolute_from_root); } @@ -453,13 +452,13 @@ test_absolute_vs_relative_path(void) "/" ABSOLUTE_VS_RELATIVE_PATH_TEST_DSET1_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if link exists\n"); + printf(" couldn't determine if link exists\n"); PART_ERROR(H5Dcreate_absolute_from_root); } if (!link_exists) { H5_FAILED(); - HDprintf(" didn't exist at the correct location\n"); + printf(" didn't exist at the correct location\n"); PART_ERROR(H5Dcreate_absolute_from_root); } @@ -479,7 +478,7 @@ test_absolute_vs_relative_path(void) "/" ABSOLUTE_VS_RELATIVE_PATH_TEST_DSET4_NAME, dset_dtype4, fspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create dataset by absolute path from container group\n"); + printf(" couldn't create dataset by absolute path from container group\n"); PART_ERROR(H5Dcreate_absolute_from_nonroot); } @@ -489,13 +488,13 @@ test_absolute_vs_relative_path(void) "/" ABSOLUTE_VS_RELATIVE_PATH_TEST_DSET4_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if link exists\n"); + printf(" couldn't determine if link exists\n"); PART_ERROR(H5Dcreate_absolute_from_nonroot); } if (!link_exists) { H5_FAILED(); - HDprintf(" didn't exist at the correct location\n"); + printf(" didn't exist at the correct location\n"); PART_ERROR(H5Dcreate_absolute_from_nonroot); } @@ -523,7 +522,7 @@ test_absolute_vs_relative_path(void) if ((dset_id5 = H5Dcreate2(group_id, ABSOLUTE_VS_RELATIVE_PATH_TEST_DSET5_NAME, dset_dtype5, fspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create dataset by relative path from container group\n"); + printf(" couldn't create dataset by relative path from container group\n"); PART_ERROR(H5Dcreate_relative_from_nonroot); } @@ -534,7 +533,7 @@ test_absolute_vs_relative_path(void) "/" ABSOLUTE_VS_RELATIVE_PATH_TEST_DSET2_NAME, dset_dtype2, fspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create dataset by relative path from container group\n"); + printf(" couldn't create dataset by relative path from container group\n"); PART_ERROR(H5Dcreate_relative_from_nonroot); } @@ -544,13 +543,13 @@ test_absolute_vs_relative_path(void) "/" ABSOLUTE_VS_RELATIVE_PATH_TEST_DSET2_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if link exists\n"); + printf(" couldn't determine if link exists\n"); PART_ERROR(H5Dcreate_relative_from_nonroot); } if (!link_exists) { H5_FAILED(); - HDprintf(" didn't exist at the correct location\n"); + printf(" didn't exist at the correct location\n"); PART_ERROR(H5Dcreate_relative_from_nonroot); } @@ -560,13 +559,13 @@ test_absolute_vs_relative_path(void) "/" ABSOLUTE_VS_RELATIVE_PATH_TEST_DSET5_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if link exists\n"); + printf(" couldn't determine if link exists\n"); PART_ERROR(H5Dcreate_relative_from_nonroot); } if (!link_exists) { H5_FAILED(); - HDprintf(" didn't exist at the correct location\n"); + printf(" didn't exist at the correct location\n"); PART_ERROR(H5Dcreate_relative_from_nonroot); } @@ -585,7 +584,7 @@ test_absolute_vs_relative_path(void) "/" ABSOLUTE_VS_RELATIVE_PATH_TEST_DSET3_NAME, dset_dtype3, fspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create dataset by relative path from root with leading '.'\n"); + printf(" couldn't create dataset by relative path from root with leading '.'\n"); PART_ERROR(H5Dcreate_relative_leading_dot_root); } @@ -595,13 +594,13 @@ test_absolute_vs_relative_path(void) "/" ABSOLUTE_VS_RELATIVE_PATH_TEST_DSET3_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if link exists\n"); + printf(" couldn't determine if link exists\n"); PART_ERROR(H5Dcreate_relative_leading_dot_root); } if (!link_exists) { H5_FAILED(); - HDprintf(" didn't exist at the correct location\n"); + printf(" didn't exist at the correct location\n"); PART_ERROR(H5Dcreate_relative_leading_dot_root); } @@ -617,7 +616,7 @@ test_absolute_vs_relative_path(void) if ((dset_id6 = H5Dcreate2(group_id, "./" ABSOLUTE_VS_RELATIVE_PATH_TEST_DSET6_NAME, dset_dtype6, fspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf( + printf( " couldn't create dataset by relative path from container group with leading '.'\n"); PART_ERROR(H5Dcreate_relative_leading_dot_nonroot); } @@ -628,13 +627,13 @@ test_absolute_vs_relative_path(void) "/" ABSOLUTE_VS_RELATIVE_PATH_TEST_DSET6_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if link exists\n"); + printf(" couldn't determine if link exists\n"); PART_ERROR(H5Dcreate_relative_leading_dot_nonroot); } if (!link_exists) { H5_FAILED(); - HDprintf(" didn't exist at the correct location\n"); + printf(" didn't exist at the correct location\n"); PART_ERROR(H5Dcreate_relative_leading_dot_nonroot); } @@ -729,8 +728,8 @@ test_dot_for_object_name(void) !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_STORED_DATATYPES)) { SKIPPED(); - HDprintf(" API functions for basic file, group, dataset, or stored datatype aren't supported with " - "this connector\n"); + printf(" API functions for basic file, group, dataset, or stored datatype aren't supported with " + "this connector\n"); return 0; } @@ -738,26 +737,26 @@ test_dot_for_object_name(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, MISCELLANEOUS_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", MISCELLANEOUS_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", MISCELLANEOUS_TEST_GROUP_NAME); goto error; } if ((subgroup_id = H5Gcreate2(container_group, DOT_AS_OBJECT_NAME_TEST_SUBGROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container subgroup '%s'\n", DOT_AS_OBJECT_NAME_TEST_SUBGROUP_NAME); + printf(" couldn't create container subgroup '%s'\n", DOT_AS_OBJECT_NAME_TEST_SUBGROUP_NAME); goto error; } if ((dspace_id = H5Screate(H5S_SCALAR)) < 0) { H5_FAILED(); - HDprintf(" couldn't create data space\n"); + printf(" couldn't create data space\n"); goto error; } @@ -778,7 +777,7 @@ test_dot_for_object_name(void) if (group_id >= 0) { H5_FAILED(); - HDprintf(" a group was created with '.' as the name!\n"); + printf(" a group was created with '.' as the name!\n"); PART_ERROR(H5Gcreate_dot_as_name); } @@ -800,7 +799,7 @@ test_dot_for_object_name(void) if (dset_id >= 0) { H5_FAILED(); - HDprintf(" a dataset was created with '.' as the name!\n"); + printf(" a dataset was created with '.' as the name!\n"); PART_ERROR(H5Dcreate_dot_as_name); } @@ -814,7 +813,7 @@ test_dot_for_object_name(void) if ((dtype_id = H5Tcopy(H5T_NATIVE_INT)) < 0) { H5_FAILED(); - HDprintf(" couldn't copy a native datatype\n"); + printf(" couldn't copy a native datatype\n"); PART_ERROR(H5Tcommit_dot_as_name); } @@ -827,13 +826,13 @@ test_dot_for_object_name(void) if (ret >= 0) { H5_FAILED(); - HDprintf(" a named datatype was committed with '.' as the name!\n"); + printf(" a named datatype was committed with '.' as the name!\n"); PART_ERROR(H5Tcommit_dot_as_name); } if (H5Tclose(dtype_id) < 0) { H5_FAILED(); - HDprintf(" failed to close datatype\n"); + printf(" failed to close datatype\n"); PART_ERROR(H5Tcommit_dot_as_name); } @@ -918,8 +917,7 @@ test_symbols_in_compound_field_name(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC)) { SKIPPED(); - HDprintf( - " API functions for basic file, group, or dataset aren't supported with this connector\n"); + printf(" API functions for basic file, group, or dataset aren't supported with this connector\n"); return 0; } @@ -928,20 +926,20 @@ test_symbols_in_compound_field_name(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file\n"); + printf(" couldn't open file\n"); goto error; } if ((container_group = H5Gopen2(file_id, MISCELLANEOUS_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group\n"); + printf(" couldn't open container group\n"); goto error; } if ((group_id = H5Gcreate2(container_group, COMPOUND_WITH_SYMBOLS_IN_MEMBER_NAMES_TEST_SUBGROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container sub-group\n"); + printf(" couldn't create container sub-group\n"); goto error; } @@ -962,14 +960,14 @@ test_symbols_in_compound_field_name(void) if ((compound_type = H5Tcreate(H5T_COMPOUND, total_type_size)) < 0) { H5_FAILED(); - HDprintf(" couldn't create compound datatype\n"); + printf(" couldn't create compound datatype\n"); goto error; } for (i = 0, next_offset = 0; i < COMPOUND_WITH_SYMBOLS_IN_MEMBER_NAMES_TEST_NUM_SUBTYPES; i++) { if (H5Tinsert(compound_type, member_names[i], next_offset, type_pool[i]) < 0) { H5_FAILED(); - HDprintf(" couldn't insert compound member %zu\n", i); + printf(" couldn't insert compound member %zu\n", i); goto error; } @@ -986,7 +984,7 @@ test_symbols_in_compound_field_name(void) if ((dset_id = H5Dcreate2(group_id, COMPOUND_WITH_SYMBOLS_IN_MEMBER_NAMES_TEST_DSET_NAME, compound_type, fspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create dataset\n"); + printf(" couldn't create dataset\n"); goto error; } @@ -996,7 +994,7 @@ test_symbols_in_compound_field_name(void) if ((dset_id = H5Dopen2(group_id, COMPOUND_WITH_SYMBOLS_IN_MEMBER_NAMES_TEST_DSET_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" failed to open dataset\n"); + printf(" failed to open dataset\n"); goto error; } @@ -1044,17 +1042,17 @@ H5_api_misc_test(void) size_t i; int nerrors; - HDprintf("**********************************************\n"); - HDprintf("* *\n"); - HDprintf("* API Miscellaneous Tests *\n"); - HDprintf("* *\n"); - HDprintf("**********************************************\n\n"); + printf("**********************************************\n"); + printf("* *\n"); + printf("* API Miscellaneous Tests *\n"); + printf("* *\n"); + printf("**********************************************\n\n"); for (i = 0, nerrors = 0; i < ARRAY_LENGTH(misc_tests); i++) { nerrors += (*misc_tests[i])() ? 1 : 0; } - HDprintf("\n"); + printf("\n"); return nerrors; } diff --git a/test/API/H5_api_object_test.c b/test/API/H5_api_object_test.c index 8055ad9..268e65c 100644 --- a/test/API/H5_api_object_test.c +++ b/test/API/H5_api_object_test.c @@ -126,27 +126,27 @@ test_open_object(void) !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_OBJECT_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_STORED_DATATYPES)) { SKIPPED(); - HDprintf(" API functions for basic file, group, object, dataset, or stored datatype aren't " - "supported with this connector\n"); + printf(" API functions for basic file, group, object, dataset, or stored datatype aren't " + "supported with this connector\n"); return 0; } if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, OBJECT_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", OBJECT_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", OBJECT_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, OBJECT_OPEN_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container sub-group '%s'\n", OBJECT_OPEN_TEST_GROUP_NAME); + printf(" couldn't create container sub-group '%s'\n", OBJECT_OPEN_TEST_GROUP_NAME); goto error; } @@ -167,7 +167,7 @@ test_open_object(void) if ((group_id2 = H5Gcreate2(group_id, OBJECT_OPEN_TEST_GRP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create group '%s'\n", OBJECT_OPEN_TEST_GRP_NAME); + printf(" couldn't create group '%s'\n", OBJECT_OPEN_TEST_GRP_NAME); PART_ERROR(H5Oopen_group); } @@ -179,19 +179,19 @@ test_open_object(void) if ((group_id2 = H5Oopen(group_id, OBJECT_OPEN_TEST_GRP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open group '%s' with H5Oopen\n", OBJECT_OPEN_TEST_GRP_NAME); + printf(" couldn't open group '%s' with H5Oopen\n", OBJECT_OPEN_TEST_GRP_NAME); PART_ERROR(H5Oopen_group); } if (H5Iget_type(group_id2) != H5I_GROUP) { H5_FAILED(); - HDprintf(" ID is not a group\n"); + printf(" ID is not a group\n"); PART_ERROR(H5Oopen_group); } if (H5Gclose(group_id2) < 0) { H5_FAILED(); - HDprintf(" couldn't close group opened with H5Oopen\n"); + printf(" couldn't close group opened with H5Oopen\n"); PART_ERROR(H5Oopen_group); } @@ -206,7 +206,7 @@ test_open_object(void) if ((dset_id = H5Dcreate2(group_id, OBJECT_OPEN_TEST_DSET_NAME, dset_dtype, fspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create dataset '%s'\n", OBJECT_OPEN_TEST_DSET_NAME); + printf(" couldn't create dataset '%s'\n", OBJECT_OPEN_TEST_DSET_NAME); PART_ERROR(H5Oopen_dset); } @@ -218,19 +218,19 @@ test_open_object(void) if ((dset_id = H5Oopen(group_id, OBJECT_OPEN_TEST_DSET_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open dataset '%s' with H5Oopen\n", OBJECT_OPEN_TEST_DSET_NAME); + printf(" couldn't open dataset '%s' with H5Oopen\n", OBJECT_OPEN_TEST_DSET_NAME); PART_ERROR(H5Oopen_dset); } if (H5Iget_type(dset_id) != H5I_DATASET) { H5_FAILED(); - HDprintf(" ID is not a dataset\n"); + printf(" ID is not a dataset\n"); PART_ERROR(H5Oopen_dset); } if (H5Dclose(dset_id) < 0) { H5_FAILED(); - HDprintf(" couldn't close dataset opened with H5Oopen\n"); + printf(" couldn't close dataset opened with H5Oopen\n"); PART_ERROR(H5Oopen_dset); } @@ -244,14 +244,14 @@ test_open_object(void) if ((type_id = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) { H5_FAILED(); - HDprintf(" couldn't create datatype '%s'\n", OBJECT_OPEN_TEST_TYPE_NAME); + printf(" couldn't create datatype '%s'\n", OBJECT_OPEN_TEST_TYPE_NAME); PART_ERROR(H5Oopen_dtype); } if (H5Tcommit2(group_id, OBJECT_OPEN_TEST_TYPE_NAME, type_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't commit datatype '%s'\n", OBJECT_OPEN_TEST_TYPE_NAME); + printf(" couldn't commit datatype '%s'\n", OBJECT_OPEN_TEST_TYPE_NAME); PART_ERROR(H5Oopen_dtype); } @@ -263,19 +263,19 @@ test_open_object(void) if ((type_id = H5Oopen(group_id, OBJECT_OPEN_TEST_TYPE_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open datatype '%s' with H5Oopen\n", OBJECT_OPEN_TEST_TYPE_NAME); + printf(" couldn't open datatype '%s' with H5Oopen\n", OBJECT_OPEN_TEST_TYPE_NAME); PART_ERROR(H5Oopen_dtype); } if (H5Iget_type(type_id) != H5I_DATATYPE) { H5_FAILED(); - HDprintf(" ID is not a dataset\n"); + printf(" ID is not a dataset\n"); PART_ERROR(H5Oopen_dtype); } if (H5Tclose(type_id) < 0) { H5_FAILED(); - HDprintf(" couldn't close committed datatype opened with H5Oopen\n"); + printf(" couldn't close committed datatype opened with H5Oopen\n"); PART_ERROR(H5Oopen_dtype); } @@ -315,7 +315,7 @@ test_open_object(void) if ((group_id2 = H5Oopen_by_idx(container_group, OBJECT_OPEN_TEST_GROUP_NAME, H5_INDEX_NAME, H5_ITER_INC, 1, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open group '%s' with H5Oopen_by_idx\n", OBJECT_OPEN_TEST_GRP_NAME); + printf(" couldn't open group '%s' with H5Oopen_by_idx\n", OBJECT_OPEN_TEST_GRP_NAME); PART_ERROR(H5Oopen_by_idx_group); } @@ -330,7 +330,7 @@ test_open_object(void) if ((dset_id = H5Oopen_by_idx(container_group, OBJECT_OPEN_TEST_GROUP_NAME, H5_INDEX_NAME, H5_ITER_INC, 0, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open dataset '%s' with H5Oopen_by_idx\n", OBJECT_OPEN_TEST_DSET_NAME); + printf(" couldn't open dataset '%s' with H5Oopen_by_idx\n", OBJECT_OPEN_TEST_DSET_NAME); PART_ERROR(H5Oopen_by_idx_dset); } @@ -345,8 +345,8 @@ test_open_object(void) if ((type_id = H5Oopen_by_idx(container_group, OBJECT_OPEN_TEST_GROUP_NAME, H5_INDEX_NAME, H5_ITER_INC, 2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open committed datatype '%s' with H5Oopen_by_idx\n", - OBJECT_OPEN_TEST_TYPE_NAME); + printf(" couldn't open committed datatype '%s' with H5Oopen_by_idx\n", + OBJECT_OPEN_TEST_TYPE_NAME); PART_ERROR(H5Oopen_by_idx_dtype); } @@ -434,8 +434,8 @@ test_open_object_invalid_params(void) if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_OBJECT_BASIC)) { SKIPPED(); - HDprintf(" API functions for basic file, group, or object aren't supported with " - "this connector\n"); + printf(" API functions for basic file, group, or object aren't supported with " + "this connector\n"); return 0; } @@ -443,26 +443,26 @@ test_open_object_invalid_params(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, OBJECT_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", OBJECT_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", OBJECT_TEST_GROUP_NAME); goto error; } if ((gcpl_id = H5Pcreate(H5P_GROUP_CREATE)) < 0) { H5_FAILED(); - HDprintf(" couldn't create a GCPL\n"); + printf(" couldn't create a GCPL\n"); goto error; } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (H5Pset_link_creation_order(gcpl_id, H5P_CRT_ORDER_TRACKED | H5P_CRT_ORDER_INDEXED) < 0) { H5_FAILED(); - HDprintf(" couldn't enable link creation order tracking and indexing on GCPL\n"); + printf(" couldn't enable link creation order tracking and indexing on GCPL\n"); goto error; } } @@ -470,15 +470,14 @@ test_open_object_invalid_params(void) if ((group_id = H5Gcreate2(container_group, OBJECT_OPEN_INVALID_PARAMS_TEST_GROUP_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container sub-group '%s'\n", - OBJECT_OPEN_INVALID_PARAMS_TEST_GROUP_NAME); + printf(" couldn't create container sub-group '%s'\n", OBJECT_OPEN_INVALID_PARAMS_TEST_GROUP_NAME); goto error; } if ((group_id2 = H5Gcreate2(group_id, OBJECT_OPEN_INVALID_PARAMS_TEST_GRP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create group '%s'\n", OBJECT_OPEN_INVALID_PARAMS_TEST_GRP_NAME); + printf(" couldn't create group '%s'\n", OBJECT_OPEN_INVALID_PARAMS_TEST_GRP_NAME); goto error; } @@ -501,7 +500,7 @@ test_open_object_invalid_params(void) if (group_id2 >= 0) { H5_FAILED(); - HDprintf(" H5Oopen succeeded with an invalid location ID!\n"); + printf(" H5Oopen succeeded with an invalid location ID!\n"); H5Gclose(group_id2); PART_ERROR(H5Oopen_invalid_loc_id); } @@ -522,7 +521,7 @@ test_open_object_invalid_params(void) if (group_id2 >= 0) { H5_FAILED(); - HDprintf(" H5Oopen succeeded with a NULL object name!\n"); + printf(" H5Oopen succeeded with a NULL object name!\n"); H5Gclose(group_id2); PART_ERROR(H5Oopen_invalid_obj_name); } @@ -535,7 +534,7 @@ test_open_object_invalid_params(void) if (group_id2 >= 0) { H5_FAILED(); - HDprintf(" H5Oopen succeeded with an invalid object name of ''!\n"); + printf(" H5Oopen succeeded with an invalid object name of ''!\n"); H5Gclose(group_id2); PART_ERROR(H5Oopen_invalid_obj_name); } @@ -556,7 +555,7 @@ test_open_object_invalid_params(void) if (group_id2 >= 0) { H5_FAILED(); - HDprintf(" H5Oopen succeeded with an invalid LAPL!\n"); + printf(" H5Oopen succeeded with an invalid LAPL!\n"); H5Gclose(group_id2); PART_ERROR(H5Oopen_invalid_lapl); } @@ -578,7 +577,7 @@ test_open_object_invalid_params(void) if (group_id2 >= 0) { H5_FAILED(); - HDprintf(" H5Oopen_by_idx succeeded with an invalid location ID!\n"); + printf(" H5Oopen_by_idx succeeded with an invalid location ID!\n"); H5Gclose(group_id2); PART_ERROR(H5Oopen_by_idx_invalid_loc_id); } @@ -599,7 +598,7 @@ test_open_object_invalid_params(void) if (group_id2 >= 0) { H5_FAILED(); - HDprintf(" H5Oopen_by_idx succeeded with a NULL group name!\n"); + printf(" H5Oopen_by_idx succeeded with a NULL group name!\n"); H5Gclose(group_id2); PART_ERROR(H5Oopen_by_idx_invalid_grp_name); } @@ -612,7 +611,7 @@ test_open_object_invalid_params(void) if (group_id2 >= 0) { H5_FAILED(); - HDprintf(" H5Oopen_by_idx succeeded with an invalid group name of ''!\n"); + printf(" H5Oopen_by_idx succeeded with an invalid group name of ''!\n"); H5Gclose(group_id2); PART_ERROR(H5Oopen_by_idx_invalid_grp_name); } @@ -634,7 +633,7 @@ test_open_object_invalid_params(void) if (group_id2 >= 0) { H5_FAILED(); - HDprintf(" H5Oopen_by_idx succeeded with invalid index type H5_INDEX_UNKNOWN!\n"); + printf(" H5Oopen_by_idx succeeded with invalid index type H5_INDEX_UNKNOWN!\n"); H5Gclose(group_id2); PART_ERROR(H5Oopen_by_idx_invalid_index_type); } @@ -648,7 +647,7 @@ test_open_object_invalid_params(void) if (group_id2 >= 0) { H5_FAILED(); - HDprintf(" H5Oopen_by_idx succeeded with invalid index type H5_INDEX_N!\n"); + printf(" H5Oopen_by_idx succeeded with invalid index type H5_INDEX_N!\n"); H5Gclose(group_id2); PART_ERROR(H5Oopen_by_idx_invalid_index_type); } @@ -670,8 +669,7 @@ test_open_object_invalid_params(void) if (group_id2 >= 0) { H5_FAILED(); - HDprintf( - " H5Oopen_by_idx succeeded with an invalid iteration ordering H5_ITER_UNKNOWN!\n"); + printf(" H5Oopen_by_idx succeeded with an invalid iteration ordering H5_ITER_UNKNOWN!\n"); H5Gclose(group_id2); PART_ERROR(H5Oopen_by_idx_invalid_iter_order); } @@ -685,7 +683,7 @@ test_open_object_invalid_params(void) if (group_id2 >= 0) { H5_FAILED(); - HDprintf(" H5Oopen_by_idx succeeded with an invalid iteration ordering H5_ITER_N!\n"); + printf(" H5Oopen_by_idx succeeded with an invalid iteration ordering H5_ITER_N!\n"); H5Gclose(group_id2); PART_ERROR(H5Oopen_by_idx_invalid_iter_order); } @@ -707,7 +705,7 @@ test_open_object_invalid_params(void) if (group_id2 >= 0) { H5_FAILED(); - HDprintf(" H5Oopen_by_idx succeeded with an invalid LAPL!\n"); + printf(" H5Oopen_by_idx succeeded with an invalid LAPL!\n"); H5Gclose(group_id2); PART_ERROR(H5Oopen_by_idx_invalid_lapl); } @@ -728,7 +726,7 @@ test_open_object_invalid_params(void) if (group_id2 >= 0) { H5_FAILED(); - HDprintf(" H5Oopen_by_token succeeded with an invalid location ID!\n"); + printf(" H5Oopen_by_token succeeded with an invalid location ID!\n"); H5Gclose(group_id2); PART_ERROR(H5Oopen_by_token_invalid_loc_id); } @@ -749,7 +747,7 @@ test_open_object_invalid_params(void) if (group_id2 >= 0) { H5_FAILED(); - HDprintf(" H5Oopen_by_token succeeded with an invalid token!\n"); + printf(" H5Oopen_by_token succeeded with an invalid token!\n"); H5Gclose(group_id2); PART_ERROR(H5Oopen_by_token_invalid_token); } @@ -812,8 +810,8 @@ test_object_exists(void) !(vol_cap_flags_g & H5VL_CAP_FLAG_STORED_DATATYPES) || !(vol_cap_flags_g & H5VL_CAP_FLAG_SOFT_LINKS)) { SKIPPED(); - HDprintf(" API functions for basic file, group, object, dataset, stored datatype or soft link " - "aren't supported with this connector\n"); + printf(" API functions for basic file, group, object, dataset, stored datatype or soft link " + "aren't supported with this connector\n"); return 0; } @@ -821,20 +819,20 @@ test_object_exists(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, OBJECT_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", OBJECT_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", OBJECT_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, OBJECT_EXISTS_TEST_SUBGROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container subgroup '%s'\n", OBJECT_EXISTS_TEST_SUBGROUP_NAME); + printf(" couldn't create container subgroup '%s'\n", OBJECT_EXISTS_TEST_SUBGROUP_NAME); goto error; } @@ -859,25 +857,25 @@ test_object_exists(void) if ((group_id2 = H5Gcreate2(group_id, OBJECT_EXISTS_TEST_GRP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create group '%s'\n", OBJECT_EXISTS_TEST_GRP_NAME); + printf(" couldn't create group '%s'\n", OBJECT_EXISTS_TEST_GRP_NAME); PART_ERROR(H5Oexists_by_name_group); } if ((object_exists = H5Oexists_by_name(group_id, OBJECT_EXISTS_TEST_GRP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if object '%s' exists\n", OBJECT_EXISTS_TEST_GRP_NAME); + printf(" couldn't determine if object '%s' exists\n", OBJECT_EXISTS_TEST_GRP_NAME); PART_ERROR(H5Oexists_by_name_group); } if (!object_exists) { H5_FAILED(); - HDprintf(" object '%s' didn't exist!\n", OBJECT_EXISTS_TEST_GRP_NAME); + printf(" object '%s' didn't exist!\n", OBJECT_EXISTS_TEST_GRP_NAME); PART_ERROR(H5Oexists_by_name_group); } if (H5Gclose(group_id2) < 0) { H5_FAILED(); - HDprintf(" couldn't close group\n"); + printf(" couldn't close group\n"); PART_ERROR(H5Oexists_by_name_group); } @@ -892,26 +890,26 @@ test_object_exists(void) if ((dset_id = H5Dcreate2(group_id, OBJECT_EXISTS_TEST_DSET_NAME, dset_dtype, fspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create dataset '%s'\n", OBJECT_EXISTS_TEST_DSET_NAME); + printf(" couldn't create dataset '%s'\n", OBJECT_EXISTS_TEST_DSET_NAME); PART_ERROR(H5Oexists_by_name_dset); } if ((object_exists = H5Oexists_by_name(group_id, OBJECT_EXISTS_TEST_DSET_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if object '%s' exists\n", OBJECT_EXISTS_TEST_DSET_NAME); + printf(" couldn't determine if object '%s' exists\n", OBJECT_EXISTS_TEST_DSET_NAME); PART_ERROR(H5Oexists_by_name_dset); } if (!object_exists) { H5_FAILED(); - HDprintf(" object '%s' didn't exist!\n", OBJECT_EXISTS_TEST_DSET_NAME); + printf(" object '%s' didn't exist!\n", OBJECT_EXISTS_TEST_DSET_NAME); PART_ERROR(H5Oexists_by_name_dset); } if (H5Dclose(dset_id) < 0) { H5_FAILED(); - HDprintf(" couldn't close dataset\n"); + printf(" couldn't close dataset\n"); PART_ERROR(H5Oexists_by_name_dset); } @@ -925,33 +923,33 @@ test_object_exists(void) if ((dtype_id = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) { H5_FAILED(); - HDprintf(" couldn't create datatype '%s'\n", OBJECT_EXISTS_TEST_TYPE_NAME); + printf(" couldn't create datatype '%s'\n", OBJECT_EXISTS_TEST_TYPE_NAME); PART_ERROR(H5Oexists_by_name_dtype); } if (H5Tcommit2(group_id, OBJECT_EXISTS_TEST_TYPE_NAME, dtype_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't commit datatype '%s'\n", OBJECT_EXISTS_TEST_TYPE_NAME); + printf(" couldn't commit datatype '%s'\n", OBJECT_EXISTS_TEST_TYPE_NAME); PART_ERROR(H5Oexists_by_name_dtype); } if ((object_exists = H5Oexists_by_name(group_id, OBJECT_EXISTS_TEST_TYPE_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if object '%s' exists\n", OBJECT_EXISTS_TEST_TYPE_NAME); + printf(" couldn't determine if object '%s' exists\n", OBJECT_EXISTS_TEST_TYPE_NAME); PART_ERROR(H5Oexists_by_name_dtype); } if (!object_exists) { H5_FAILED(); - HDprintf(" object '%s' didn't exist!\n", OBJECT_EXISTS_TEST_TYPE_NAME); + printf(" object '%s' didn't exist!\n", OBJECT_EXISTS_TEST_TYPE_NAME); PART_ERROR(H5Oexists_by_name_dtype); } if (H5Tclose(dtype_id) < 0) { H5_FAILED(); - HDprintf(" couldn't close datatype\n"); + printf(" couldn't close datatype\n"); PART_ERROR(H5Oexists_by_name_dtype); } @@ -966,20 +964,20 @@ test_object_exists(void) if (H5Lcreate_soft("/" OBJECT_TEST_GROUP_NAME "/" OBJECT_EXISTS_TEST_SUBGROUP_NAME, group_id, OBJECT_EXISTS_TEST_SOFT_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create soft link '%s'\n", OBJECT_EXISTS_TEST_SOFT_LINK_NAME); + printf(" couldn't create soft link '%s'\n", OBJECT_EXISTS_TEST_SOFT_LINK_NAME); PART_ERROR(H5Oexists_by_name_soft_link); } if ((object_exists = H5Oexists_by_name(group_id, OBJECT_EXISTS_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if object '%s' exists\n", OBJECT_EXISTS_TEST_SOFT_LINK_NAME); + printf(" couldn't determine if object '%s' exists\n", OBJECT_EXISTS_TEST_SOFT_LINK_NAME); PART_ERROR(H5Oexists_by_name_soft_link); } if (!object_exists) { H5_FAILED(); - HDprintf(" object '%s' didn't exist!\n", OBJECT_EXISTS_TEST_SOFT_LINK_NAME); + printf(" object '%s' didn't exist!\n", OBJECT_EXISTS_TEST_SOFT_LINK_NAME); PART_ERROR(H5Oexists_by_name_soft_link); } @@ -995,22 +993,22 @@ test_object_exists(void) "/" OBJECT_TEST_GROUP_NAME "/" OBJECT_EXISTS_TEST_SUBGROUP_NAME "/non_existent_object", group_id, OBJECT_EXISTS_TEST_DANGLING_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create soft link '%s'\n", OBJECT_EXISTS_TEST_DANGLING_LINK_NAME); + printf(" couldn't create soft link '%s'\n", OBJECT_EXISTS_TEST_DANGLING_LINK_NAME); PART_ERROR(H5Oexists_by_name_dangling_soft_link); } if ((object_exists = H5Oexists_by_name(group_id, OBJECT_EXISTS_TEST_DANGLING_LINK_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if object '%s' exists\n", - "/" OBJECT_TEST_GROUP_NAME "/" OBJECT_EXISTS_TEST_SUBGROUP_NAME - "/non_existent_object"); + printf(" couldn't determine if object '%s' exists\n", + "/" OBJECT_TEST_GROUP_NAME "/" OBJECT_EXISTS_TEST_SUBGROUP_NAME + "/non_existent_object"); PART_ERROR(H5Oexists_by_name_dangling_soft_link); } if (object_exists) { H5_FAILED(); - HDprintf(" object pointed to by dangling soft link should not have existed!\n"); + printf(" object pointed to by dangling soft link should not have existed!\n"); PART_ERROR(H5Oexists_by_name_dangling_soft_link); } @@ -1072,7 +1070,7 @@ test_object_exists_invalid_params(void) if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_OBJECT_BASIC)) { SKIPPED(); - HDprintf(" API functions for basic file, group, or object aren't supported with this connector\n"); + printf(" API functions for basic file, group, or object aren't supported with this connector\n"); return 0; } @@ -1080,28 +1078,28 @@ test_object_exists_invalid_params(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, OBJECT_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", OBJECT_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", OBJECT_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, OBJECT_EXISTS_INVALID_PARAMS_TEST_SUBGROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container subgroup '%s'\n", - OBJECT_EXISTS_INVALID_PARAMS_TEST_SUBGROUP_NAME); + printf(" couldn't create container subgroup '%s'\n", + OBJECT_EXISTS_INVALID_PARAMS_TEST_SUBGROUP_NAME); goto error; } if ((group_id2 = H5Gcreate2(group_id, OBJECT_EXISTS_INVALID_PARAMS_TEST_GRP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create group '%s'\n", OBJECT_EXISTS_INVALID_PARAMS_TEST_GRP_NAME); + printf(" couldn't create group '%s'\n", OBJECT_EXISTS_INVALID_PARAMS_TEST_GRP_NAME); goto error; } @@ -1125,7 +1123,7 @@ test_object_exists_invalid_params(void) if (object_exists >= 0) { H5_FAILED(); - HDprintf(" H5Oexists_by_name succeeded with an invalid location ID!\n"); + printf(" H5Oexists_by_name succeeded with an invalid location ID!\n"); PART_ERROR(H5Oexists_by_name_invalid_loc_id); } @@ -1145,7 +1143,7 @@ test_object_exists_invalid_params(void) if (object_exists >= 0) { H5_FAILED(); - HDprintf(" H5Oexists_by_name succeeded with a NULL object name!\n"); + printf(" H5Oexists_by_name succeeded with a NULL object name!\n"); PART_ERROR(H5Oexists_by_name_invalid_obj_name); } @@ -1157,7 +1155,7 @@ test_object_exists_invalid_params(void) if (object_exists >= 0) { H5_FAILED(); - HDprintf(" H5Oexists_by_name succeeded with an invalid object name of ''!\n"); + printf(" H5Oexists_by_name succeeded with an invalid object name of ''!\n"); PART_ERROR(H5Oexists_by_name_invalid_obj_name); } @@ -1178,7 +1176,7 @@ test_object_exists_invalid_params(void) if (object_exists >= 0) { H5_FAILED(); - HDprintf(" H5Oexists_by_name succeeded with an invalid LAPL!\n"); + printf(" H5Oexists_by_name succeeded with an invalid LAPL!\n"); PART_ERROR(H5Oexists_by_name_invalid_lapl); } @@ -1263,8 +1261,8 @@ test_link_object(void) !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_OBJECT_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_STORED_DATATYPES)) { SKIPPED(); - HDprintf(" API functions for basic file, group, object, dataset, or stored datatype aren't " - "supported with this connector\n"); + printf(" API functions for basic file, group, object, dataset, or stored datatype aren't " + "supported with this connector\n"); return 0; } @@ -1272,20 +1270,20 @@ test_link_object(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, OBJECT_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", OBJECT_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", OBJECT_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, OBJECT_LINK_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container sub-group '%s'\n", OBJECT_LINK_TEST_GROUP_NAME); + printf(" couldn't create container sub-group '%s'\n", OBJECT_LINK_TEST_GROUP_NAME); goto error; } @@ -1305,13 +1303,13 @@ test_link_object(void) if ((group_id2 = H5Gcreate_anon(group_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create an anonymous group\n"); + printf(" couldn't create an anonymous group\n"); PART_ERROR(H5Olink_group); } if (H5Olink(group_id2, group_id, OBJECT_LINK_TEST_GROUP_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't link the anonymous group\n"); + printf(" couldn't link the anonymous group\n"); PART_ERROR(H5Olink_group); } @@ -1325,13 +1323,13 @@ test_link_object(void) if ((dset_id = H5Dcreate_anon(group_id, dset_dtype, fspace_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create an anonymous dataset\n"); + printf(" couldn't create an anonymous dataset\n"); PART_ERROR(H5Olink_dataset); } if (H5Olink(dset_id, group_id, OBJECT_LINK_TEST_DSET_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't link the anonymous dataset\n"); + printf(" couldn't link the anonymous dataset\n"); PART_ERROR(H5Olink_dataset); } @@ -1345,13 +1343,13 @@ test_link_object(void) if (H5Tcommit_anon(group_id, dset_dtype, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create an anonymous datatype\n"); + printf(" couldn't create an anonymous datatype\n"); PART_ERROR(H5Olink_datatype); } if (H5Olink(dset_dtype, group_id, OBJECT_LINK_TEST_DTYPE_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't link the anonymous datatype\n"); + printf(" couldn't link the anonymous datatype\n"); PART_ERROR(H5Olink_datatype); } @@ -1418,7 +1416,7 @@ test_link_object_invalid_params(void) if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_OBJECT_BASIC)) { SKIPPED(); - HDprintf(" API functions for basic file, group, or object aren't supported with this connector\n"); + printf(" API functions for basic file, group, or object aren't supported with this connector\n"); return 0; } @@ -1426,26 +1424,26 @@ test_link_object_invalid_params(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, OBJECT_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", OBJECT_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", OBJECT_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, OBJECT_LINK_INVALID_PARAMS_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container sub-group '%s'\n", OBJECT_LINK_TEST_GROUP_NAME); + printf(" couldn't create container sub-group '%s'\n", OBJECT_LINK_TEST_GROUP_NAME); goto error; } if ((group_id2 = H5Gcreate_anon(group_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create an anonymous group\n"); + printf(" couldn't create an anonymous group\n"); goto error; } @@ -1466,7 +1464,7 @@ test_link_object_invalid_params(void) if (status >= 0) { H5_FAILED(); - HDprintf(" H5Olink succeeded with an invalid object ID!\n"); + printf(" H5Olink succeeded with an invalid object ID!\n"); PART_ERROR(H5Olink_invalid_object_id); } @@ -1487,7 +1485,7 @@ test_link_object_invalid_params(void) if (status >= 0) { H5_FAILED(); - HDprintf(" H5Olink succeeded with an invalid location ID!\n"); + printf(" H5Olink succeeded with an invalid location ID!\n"); PART_ERROR(H5Olink_invalid_location); } @@ -1507,7 +1505,7 @@ test_link_object_invalid_params(void) if (status >= 0) { H5_FAILED(); - HDprintf(" H5Olink succeeded with NULL as the object name!\n"); + printf(" H5Olink succeeded with NULL as the object name!\n"); PART_ERROR(H5Olink_invalid_name); } @@ -1519,7 +1517,7 @@ test_link_object_invalid_params(void) if (status >= 0) { H5_FAILED(); - HDprintf(" H5Olink succeeded with an invalid object name of ''!\n"); + printf(" H5Olink succeeded with an invalid object name of ''!\n"); PART_ERROR(H5Olink_invalid_name); } @@ -1540,7 +1538,7 @@ test_link_object_invalid_params(void) if (status >= 0) { H5_FAILED(); - HDprintf(" H5Olink succeeded with an invalid LCPL!\n"); + printf(" H5Olink succeeded with an invalid LCPL!\n"); PART_ERROR(H5Olink_invalid_lcpl); } @@ -1561,7 +1559,7 @@ test_link_object_invalid_params(void) if (status >= 0) { H5_FAILED(); - HDprintf(" H5Olink succeeded with an invalid LAPL!\n"); + printf(" H5Olink succeeded with an invalid LAPL!\n"); PART_ERROR(H5Olink_invalid_lapl); } @@ -1621,8 +1619,8 @@ test_incr_decr_object_refcount(void) !(vol_cap_flags_g & H5VL_CAP_FLAG_OBJECT_MORE) || !(vol_cap_flags_g & H5VL_CAP_FLAG_STORED_DATATYPES)) { SKIPPED(); - HDprintf(" API functions for basic file, group, dataset, stored datatype, or object " - "aren't supported with this connector\n"); + printf(" API functions for basic file, group, dataset, stored datatype, or object " + "aren't supported with this connector\n"); return 0; } @@ -1630,20 +1628,20 @@ test_incr_decr_object_refcount(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, OBJECT_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", OBJECT_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", OBJECT_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, OBJECT_REF_COUNT_TEST_SUBGROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container subgroup '%s'\n", OBJECT_REF_COUNT_TEST_SUBGROUP_NAME); + printf(" couldn't create container subgroup '%s'\n", OBJECT_REF_COUNT_TEST_SUBGROUP_NAME); goto error; } @@ -1664,15 +1662,15 @@ test_incr_decr_object_refcount(void) if ((group_id2 = H5Gcreate2(group_id, OBJECT_REF_COUNT_TEST_GRP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create group '%s'\n", OBJECT_REF_COUNT_TEST_GRP_NAME); + printf(" couldn't create group '%s'\n", OBJECT_REF_COUNT_TEST_GRP_NAME); PART_ERROR(H5Oincr_decr_refcount_group); } /* Increment the reference count */ if (H5Oincr_refcount(group_id2) < 0) { H5_FAILED(); - HDprintf(" couldn't increment reference count for the group '%s' \n", - OBJECT_REF_COUNT_TEST_GRP_NAME); + printf(" couldn't increment reference count for the group '%s' \n", + OBJECT_REF_COUNT_TEST_GRP_NAME); PART_ERROR(H5Oincr_decr_refcount_group); } @@ -1680,23 +1678,23 @@ test_incr_decr_object_refcount(void) if (H5Oget_info_by_name3(group_id, OBJECT_REF_COUNT_TEST_GRP_NAME, &oinfo, H5O_INFO_BASIC, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't get reference count for the group '%s' \n", - OBJECT_REF_COUNT_TEST_GRP_NAME); + printf(" couldn't get reference count for the group '%s' \n", + OBJECT_REF_COUNT_TEST_GRP_NAME); PART_ERROR(H5Oincr_decr_refcount_group); } if (oinfo.rc != 2) { H5_FAILED(); - HDprintf(" the reference count for the group '%s' isn't 2: %d\n", - OBJECT_REF_COUNT_TEST_GRP_NAME, oinfo.rc); + printf(" the reference count for the group '%s' isn't 2: %d\n", + OBJECT_REF_COUNT_TEST_GRP_NAME, oinfo.rc); PART_ERROR(H5Oincr_decr_refcount_group); } /* Decrement the reference count */ if (H5Odecr_refcount(group_id2) < 0) { H5_FAILED(); - HDprintf(" couldn't decrement reference count for the group '%s' \n", - OBJECT_REF_COUNT_TEST_GRP_NAME); + printf(" couldn't decrement reference count for the group '%s' \n", + OBJECT_REF_COUNT_TEST_GRP_NAME); PART_ERROR(H5Oincr_decr_refcount_group); } @@ -1704,21 +1702,21 @@ test_incr_decr_object_refcount(void) if (H5Oget_info_by_name3(group_id, OBJECT_REF_COUNT_TEST_GRP_NAME, &oinfo, H5O_INFO_BASIC, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't get reference count for the group '%s' \n", - OBJECT_REF_COUNT_TEST_GRP_NAME); + printf(" couldn't get reference count for the group '%s' \n", + OBJECT_REF_COUNT_TEST_GRP_NAME); PART_ERROR(H5Oincr_decr_refcount_group); } if (oinfo.rc != 1) { H5_FAILED(); - HDprintf(" the reference count for the group '%s' isn't 1: %d\n", - OBJECT_REF_COUNT_TEST_GRP_NAME, oinfo.rc); + printf(" the reference count for the group '%s' isn't 1: %d\n", + OBJECT_REF_COUNT_TEST_GRP_NAME, oinfo.rc); PART_ERROR(H5Oincr_decr_refcount_group); } if (H5Gclose(group_id2) < 0) { H5_FAILED(); - HDprintf(" couldn't close group\n"); + printf(" couldn't close group\n"); PART_ERROR(H5Oincr_decr_refcount_group); } @@ -1733,15 +1731,15 @@ test_incr_decr_object_refcount(void) if ((dset_id = H5Dcreate2(group_id, OBJECT_REF_COUNT_TEST_DSET_NAME, dset_dtype, fspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create dataset '%s'\n", OBJECT_REF_COUNT_TEST_DSET_NAME); + printf(" couldn't create dataset '%s'\n", OBJECT_REF_COUNT_TEST_DSET_NAME); PART_ERROR(H5Oincr_decr_refcount_dset); } /* Increment the reference count */ if (H5Oincr_refcount(dset_id) < 0) { H5_FAILED(); - HDprintf(" couldn't increment reference count for the dataset '%s' \n", - OBJECT_REF_COUNT_TEST_DSET_NAME); + printf(" couldn't increment reference count for the dataset '%s' \n", + OBJECT_REF_COUNT_TEST_DSET_NAME); PART_ERROR(H5Oincr_decr_refcount_dset); } @@ -1749,23 +1747,23 @@ test_incr_decr_object_refcount(void) if (H5Oget_info_by_name3(group_id, OBJECT_REF_COUNT_TEST_DSET_NAME, &oinfo, H5O_INFO_BASIC, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't get reference count for the dataset '%s' \n", - OBJECT_REF_COUNT_TEST_DSET_NAME); + printf(" couldn't get reference count for the dataset '%s' \n", + OBJECT_REF_COUNT_TEST_DSET_NAME); PART_ERROR(H5Oincr_decr_refcount_dset); } if (oinfo.rc != 2) { H5_FAILED(); - HDprintf(" the reference count for the dataset '%s' isn't 2: %d\n", - OBJECT_REF_COUNT_TEST_DSET_NAME, oinfo.rc); + printf(" the reference count for the dataset '%s' isn't 2: %d\n", + OBJECT_REF_COUNT_TEST_DSET_NAME, oinfo.rc); PART_ERROR(H5Oincr_decr_refcount_dset); } /* Decrement the reference count */ if (H5Odecr_refcount(dset_id) < 0) { H5_FAILED(); - HDprintf(" couldn't decrement reference count for the dataset '%s' \n", - OBJECT_REF_COUNT_TEST_DSET_NAME); + printf(" couldn't decrement reference count for the dataset '%s' \n", + OBJECT_REF_COUNT_TEST_DSET_NAME); PART_ERROR(H5Oincr_decr_refcount_dset); } @@ -1773,21 +1771,21 @@ test_incr_decr_object_refcount(void) if (H5Oget_info_by_name3(group_id, OBJECT_REF_COUNT_TEST_DSET_NAME, &oinfo, H5O_INFO_BASIC, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't get reference count for the dataset '%s' \n", - OBJECT_REF_COUNT_TEST_DSET_NAME); + printf(" couldn't get reference count for the dataset '%s' \n", + OBJECT_REF_COUNT_TEST_DSET_NAME); PART_ERROR(H5Oincr_decr_refcount_dset); } if (oinfo.rc != 1) { H5_FAILED(); - HDprintf(" the reference count for the dataset '%s' isn't 1: %d\n", - OBJECT_REF_COUNT_TEST_DSET_NAME, oinfo.rc); + printf(" the reference count for the dataset '%s' isn't 1: %d\n", + OBJECT_REF_COUNT_TEST_DSET_NAME, oinfo.rc); PART_ERROR(H5Oincr_decr_refcount_dset); } if (H5Dclose(dset_id) < 0) { H5_FAILED(); - HDprintf(" couldn't close dataset\n"); + printf(" couldn't close dataset\n"); PART_ERROR(H5Oincr_decr_refcount_dset); } @@ -1802,15 +1800,15 @@ test_incr_decr_object_refcount(void) if (H5Tcommit2(group_id, OBJECT_REF_COUNT_TEST_TYPE_NAME, dset_dtype, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't commit datatype '%s'\n", OBJECT_REF_COUNT_TEST_TYPE_NAME); + printf(" couldn't commit datatype '%s'\n", OBJECT_REF_COUNT_TEST_TYPE_NAME); PART_ERROR(H5Oincr_decr_refcount_dtype); } /* Increment the reference count */ if (H5Oincr_refcount(dset_dtype) < 0) { H5_FAILED(); - HDprintf(" couldn't increment reference count for the datatype '%s' \n", - OBJECT_REF_COUNT_TEST_TYPE_NAME); + printf(" couldn't increment reference count for the datatype '%s' \n", + OBJECT_REF_COUNT_TEST_TYPE_NAME); PART_ERROR(H5Oincr_decr_refcount_dtype); } @@ -1818,23 +1816,23 @@ test_incr_decr_object_refcount(void) if (H5Oget_info_by_name3(group_id, OBJECT_REF_COUNT_TEST_TYPE_NAME, &oinfo, H5O_INFO_BASIC, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't get reference count for the datatype '%s' \n", - OBJECT_REF_COUNT_TEST_TYPE_NAME); + printf(" couldn't get reference count for the datatype '%s' \n", + OBJECT_REF_COUNT_TEST_TYPE_NAME); PART_ERROR(H5Oincr_decr_refcount_dtype); } if (oinfo.rc != 2) { H5_FAILED(); - HDprintf(" the reference count for the datatype '%s' isn't 2: %d\n", - OBJECT_REF_COUNT_TEST_TYPE_NAME, oinfo.rc); + printf(" the reference count for the datatype '%s' isn't 2: %d\n", + OBJECT_REF_COUNT_TEST_TYPE_NAME, oinfo.rc); PART_ERROR(H5Oincr_decr_refcount_dtype); } /* Decrement the reference count */ if (H5Odecr_refcount(dset_dtype) < 0) { H5_FAILED(); - HDprintf(" couldn't decrement reference count for the datatype '%s' \n", - OBJECT_REF_COUNT_TEST_TYPE_NAME); + printf(" couldn't decrement reference count for the datatype '%s' \n", + OBJECT_REF_COUNT_TEST_TYPE_NAME); PART_ERROR(H5Oincr_decr_refcount_dtype); } @@ -1842,21 +1840,21 @@ test_incr_decr_object_refcount(void) if (H5Oget_info_by_name3(group_id, OBJECT_REF_COUNT_TEST_TYPE_NAME, &oinfo, H5O_INFO_BASIC, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't get reference count for the datatype '%s' \n", - OBJECT_REF_COUNT_TEST_TYPE_NAME); + printf(" couldn't get reference count for the datatype '%s' \n", + OBJECT_REF_COUNT_TEST_TYPE_NAME); PART_ERROR(H5Oincr_decr_refcount_dtype); } if (oinfo.rc != 1) { H5_FAILED(); - HDprintf(" the reference count for the datatype '%s' isn't 1: %d\n", - OBJECT_REF_COUNT_TEST_TYPE_NAME, oinfo.rc); + printf(" the reference count for the datatype '%s' isn't 1: %d\n", + OBJECT_REF_COUNT_TEST_TYPE_NAME, oinfo.rc); PART_ERROR(H5Oincr_decr_refcount_dtype); } if (H5Tclose(dset_dtype) < 0) { H5_FAILED(); - HDprintf(" couldn't close datatype\n"); + printf(" couldn't close datatype\n"); PART_ERROR(H5Oincr_decr_refcount_dtype); } @@ -1911,7 +1909,7 @@ test_incr_decr_object_refcount_invalid_params(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_OBJECT_MORE)) { SKIPPED(); - HDprintf(" API functions for more object aren't supported with this connector\n"); + printf(" API functions for more object aren't supported with this connector\n"); return 0; } @@ -1929,7 +1927,7 @@ test_incr_decr_object_refcount_invalid_params(void) if (status >= 0) { H5_FAILED(); - HDprintf(" incremented the reference count for an invalid object ID\n"); + printf(" incremented the reference count for an invalid object ID\n"); PART_ERROR(H5Oincr_refcount_invalid_param); } @@ -1949,7 +1947,7 @@ test_incr_decr_object_refcount_invalid_params(void) if (status >= 0) { H5_FAILED(); - HDprintf(" decremented the reference count for an invalid object ID\n"); + printf(" decremented the reference count for an invalid object ID\n"); PART_ERROR(H5Odecr_refcount_invalid_param); } @@ -1998,8 +1996,8 @@ test_object_copy_basic(void) !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ITERATE) || !(vol_cap_flags_g & H5VL_CAP_FLAG_STORED_DATATYPES)) { SKIPPED(); - HDprintf(" API functions for basic file, group, object, link, dataset, attribute, iterate, or " - "stored datatype aren't supported with this connector\n"); + printf(" API functions for basic file, group, object, link, dataset, attribute, iterate, or " + "stored datatype aren't supported with this connector\n"); return 0; } @@ -2007,20 +2005,20 @@ test_object_copy_basic(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, OBJECT_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", OBJECT_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", OBJECT_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, OBJECT_COPY_BASIC_TEST_SUBGROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container subgroup '%s'\n", OBJECT_COPY_BASIC_TEST_SUBGROUP_NAME); + printf(" couldn't create container subgroup '%s'\n", OBJECT_COPY_BASIC_TEST_SUBGROUP_NAME); goto error; } @@ -2036,7 +2034,7 @@ test_object_copy_basic(void) if ((group_id2 = H5Gcreate2(group_id, OBJECT_COPY_BASIC_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create group '%s'\n", OBJECT_COPY_BASIC_TEST_GROUP_NAME); + printf(" couldn't create group '%s'\n", OBJECT_COPY_BASIC_TEST_GROUP_NAME); goto error; } @@ -2047,8 +2045,8 @@ test_object_copy_basic(void) if ((tmp_group_id = H5Gcreate2(group_id2, grp_name, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create group '%s' under group '%s'\n", grp_name, - OBJECT_COPY_BASIC_TEST_GROUP_NAME); + printf(" couldn't create group '%s' under group '%s'\n", grp_name, + OBJECT_COPY_BASIC_TEST_GROUP_NAME); goto error; } @@ -2057,15 +2055,15 @@ test_object_copy_basic(void) if (H5Gclose(H5Gcreate2(tmp_group_id, OBJECT_COPY_BASIC_TEST_DEEP_NESTED_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create nested group '%s' under group '%s'\n", - OBJECT_COPY_BASIC_TEST_DEEP_NESTED_GROUP_NAME, grp_name); + printf(" couldn't create nested group '%s' under group '%s'\n", + OBJECT_COPY_BASIC_TEST_DEEP_NESTED_GROUP_NAME, grp_name); goto error; } } if (H5Gclose(tmp_group_id) < 0) { H5_FAILED(); - HDprintf(" couldn't close group '%s'\n", grp_name); + printf(" couldn't close group '%s'\n", grp_name); goto error; } } @@ -2078,14 +2076,14 @@ test_object_copy_basic(void) if ((tmp_attr_id = H5Acreate2(group_id2, attr_name, H5T_NATIVE_INT, attr_space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create attribute '%s' on group '%s'\n", attr_name, - OBJECT_COPY_BASIC_TEST_GROUP_NAME); + printf(" couldn't create attribute '%s' on group '%s'\n", attr_name, + OBJECT_COPY_BASIC_TEST_GROUP_NAME); goto error; } if (H5Aclose(tmp_attr_id) < 0) { H5_FAILED(); - HDprintf(" couldn't close attribute '%s'\n", attr_name); + printf(" couldn't close attribute '%s'\n", attr_name); goto error; } } @@ -2094,7 +2092,7 @@ test_object_copy_basic(void) if ((dset_id = H5Dcreate2(group_id, OBJECT_COPY_BASIC_TEST_DSET_NAME, dset_dtype, space_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create dataset '%s'\n", OBJECT_COPY_BASIC_TEST_DSET_NAME); + printf(" couldn't create dataset '%s'\n", OBJECT_COPY_BASIC_TEST_DSET_NAME); goto error; } @@ -2106,14 +2104,14 @@ test_object_copy_basic(void) if ((tmp_attr_id = H5Acreate2(dset_id, attr_name, H5T_NATIVE_INT, attr_space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create attribute '%s' on dataset '%s'\n", attr_name, - OBJECT_COPY_BASIC_TEST_DSET_NAME); + printf(" couldn't create attribute '%s' on dataset '%s'\n", attr_name, + OBJECT_COPY_BASIC_TEST_DSET_NAME); goto error; } if (H5Aclose(tmp_attr_id) < 0) { H5_FAILED(); - HDprintf(" couldn't close attribute '%s'\n", attr_name); + printf(" couldn't close attribute '%s'\n", attr_name); goto error; } } @@ -2121,14 +2119,14 @@ 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) { H5_FAILED(); - HDprintf(" couldn't create datatype\n"); + printf(" couldn't create datatype\n"); goto error; } if (H5Tcommit2(group_id, OBJECT_COPY_BASIC_TEST_DTYPE_NAME, dtype_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't commit datatype '%s'\n", OBJECT_COPY_BASIC_TEST_DTYPE_NAME); + printf(" couldn't commit datatype '%s'\n", OBJECT_COPY_BASIC_TEST_DTYPE_NAME); goto error; } @@ -2140,14 +2138,14 @@ test_object_copy_basic(void) if ((tmp_attr_id = H5Acreate2(dtype_id, attr_name, H5T_NATIVE_INT, attr_space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create attribute '%s' on committed datatype '%s'\n", attr_name, - OBJECT_COPY_BASIC_TEST_DTYPE_NAME); + printf(" couldn't create attribute '%s' on committed datatype '%s'\n", attr_name, + OBJECT_COPY_BASIC_TEST_DTYPE_NAME); goto error; } if (H5Aclose(tmp_attr_id) < 0) { H5_FAILED(); - HDprintf(" couldn't close attribute '%s'\n", attr_name); + printf(" couldn't close attribute '%s'\n", attr_name); goto error; } } @@ -2163,30 +2161,30 @@ test_object_copy_basic(void) if (H5Ocopy(group_id, OBJECT_COPY_BASIC_TEST_GROUP_NAME, group_id, OBJECT_COPY_BASIC_TEST_NEW_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to copy group '%s' to '%s'\n", OBJECT_COPY_BASIC_TEST_GROUP_NAME, - OBJECT_COPY_BASIC_TEST_NEW_GROUP_NAME); + printf(" failed to copy group '%s' to '%s'\n", OBJECT_COPY_BASIC_TEST_GROUP_NAME, + OBJECT_COPY_BASIC_TEST_NEW_GROUP_NAME); PART_ERROR(H5Ocopy_group); } if ((object_link_exists = H5Lexists(group_id, OBJECT_COPY_BASIC_TEST_NEW_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if link '%s' to copied group exists\n", - OBJECT_COPY_BASIC_TEST_NEW_GROUP_NAME); + printf(" couldn't determine if link '%s' to copied group exists\n", + OBJECT_COPY_BASIC_TEST_NEW_GROUP_NAME); PART_ERROR(H5Ocopy_group); } if (!object_link_exists) { H5_FAILED(); - HDprintf(" link '%s' to copied group didn't exist!\n", - OBJECT_COPY_BASIC_TEST_NEW_GROUP_NAME); + printf(" link '%s' to copied group didn't exist!\n", + OBJECT_COPY_BASIC_TEST_NEW_GROUP_NAME); PART_ERROR(H5Ocopy_group); } /* Ensure that the new group has all the members of the copied group, and all its attributes */ if ((tmp_group_id = H5Gopen2(group_id, OBJECT_COPY_BASIC_TEST_NEW_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" failed to open group copy '%s'\n", OBJECT_COPY_BASIC_TEST_NEW_GROUP_NAME); + printf(" failed to open group copy '%s'\n", OBJECT_COPY_BASIC_TEST_NEW_GROUP_NAME); PART_ERROR(H5Ocopy_group); } @@ -2200,14 +2198,14 @@ test_object_copy_basic(void) if (H5Gget_info(tmp_group_id, &group_info) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve group info\n"); + printf(" failed to retrieve group info\n"); PART_ERROR(H5Ocopy_group); } if (group_info.nlinks != OBJECT_COPY_BASIC_TEST_NUM_NESTED_OBJS) { H5_FAILED(); - HDprintf(" copied group contained %d members instead of %d members after a deep copy!\n", - (int)group_info.nlinks, OBJECT_COPY_BASIC_TEST_NUM_NESTED_OBJS); + printf(" copied group contained %d members instead of %d members after a deep copy!\n", + (int)group_info.nlinks, OBJECT_COPY_BASIC_TEST_NUM_NESTED_OBJS); PART_ERROR(H5Ocopy_group); } @@ -2221,13 +2219,13 @@ test_object_copy_basic(void) if (H5Oget_info3(tmp_group_id, &object_info, H5O_INFO_ALL) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve object info\n"); + printf(" failed to retrieve object info\n"); PART_ERROR(H5Ocopy_group); } if (object_info.num_attrs == 0) { H5_FAILED(); - HDprintf(" copied group didn't contain any attributes after copy operation!\n"); + printf(" copied group didn't contain any attributes after copy operation!\n"); PART_ERROR(H5Ocopy_group); } @@ -2236,13 +2234,13 @@ test_object_copy_basic(void) if (H5Aiterate2(tmp_group_id, H5_INDEX_NAME, H5_ITER_INC, NULL, object_copy_attribute_iter_callback, &i) < 0) { H5_FAILED(); - HDprintf(" failed to iterate over copied group's attributes\n"); + printf(" failed to iterate over copied group's attributes\n"); PART_ERROR(H5Ocopy_group); } if (i != OBJECT_COPY_BASIC_TEST_NUM_ATTRS) { H5_FAILED(); - HDprintf( + printf( " number of attributes on copied group (%llu) didn't match expected number (%llu)!\n", (unsigned long long)i, (unsigned long long)OBJECT_COPY_BASIC_TEST_NUM_ATTRS); PART_ERROR(H5Ocopy_group); @@ -2250,7 +2248,7 @@ test_object_copy_basic(void) if (H5Gclose(tmp_group_id) < 0) { H5_FAILED(); - HDprintf(" failed to close group copy\n"); + printf(" failed to close group copy\n"); PART_ERROR(H5Ocopy_group); } @@ -2267,8 +2265,7 @@ test_object_copy_basic(void) if ((tmp_group_id = H5Gopen2(group_id, grp_name, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" failed to open group '%s'\n", - OBJECT_COPY_BASIC_TEST_DEEP_NESTED_GROUP_NAME); + printf(" failed to open group '%s'\n", OBJECT_COPY_BASIC_TEST_DEEP_NESTED_GROUP_NAME); PART_ERROR(H5Ocopy_group); } @@ -2282,21 +2279,20 @@ test_object_copy_basic(void) if (H5Gget_info(tmp_group_id, &group_info) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve group info\n"); + printf(" failed to retrieve group info\n"); PART_ERROR(H5Ocopy_group); } if (group_info.nlinks != 1) { H5_FAILED(); - HDprintf(" copied group's immediate members didn't contain nested members after a " - "deep copy!\n"); + printf(" copied group's immediate members didn't contain nested members after a " + "deep copy!\n"); PART_ERROR(H5Ocopy_group); } if (H5Gclose(tmp_group_id) < 0) { H5_FAILED(); - HDprintf(" failed to close group '%s'\n", - OBJECT_COPY_BASIC_TEST_DEEP_NESTED_GROUP_NAME); + printf(" failed to close group '%s'\n", OBJECT_COPY_BASIC_TEST_DEEP_NESTED_GROUP_NAME); PART_ERROR(H5Ocopy_group); } } @@ -2321,30 +2317,30 @@ test_object_copy_basic(void) if (H5Ocopy(group_id, OBJECT_COPY_BASIC_TEST_DSET_NAME, group_id, OBJECT_COPY_BASIC_TEST_NEW_DSET_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to copy dataset '%s' to '%s'\n", OBJECT_COPY_BASIC_TEST_DSET_NAME, - OBJECT_COPY_BASIC_TEST_NEW_DSET_NAME); + printf(" failed to copy dataset '%s' to '%s'\n", OBJECT_COPY_BASIC_TEST_DSET_NAME, + OBJECT_COPY_BASIC_TEST_NEW_DSET_NAME); PART_ERROR(H5Ocopy_dset); } if ((object_link_exists = H5Lexists(group_id, OBJECT_COPY_BASIC_TEST_NEW_DSET_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if link '%s' to copied dataset exists\n", - OBJECT_COPY_BASIC_TEST_NEW_DSET_NAME); + printf(" couldn't determine if link '%s' to copied dataset exists\n", + OBJECT_COPY_BASIC_TEST_NEW_DSET_NAME); PART_ERROR(H5Ocopy_dset); } if (!object_link_exists) { H5_FAILED(); - HDprintf(" link '%s' to copied dataset didn't exist!\n", - OBJECT_COPY_BASIC_TEST_NEW_DSET_NAME); + printf(" link '%s' to copied dataset didn't exist!\n", + OBJECT_COPY_BASIC_TEST_NEW_DSET_NAME); PART_ERROR(H5Ocopy_dset); } /* Ensure that the new dataset has all of the attributes of the copied dataset */ if ((tmp_dset_id = H5Dopen2(group_id, OBJECT_COPY_BASIC_TEST_NEW_DSET_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" failed to open dataset copy '%s'\n", OBJECT_COPY_BASIC_TEST_NEW_DSET_NAME); + printf(" failed to open dataset copy '%s'\n", OBJECT_COPY_BASIC_TEST_NEW_DSET_NAME); PART_ERROR(H5Ocopy_dset); } @@ -2358,13 +2354,13 @@ test_object_copy_basic(void) if (H5Oget_info3(tmp_dset_id, &object_info, H5O_INFO_ALL) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve object info\n"); + printf(" failed to retrieve object info\n"); PART_ERROR(H5Ocopy_dset); } if (object_info.num_attrs == 0) { H5_FAILED(); - HDprintf(" copied dataset didn't contain any attributes after copy operation!\n"); + printf(" copied dataset didn't contain any attributes after copy operation!\n"); PART_ERROR(H5Ocopy_dset); } @@ -2373,21 +2369,21 @@ test_object_copy_basic(void) if (H5Aiterate2(tmp_dset_id, H5_INDEX_NAME, H5_ITER_INC, NULL, object_copy_attribute_iter_callback, &i) < 0) { H5_FAILED(); - HDprintf(" failed to iterate over copied dataset's attributes\n"); + printf(" failed to iterate over copied dataset's attributes\n"); PART_ERROR(H5Ocopy_dset); } if (i != OBJECT_COPY_BASIC_TEST_NUM_ATTRS) { H5_FAILED(); - HDprintf(" number of attributes on copied dataset (%llu) didn't match expected number " - "(%llu)!\n", - (unsigned long long)i, (unsigned long long)OBJECT_COPY_BASIC_TEST_NUM_ATTRS); + printf(" number of attributes on copied dataset (%llu) didn't match expected number " + "(%llu)!\n", + (unsigned long long)i, (unsigned long long)OBJECT_COPY_BASIC_TEST_NUM_ATTRS); PART_ERROR(H5Ocopy_dset); } if (H5Dclose(tmp_dset_id) < 0) { H5_FAILED(); - HDprintf(" failed to close dataset copy\n"); + printf(" failed to close dataset copy\n"); PART_ERROR(H5Ocopy_dset); } @@ -2411,30 +2407,30 @@ test_object_copy_basic(void) if (H5Ocopy(group_id, OBJECT_COPY_BASIC_TEST_DTYPE_NAME, group_id, OBJECT_COPY_BASIC_TEST_NEW_DTYPE_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to copy datatype '%s' to '%s'\n", OBJECT_COPY_BASIC_TEST_DTYPE_NAME, - OBJECT_COPY_BASIC_TEST_NEW_DTYPE_NAME); + printf(" failed to copy datatype '%s' to '%s'\n", OBJECT_COPY_BASIC_TEST_DTYPE_NAME, + OBJECT_COPY_BASIC_TEST_NEW_DTYPE_NAME); PART_ERROR(H5Ocopy_dtype); } if ((object_link_exists = H5Lexists(group_id, OBJECT_COPY_BASIC_TEST_NEW_DTYPE_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if link '%s' to copied datatype exists\n", - OBJECT_COPY_BASIC_TEST_NEW_DTYPE_NAME); + printf(" couldn't determine if link '%s' to copied datatype exists\n", + OBJECT_COPY_BASIC_TEST_NEW_DTYPE_NAME); PART_ERROR(H5Ocopy_dtype); } if (!object_link_exists) { H5_FAILED(); - HDprintf(" link '%s' to copied datatype didn't exist!\n", - OBJECT_COPY_BASIC_TEST_NEW_DTYPE_NAME); + printf(" link '%s' to copied datatype didn't exist!\n", + OBJECT_COPY_BASIC_TEST_NEW_DTYPE_NAME); PART_ERROR(H5Ocopy_dtype); } /* Ensure that the new committed datatype has all the attributes of the copied datatype */ if ((tmp_dtype_id = H5Topen2(group_id, OBJECT_COPY_BASIC_TEST_NEW_DTYPE_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" failed to open datatype copy '%s'\n", OBJECT_COPY_BASIC_TEST_NEW_DTYPE_NAME); + printf(" failed to open datatype copy '%s'\n", OBJECT_COPY_BASIC_TEST_NEW_DTYPE_NAME); PART_ERROR(H5Ocopy_dtype); } @@ -2448,14 +2444,13 @@ test_object_copy_basic(void) if (H5Oget_info3(tmp_dtype_id, &object_info, H5O_INFO_ALL) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve object info\n"); + printf(" failed to retrieve object info\n"); PART_ERROR(H5Ocopy_dtype); } if (object_info.num_attrs == 0) { H5_FAILED(); - HDprintf( - " copied committed datatype didn't contain any attributes after copy operation!\n"); + printf(" copied committed datatype didn't contain any attributes after copy operation!\n"); PART_ERROR(H5Ocopy_dtype); } @@ -2464,21 +2459,21 @@ test_object_copy_basic(void) if (H5Aiterate2(tmp_dtype_id, H5_INDEX_NAME, H5_ITER_INC, NULL, object_copy_attribute_iter_callback, &i) < 0) { H5_FAILED(); - HDprintf(" failed to iterate over copied datatype's attributes\n"); + printf(" failed to iterate over copied datatype's attributes\n"); PART_ERROR(H5Ocopy_dtype); } if (i != OBJECT_COPY_BASIC_TEST_NUM_ATTRS) { H5_FAILED(); - HDprintf(" number of attributes on copied datatype (%llu) didn't match expected number " - "(%llu)!\n", - (unsigned long long)i, (unsigned long long)OBJECT_COPY_BASIC_TEST_NUM_ATTRS); + printf(" number of attributes on copied datatype (%llu) didn't match expected number " + "(%llu)!\n", + (unsigned long long)i, (unsigned long long)OBJECT_COPY_BASIC_TEST_NUM_ATTRS); PART_ERROR(H5Ocopy_dtype); } if (H5Tclose(tmp_dtype_id) < 0) { H5_FAILED(); - HDprintf(" failed to close datatype copy\n"); + printf(" failed to close datatype copy\n"); PART_ERROR(H5Ocopy_dtype); } @@ -2569,8 +2564,8 @@ test_object_copy_already_existing(void) !(vol_cap_flags_g & H5VL_CAP_FLAG_OBJECT_MORE) || !(vol_cap_flags_g & H5VL_CAP_FLAG_STORED_DATATYPES)) { SKIPPED(); - HDprintf(" API functions for basic file, group, object, dataset, or stored datatype aren't " - "supported with this connector\n"); + printf(" API functions for basic file, group, object, dataset, or stored datatype aren't " + "supported with this connector\n"); return 0; } @@ -2578,21 +2573,21 @@ test_object_copy_already_existing(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, OBJECT_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", OBJECT_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", OBJECT_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, OBJECT_COPY_ALREADY_EXISTING_TEST_SUBGROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container subgroup '%s'\n", - OBJECT_COPY_ALREADY_EXISTING_TEST_SUBGROUP_NAME); + printf(" couldn't create container subgroup '%s'\n", + OBJECT_COPY_ALREADY_EXISTING_TEST_SUBGROUP_NAME); goto error; } @@ -2606,7 +2601,7 @@ test_object_copy_already_existing(void) if ((group_id2 = H5Gcreate2(group_id, OBJECT_COPY_ALREADY_EXISTING_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create group '%s'\n", OBJECT_COPY_ALREADY_EXISTING_TEST_GROUP_NAME); + printf(" couldn't create group '%s'\n", OBJECT_COPY_ALREADY_EXISTING_TEST_GROUP_NAME); goto error; } @@ -2614,21 +2609,21 @@ test_object_copy_already_existing(void) if ((dset_id = H5Dcreate2(group_id, OBJECT_COPY_ALREADY_EXISTING_TEST_DSET_NAME, dset_dtype, space_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create dataset '%s'\n", OBJECT_COPY_ALREADY_EXISTING_TEST_DSET_NAME); + printf(" couldn't create dataset '%s'\n", OBJECT_COPY_ALREADY_EXISTING_TEST_DSET_NAME); goto error; } /* Create the test committed datatype object */ if ((dtype_id = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) { H5_FAILED(); - HDprintf(" couldn't create datatype\n"); + printf(" couldn't create datatype\n"); goto error; } if (H5Tcommit2(group_id, OBJECT_COPY_ALREADY_EXISTING_TEST_DTYPE_NAME, dtype_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't commit datatype '%s'\n", OBJECT_COPY_ALREADY_EXISTING_TEST_DTYPE_NAME); + printf(" couldn't commit datatype '%s'\n", OBJECT_COPY_ALREADY_EXISTING_TEST_DTYPE_NAME); goto error; } @@ -2649,7 +2644,7 @@ test_object_copy_already_existing(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" group copy succeeded in location where group already exists!\n"); + printf(" group copy succeeded in location where group already exists!\n"); PART_ERROR(H5Ocopy_already_existing_group); } @@ -2670,7 +2665,7 @@ test_object_copy_already_existing(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" dataset copy succeeded in location where dataset already exists!\n"); + printf(" dataset copy succeeded in location where dataset already exists!\n"); PART_ERROR(H5Ocopy_already_existing_dset); } @@ -2691,8 +2686,8 @@ test_object_copy_already_existing(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" committed datatype copy succeeded in location where committed datatype already " - "exists!\n"); + printf(" committed datatype copy succeeded in location where committed datatype already " + "exists!\n"); PART_ERROR(H5Ocopy_already_existing_dtype); } @@ -2766,27 +2761,27 @@ test_object_copy_shallow_group_copy(void) !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_MORE) || !(vol_cap_flags_g & H5VL_CAP_FLAG_OBJECT_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC)) { SKIPPED(); - HDprintf(" API functions for basic file, group, object, or link aren't supported with this " - "connector\n"); + printf(" API functions for basic file, group, object, or link aren't supported with this " + "connector\n"); return 0; } if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, OBJECT_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", OBJECT_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", OBJECT_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, OBJECT_COPY_SHALLOW_TEST_SUBGROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container subgroup '%s'\n", OBJECT_COPY_SHALLOW_TEST_SUBGROUP_NAME); + printf(" couldn't create container subgroup '%s'\n", OBJECT_COPY_SHALLOW_TEST_SUBGROUP_NAME); goto error; } @@ -2794,7 +2789,7 @@ test_object_copy_shallow_group_copy(void) if ((group_id2 = H5Gcreate2(group_id, OBJECT_COPY_SHALLOW_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create group '%s'\n", OBJECT_COPY_SHALLOW_TEST_GROUP_NAME); + printf(" couldn't create group '%s'\n", OBJECT_COPY_SHALLOW_TEST_GROUP_NAME); goto error; } @@ -2805,8 +2800,8 @@ test_object_copy_shallow_group_copy(void) if ((tmp_group_id = H5Gcreate2(group_id2, grp_name, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create group '%s' under group '%s'\n", grp_name, - OBJECT_COPY_SHALLOW_TEST_GROUP_NAME); + printf(" couldn't create group '%s' under group '%s'\n", grp_name, + OBJECT_COPY_SHALLOW_TEST_GROUP_NAME); goto error; } @@ -2815,50 +2810,50 @@ test_object_copy_shallow_group_copy(void) if (H5Gclose(H5Gcreate2(tmp_group_id, OBJECT_COPY_SHALLOW_TEST_DEEP_NESTED_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create nested group '%s' under group '%s'\n", - OBJECT_COPY_SHALLOW_TEST_DEEP_NESTED_GROUP_NAME, grp_name); + printf(" couldn't create nested group '%s' under group '%s'\n", + OBJECT_COPY_SHALLOW_TEST_DEEP_NESTED_GROUP_NAME, grp_name); goto error; } } if (H5Gclose(tmp_group_id) < 0) { H5_FAILED(); - HDprintf(" couldn't close group '%s'\n", grp_name); + printf(" couldn't close group '%s'\n", grp_name); goto error; } } if ((ocpypl_id = H5Pcreate(H5P_OBJECT_COPY)) < 0) { H5_FAILED(); - HDprintf(" couldn't create OCopyPL\n"); + printf(" couldn't create OCopyPL\n"); goto error; } if (H5Pset_copy_object(ocpypl_id, H5O_COPY_SHALLOW_HIERARCHY_FLAG) < 0) { H5_FAILED(); - HDprintf(" couldn't set object copying options\n"); + printf(" couldn't set object copying options\n"); goto error; } if (H5Ocopy(group_id, OBJECT_COPY_SHALLOW_TEST_GROUP_NAME, group_id, OBJECT_COPY_SHALLOW_TEST_NEW_GROUP_NAME, ocpypl_id, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to copy group '%s' to '%s'\n", OBJECT_COPY_SHALLOW_TEST_GROUP_NAME, - OBJECT_COPY_SHALLOW_TEST_NEW_GROUP_NAME); + printf(" failed to copy group '%s' to '%s'\n", OBJECT_COPY_SHALLOW_TEST_GROUP_NAME, + OBJECT_COPY_SHALLOW_TEST_NEW_GROUP_NAME); goto error; } if ((object_link_exists = H5Lexists(group_id, OBJECT_COPY_SHALLOW_TEST_NEW_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if link '%s' to copied group exists\n", - OBJECT_COPY_SHALLOW_TEST_NEW_GROUP_NAME); + printf(" couldn't determine if link '%s' to copied group exists\n", + OBJECT_COPY_SHALLOW_TEST_NEW_GROUP_NAME); goto error; } if (!object_link_exists) { H5_FAILED(); - HDprintf(" link '%s' to copied group didn't exist!\n", OBJECT_COPY_SHALLOW_TEST_NEW_GROUP_NAME); + printf(" link '%s' to copied group didn't exist!\n", OBJECT_COPY_SHALLOW_TEST_NEW_GROUP_NAME); goto error; } @@ -2867,7 +2862,7 @@ test_object_copy_shallow_group_copy(void) */ if ((tmp_group_id = H5Gopen2(group_id, OBJECT_COPY_SHALLOW_TEST_NEW_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" failed to open group copy '%s'\n", OBJECT_COPY_SHALLOW_TEST_NEW_GROUP_NAME); + printf(" failed to open group copy '%s'\n", OBJECT_COPY_SHALLOW_TEST_NEW_GROUP_NAME); goto error; } @@ -2881,14 +2876,14 @@ test_object_copy_shallow_group_copy(void) if (H5Gget_info(tmp_group_id, &group_info) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve group info\n"); + printf(" failed to retrieve group info\n"); goto error; } if (group_info.nlinks != OBJECT_COPY_SHALLOW_TEST_NUM_NESTED_OBJS) { H5_FAILED(); - HDprintf(" copied group contained %d members instead of %d members after a shallow copy!\n", - (int)group_info.nlinks, OBJECT_COPY_SHALLOW_TEST_NUM_NESTED_OBJS); + printf(" copied group contained %d members instead of %d members after a shallow copy!\n", + (int)group_info.nlinks, OBJECT_COPY_SHALLOW_TEST_NUM_NESTED_OBJS); goto error; } @@ -2908,7 +2903,7 @@ test_object_copy_shallow_group_copy(void) if ((tmp_group_id = H5Gopen2(group_id, grp_name, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" failed to open group '%s'\n", grp_name); + printf(" failed to open group '%s'\n", grp_name); goto error; } @@ -2922,19 +2917,19 @@ test_object_copy_shallow_group_copy(void) if (H5Gget_info(tmp_group_id, &group_info) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve group info\n"); + printf(" failed to retrieve group info\n"); goto error; } if (group_info.nlinks != 0) { H5_FAILED(); - HDprintf(" copied group's immediate members contained nested members after a shallow copy!\n"); + printf(" copied group's immediate members contained nested members after a shallow copy!\n"); goto error; } if (H5Gclose(tmp_group_id) < 0) { H5_FAILED(); - HDprintf(" failed to close group '%s'\n", grp_name); + printf(" failed to close group '%s'\n", grp_name); goto error; } } @@ -3003,8 +2998,8 @@ test_object_copy_no_attributes(void) !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_STORED_DATATYPES)) { SKIPPED(); - HDprintf(" API functions for basic file, group, object, link, dataset, attribute, or stored " - "datatype aren't supported with this connector\n"); + printf(" API functions for basic file, group, object, link, dataset, attribute, or stored " + "datatype aren't supported with this connector\n"); return 0; } @@ -3012,20 +3007,20 @@ test_object_copy_no_attributes(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, OBJECT_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", OBJECT_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", OBJECT_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, OBJECT_COPY_NO_ATTRS_TEST_SUBGROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container subgroup '%s'\n", OBJECT_COPY_NO_ATTRS_TEST_SUBGROUP_NAME); + printf(" couldn't create container subgroup '%s'\n", OBJECT_COPY_NO_ATTRS_TEST_SUBGROUP_NAME); goto error; } @@ -3042,7 +3037,7 @@ test_object_copy_no_attributes(void) if ((group_id2 = H5Gcreate2(group_id, OBJECT_COPY_NO_ATTRS_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create group '%s'\n", OBJECT_COPY_NO_ATTRS_TEST_GROUP_NAME); + printf(" couldn't create group '%s'\n", OBJECT_COPY_NO_ATTRS_TEST_GROUP_NAME); goto error; } @@ -3054,14 +3049,14 @@ test_object_copy_no_attributes(void) if ((attr_id = H5Acreate2(group_id2, attr_name, H5T_NATIVE_INT, attr_space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create attribute '%s' on group '%s'\n", attr_name, - OBJECT_COPY_NO_ATTRS_TEST_GROUP_NAME); + printf(" couldn't create attribute '%s' on group '%s'\n", attr_name, + OBJECT_COPY_NO_ATTRS_TEST_GROUP_NAME); goto error; } if (H5Aclose(attr_id) < 0) { H5_FAILED(); - HDprintf(" couldn't close attribute '%s'\n", attr_name); + printf(" couldn't close attribute '%s'\n", attr_name); goto error; } } @@ -3070,7 +3065,7 @@ test_object_copy_no_attributes(void) if ((dset_id = H5Dcreate2(group_id, OBJECT_COPY_NO_ATTRS_TEST_DSET_NAME, dset_dtype, space_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create dataset '%s'\n", OBJECT_COPY_NO_ATTRS_TEST_DSET_NAME); + printf(" couldn't create dataset '%s'\n", OBJECT_COPY_NO_ATTRS_TEST_DSET_NAME); goto error; } @@ -3082,14 +3077,14 @@ test_object_copy_no_attributes(void) if ((attr_id = H5Acreate2(dset_id, attr_name, H5T_NATIVE_INT, attr_space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create attribute '%s' on dataset '%s'\n", attr_name, - OBJECT_COPY_NO_ATTRS_TEST_DSET_NAME); + printf(" couldn't create attribute '%s' on dataset '%s'\n", attr_name, + OBJECT_COPY_NO_ATTRS_TEST_DSET_NAME); goto error; } if (H5Aclose(attr_id) < 0) { H5_FAILED(); - HDprintf(" couldn't close attribute '%s'\n", attr_name); + printf(" couldn't close attribute '%s'\n", attr_name); goto error; } } @@ -3097,14 +3092,14 @@ 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) { H5_FAILED(); - HDprintf(" couldn't create datatype\n"); + printf(" couldn't create datatype\n"); goto error; } if (H5Tcommit2(group_id, OBJECT_COPY_NO_ATTRS_TEST_DTYPE_NAME, dtype_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't commit datatype '%s'\n", OBJECT_COPY_NO_ATTRS_TEST_DTYPE_NAME); + printf(" couldn't commit datatype '%s'\n", OBJECT_COPY_NO_ATTRS_TEST_DTYPE_NAME); goto error; } @@ -3116,14 +3111,14 @@ test_object_copy_no_attributes(void) if ((attr_id = H5Acreate2(dtype_id, attr_name, H5T_NATIVE_INT, attr_space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create attribute '%s' on committed datatype '%s'\n", attr_name, - OBJECT_COPY_NO_ATTRS_TEST_DTYPE_NAME); + printf(" couldn't create attribute '%s' on committed datatype '%s'\n", attr_name, + OBJECT_COPY_NO_ATTRS_TEST_DTYPE_NAME); goto error; } if (H5Aclose(attr_id) < 0) { H5_FAILED(); - HDprintf(" couldn't close attribute '%s'\n", attr_name); + printf(" couldn't close attribute '%s'\n", attr_name); goto error; } } @@ -3138,36 +3133,36 @@ test_object_copy_no_attributes(void) if ((ocpypl_id = H5Pcreate(H5P_OBJECT_COPY)) < 0) { H5_FAILED(); - HDprintf(" couldn't create OCopyPL\n"); + printf(" couldn't create OCopyPL\n"); PART_ERROR(H5Ocopy_group_no_attributes); } if (H5Pset_copy_object(ocpypl_id, H5O_COPY_WITHOUT_ATTR_FLAG) < 0) { H5_FAILED(); - HDprintf(" couldn't set object copying options\n"); + printf(" couldn't set object copying options\n"); PART_ERROR(H5Ocopy_group_no_attributes); } if (H5Ocopy(group_id, OBJECT_COPY_NO_ATTRS_TEST_GROUP_NAME, group_id, OBJECT_COPY_NO_ATTRS_TEST_NEW_GROUP_NAME, ocpypl_id, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to copy group '%s' to '%s'\n", OBJECT_COPY_NO_ATTRS_TEST_GROUP_NAME, - OBJECT_COPY_NO_ATTRS_TEST_NEW_GROUP_NAME); + printf(" failed to copy group '%s' to '%s'\n", OBJECT_COPY_NO_ATTRS_TEST_GROUP_NAME, + OBJECT_COPY_NO_ATTRS_TEST_NEW_GROUP_NAME); PART_ERROR(H5Ocopy_group_no_attributes); } if ((object_link_exists = H5Lexists(group_id, OBJECT_COPY_NO_ATTRS_TEST_NEW_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if link '%s' to copied group exists\n", - OBJECT_COPY_NO_ATTRS_TEST_NEW_GROUP_NAME); + printf(" couldn't determine if link '%s' to copied group exists\n", + OBJECT_COPY_NO_ATTRS_TEST_NEW_GROUP_NAME); PART_ERROR(H5Ocopy_group_no_attributes); } if (!object_link_exists) { H5_FAILED(); - HDprintf(" link '%s' to copied group didn't exist!\n", - OBJECT_COPY_NO_ATTRS_TEST_NEW_GROUP_NAME); + printf(" link '%s' to copied group didn't exist!\n", + OBJECT_COPY_NO_ATTRS_TEST_NEW_GROUP_NAME); PART_ERROR(H5Ocopy_group_no_attributes); } @@ -3175,7 +3170,7 @@ test_object_copy_no_attributes(void) if ((tmp_group_id = H5Gopen2(group_id, OBJECT_COPY_NO_ATTRS_TEST_NEW_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" failed to open group copy '%s'\n", OBJECT_COPY_NO_ATTRS_TEST_NEW_GROUP_NAME); + printf(" failed to open group copy '%s'\n", OBJECT_COPY_NO_ATTRS_TEST_NEW_GROUP_NAME); PART_ERROR(H5Ocopy_group_no_attributes); } @@ -3189,25 +3184,25 @@ test_object_copy_no_attributes(void) if (H5Oget_info3(tmp_group_id, &object_info, H5O_INFO_ALL) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve object info\n"); + printf(" failed to retrieve object info\n"); PART_ERROR(H5Ocopy_group_no_attributes); } if (object_info.num_attrs != 0) { H5_FAILED(); - HDprintf(" copied group contained attributes after a non-attribute copy!\n"); + printf(" copied group contained attributes after a non-attribute copy!\n"); PART_ERROR(H5Ocopy_group_no_attributes); } if (H5Pclose(ocpypl_id) < 0) { H5_FAILED(); - HDprintf(" failed to close OCopyPL\n"); + printf(" failed to close OCopyPL\n"); PART_ERROR(H5Ocopy_group_no_attributes); } if (H5Gclose(tmp_group_id) < 0) { H5_FAILED(); - HDprintf(" failed to close group copy\n"); + printf(" failed to close group copy\n"); PART_ERROR(H5Ocopy_group_no_attributes); } @@ -3238,36 +3233,36 @@ test_object_copy_no_attributes(void) if ((ocpypl_id = H5Pcreate(H5P_OBJECT_COPY)) < 0) { H5_FAILED(); - HDprintf(" couldn't create OCopyPL\n"); + printf(" couldn't create OCopyPL\n"); PART_ERROR(H5Ocopy_dset_no_attributes); } if (H5Pset_copy_object(ocpypl_id, H5O_COPY_WITHOUT_ATTR_FLAG) < 0) { H5_FAILED(); - HDprintf(" couldn't set object copying options\n"); + printf(" couldn't set object copying options\n"); PART_ERROR(H5Ocopy_dset_no_attributes); } if (H5Ocopy(group_id, OBJECT_COPY_NO_ATTRS_TEST_DSET_NAME, group_id, OBJECT_COPY_NO_ATTRS_TEST_NEW_DSET_NAME, ocpypl_id, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to copy dataset '%s' to '%s'\n", OBJECT_COPY_NO_ATTRS_TEST_DSET_NAME, - OBJECT_COPY_NO_ATTRS_TEST_NEW_DSET_NAME); + printf(" failed to copy dataset '%s' to '%s'\n", OBJECT_COPY_NO_ATTRS_TEST_DSET_NAME, + OBJECT_COPY_NO_ATTRS_TEST_NEW_DSET_NAME); PART_ERROR(H5Ocopy_dset_no_attributes); } if ((object_link_exists = H5Lexists(group_id, OBJECT_COPY_NO_ATTRS_TEST_NEW_DSET_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if link '%s' to copied dataset exists\n", - OBJECT_COPY_NO_ATTRS_TEST_NEW_DSET_NAME); + printf(" couldn't determine if link '%s' to copied dataset exists\n", + OBJECT_COPY_NO_ATTRS_TEST_NEW_DSET_NAME); PART_ERROR(H5Ocopy_dset_no_attributes); } if (!object_link_exists) { H5_FAILED(); - HDprintf(" link '%s' to copied dataset didn't exist!\n", - OBJECT_COPY_NO_ATTRS_TEST_NEW_DSET_NAME); + printf(" link '%s' to copied dataset didn't exist!\n", + OBJECT_COPY_NO_ATTRS_TEST_NEW_DSET_NAME); PART_ERROR(H5Ocopy_dset_no_attributes); } @@ -3275,7 +3270,7 @@ test_object_copy_no_attributes(void) if ((tmp_dset_id = H5Dopen2(group_id, OBJECT_COPY_NO_ATTRS_TEST_NEW_DSET_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" failed to open dataset copy '%s'\n", OBJECT_COPY_NO_ATTRS_TEST_NEW_DSET_NAME); + printf(" failed to open dataset copy '%s'\n", OBJECT_COPY_NO_ATTRS_TEST_NEW_DSET_NAME); PART_ERROR(H5Ocopy_dset_no_attributes); } @@ -3289,25 +3284,25 @@ test_object_copy_no_attributes(void) if (H5Oget_info3(tmp_dset_id, &object_info, H5O_INFO_ALL) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve object info\n"); + printf(" failed to retrieve object info\n"); PART_ERROR(H5Ocopy_dset_no_attributes); } if (object_info.num_attrs != 0) { H5_FAILED(); - HDprintf(" copied dataset contained attributes after a non-attribute copy!\n"); + printf(" copied dataset contained attributes after a non-attribute copy!\n"); PART_ERROR(H5Ocopy_dset_no_attributes); } if (H5Pclose(ocpypl_id) < 0) { H5_FAILED(); - HDprintf(" failed to close OCopyPL\n"); + printf(" failed to close OCopyPL\n"); PART_ERROR(H5Ocopy_dset_no_attributes); } if (H5Dclose(tmp_dset_id) < 0) { H5_FAILED(); - HDprintf(" failed to close dataset copy\n"); + printf(" failed to close dataset copy\n"); PART_ERROR(H5Ocopy_dset_no_attributes); } @@ -3338,36 +3333,36 @@ test_object_copy_no_attributes(void) if ((ocpypl_id = H5Pcreate(H5P_OBJECT_COPY)) < 0) { H5_FAILED(); - HDprintf(" couldn't create OCopyPL\n"); + printf(" couldn't create OCopyPL\n"); PART_ERROR(H5Ocopy_dtype_no_attributes); } if (H5Pset_copy_object(ocpypl_id, H5O_COPY_WITHOUT_ATTR_FLAG) < 0) { H5_FAILED(); - HDprintf(" couldn't set object copying options\n"); + printf(" couldn't set object copying options\n"); PART_ERROR(H5Ocopy_dtype_no_attributes); } if (H5Ocopy(group_id, OBJECT_COPY_NO_ATTRS_TEST_DTYPE_NAME, group_id, OBJECT_COPY_NO_ATTRS_TEST_NEW_DTYPE_NAME, ocpypl_id, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to copy datatype '%s' to '%s'\n", OBJECT_COPY_NO_ATTRS_TEST_DTYPE_NAME, - OBJECT_COPY_NO_ATTRS_TEST_NEW_DTYPE_NAME); + printf(" failed to copy datatype '%s' to '%s'\n", OBJECT_COPY_NO_ATTRS_TEST_DTYPE_NAME, + OBJECT_COPY_NO_ATTRS_TEST_NEW_DTYPE_NAME); PART_ERROR(H5Ocopy_dtype_no_attributes); } if ((object_link_exists = H5Lexists(group_id, OBJECT_COPY_NO_ATTRS_TEST_NEW_DTYPE_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if link '%s' to copied datatype exists\n", - OBJECT_COPY_NO_ATTRS_TEST_NEW_DTYPE_NAME); + printf(" couldn't determine if link '%s' to copied datatype exists\n", + OBJECT_COPY_NO_ATTRS_TEST_NEW_DTYPE_NAME); PART_ERROR(H5Ocopy_dtype_no_attributes); } if (!object_link_exists) { H5_FAILED(); - HDprintf(" link '%s' to copied datatype didn't exist!\n", - OBJECT_COPY_NO_ATTRS_TEST_NEW_DTYPE_NAME); + printf(" link '%s' to copied datatype didn't exist!\n", + OBJECT_COPY_NO_ATTRS_TEST_NEW_DTYPE_NAME); PART_ERROR(H5Ocopy_dtype_no_attributes); } @@ -3375,7 +3370,7 @@ test_object_copy_no_attributes(void) if ((tmp_dtype_id = H5Topen2(group_id, OBJECT_COPY_NO_ATTRS_TEST_NEW_DTYPE_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" failed to open dataset copy '%s'\n", OBJECT_COPY_NO_ATTRS_TEST_NEW_DTYPE_NAME); + printf(" failed to open dataset copy '%s'\n", OBJECT_COPY_NO_ATTRS_TEST_NEW_DTYPE_NAME); PART_ERROR(H5Ocopy_dtype_no_attributes); } @@ -3389,25 +3384,25 @@ test_object_copy_no_attributes(void) if (H5Oget_info3(tmp_dtype_id, &object_info, H5O_INFO_ALL) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve object info\n"); + printf(" failed to retrieve object info\n"); PART_ERROR(H5Ocopy_dtype_no_attributes); } if (object_info.num_attrs != 0) { H5_FAILED(); - HDprintf(" copied committed datatype contained attributes after a non-attribute copy!\n"); + printf(" copied committed datatype contained attributes after a non-attribute copy!\n"); PART_ERROR(H5Ocopy_dtype_no_attributes); } if (H5Pclose(ocpypl_id) < 0) { H5_FAILED(); - HDprintf(" failed to close OCopyPL\n"); + printf(" failed to close OCopyPL\n"); PART_ERROR(H5Ocopy_dtype_no_attributes); } if (H5Tclose(tmp_dtype_id) < 0) { H5_FAILED(); - HDprintf(" failed to close datatype copy\n"); + printf(" failed to close datatype copy\n"); PART_ERROR(H5Ocopy_dtype_no_attributes); } @@ -3511,8 +3506,8 @@ test_object_copy_by_soft_link(void) !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ITERATE) || !(vol_cap_flags_g & H5VL_CAP_FLAG_SOFT_LINKS)) { SKIPPED(); - HDprintf(" API functions for basic file, group, object, link, dataset, attribute, iterate, or " - "soft link aren't supported with this connector\n"); + printf(" API functions for basic file, group, object, link, dataset, attribute, iterate, or " + "soft link aren't supported with this connector\n"); return 0; } @@ -3520,20 +3515,20 @@ test_object_copy_by_soft_link(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, OBJECT_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", OBJECT_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", OBJECT_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, OBJECT_COPY_SOFT_LINK_TEST_SUBGROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container subgroup '%s'\n", OBJECT_COPY_SOFT_LINK_TEST_SUBGROUP_NAME); + printf(" couldn't create container subgroup '%s'\n", OBJECT_COPY_SOFT_LINK_TEST_SUBGROUP_NAME); goto error; } @@ -3545,7 +3540,7 @@ test_object_copy_by_soft_link(void) if ((group_id2 = H5Gcreate2(group_id, OBJECT_COPY_SOFT_LINK_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create group '%s'\n", OBJECT_COPY_SOFT_LINK_TEST_GROUP_NAME); + printf(" couldn't create group '%s'\n", OBJECT_COPY_SOFT_LINK_TEST_GROUP_NAME); goto error; } @@ -3556,8 +3551,8 @@ test_object_copy_by_soft_link(void) if ((tmp_group_id = H5Gcreate2(group_id2, grp_name, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create group '%s' under group '%s'\n", grp_name, - OBJECT_COPY_SOFT_LINK_TEST_GROUP_NAME); + printf(" couldn't create group '%s' under group '%s'\n", grp_name, + OBJECT_COPY_SOFT_LINK_TEST_GROUP_NAME); goto error; } @@ -3566,15 +3561,15 @@ test_object_copy_by_soft_link(void) if (H5Gclose(H5Gcreate2(tmp_group_id, OBJECT_COPY_SOFT_LINK_TEST_DEEP_NESTED_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create nested group '%s' under group '%s'\n", - OBJECT_COPY_SOFT_LINK_TEST_DEEP_NESTED_GROUP_NAME, grp_name); + printf(" couldn't create nested group '%s' under group '%s'\n", + OBJECT_COPY_SOFT_LINK_TEST_DEEP_NESTED_GROUP_NAME, grp_name); goto error; } } if (H5Gclose(tmp_group_id) < 0) { H5_FAILED(); - HDprintf(" couldn't close group '%s'\n", grp_name); + printf(" couldn't close group '%s'\n", grp_name); goto error; } } @@ -3587,14 +3582,14 @@ test_object_copy_by_soft_link(void) if ((attr_id = H5Acreate2(group_id2, attr_name, H5T_NATIVE_INT, attr_space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create attribute '%s' on group '%s'\n", attr_name, - OBJECT_COPY_SOFT_LINK_TEST_GROUP_NAME); + printf(" couldn't create attribute '%s' on group '%s'\n", attr_name, + OBJECT_COPY_SOFT_LINK_TEST_GROUP_NAME); goto error; } if (H5Aclose(attr_id) < 0) { H5_FAILED(); - HDprintf(" couldn't close attribute '%s'\n", attr_name); + printf(" couldn't close attribute '%s'\n", attr_name); goto error; } } @@ -3612,31 +3607,31 @@ test_object_copy_by_soft_link(void) group_id, OBJECT_COPY_SOFT_LINK_TEST_SOFT_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to create soft link '%s' to group for copying\n", - OBJECT_COPY_SOFT_LINK_TEST_SOFT_LINK_NAME); + printf(" failed to create soft link '%s' to group for copying\n", + OBJECT_COPY_SOFT_LINK_TEST_SOFT_LINK_NAME); PART_ERROR(H5Ocopy_through_soft_link); } if (H5Ocopy(group_id, OBJECT_COPY_SOFT_LINK_TEST_SOFT_LINK_NAME, group_id, OBJECT_COPY_SOFT_LINK_TEST_NEW_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to copy group '%s' to '%s'\n", OBJECT_COPY_SOFT_LINK_TEST_GROUP_NAME, - OBJECT_COPY_SOFT_LINK_TEST_NEW_GROUP_NAME); + printf(" failed to copy group '%s' to '%s'\n", OBJECT_COPY_SOFT_LINK_TEST_GROUP_NAME, + OBJECT_COPY_SOFT_LINK_TEST_NEW_GROUP_NAME); PART_ERROR(H5Ocopy_through_soft_link); } if ((object_link_exists = H5Lexists(group_id, OBJECT_COPY_SOFT_LINK_TEST_NEW_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if link '%s' to copied group exists\n", - OBJECT_COPY_SOFT_LINK_TEST_NEW_GROUP_NAME); + printf(" couldn't determine if link '%s' to copied group exists\n", + OBJECT_COPY_SOFT_LINK_TEST_NEW_GROUP_NAME); PART_ERROR(H5Ocopy_through_soft_link); } if (!object_link_exists) { H5_FAILED(); - HDprintf(" link '%s' to copied group didn't exist!\n", - OBJECT_COPY_SOFT_LINK_TEST_NEW_GROUP_NAME); + printf(" link '%s' to copied group didn't exist!\n", + OBJECT_COPY_SOFT_LINK_TEST_NEW_GROUP_NAME); PART_ERROR(H5Ocopy_through_soft_link); } @@ -3645,14 +3640,14 @@ test_object_copy_by_soft_link(void) if (H5Lget_info2(group_id, OBJECT_COPY_SOFT_LINK_TEST_NEW_GROUP_NAME, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve info for link '%s'\n", - OBJECT_COPY_SOFT_LINK_TEST_NEW_GROUP_NAME); + printf(" failed to retrieve info for link '%s'\n", + OBJECT_COPY_SOFT_LINK_TEST_NEW_GROUP_NAME); PART_ERROR(H5Ocopy_through_soft_link); } if (link_info.type != H5L_TYPE_HARD) { H5_FAILED(); - HDprintf( + printf( " after group copy through soft link, group's new link type wasn't H5L_TYPE_HARD!\n"); PART_ERROR(H5Ocopy_through_soft_link); } @@ -3664,7 +3659,7 @@ test_object_copy_by_soft_link(void) if ((tmp_group_id = H5Gopen2(group_id, OBJECT_COPY_SOFT_LINK_TEST_NEW_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" failed to open group copy '%s'\n", OBJECT_COPY_SOFT_LINK_TEST_NEW_GROUP_NAME); + printf(" failed to open group copy '%s'\n", OBJECT_COPY_SOFT_LINK_TEST_NEW_GROUP_NAME); PART_ERROR(H5Ocopy_through_soft_link); } @@ -3678,15 +3673,14 @@ test_object_copy_by_soft_link(void) if (H5Gget_info(tmp_group_id, &group_info) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve group info\n"); + printf(" failed to retrieve group info\n"); PART_ERROR(H5Ocopy_through_soft_link); } if (group_info.nlinks != OBJECT_COPY_SOFT_LINK_TEST_NUM_NESTED_OBJS) { H5_FAILED(); - HDprintf( - " copied group contained %d members instead of %d members after a shallow copy!\n", - (int)group_info.nlinks, OBJECT_COPY_SOFT_LINK_TEST_NUM_NESTED_OBJS); + printf(" copied group contained %d members instead of %d members after a shallow copy!\n", + (int)group_info.nlinks, OBJECT_COPY_SOFT_LINK_TEST_NUM_NESTED_OBJS); PART_ERROR(H5Ocopy_through_soft_link); } @@ -3700,13 +3694,13 @@ test_object_copy_by_soft_link(void) if (H5Oget_info3(tmp_group_id, &object_info, H5O_INFO_ALL) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve object info\n"); + printf(" failed to retrieve object info\n"); PART_ERROR(H5Ocopy_through_soft_link); } if (object_info.num_attrs == 0) { H5_FAILED(); - HDprintf(" copied group didn't contain any attributes after copy operation!\n"); + printf(" copied group didn't contain any attributes after copy operation!\n"); PART_ERROR(H5Ocopy_through_soft_link); } @@ -3715,13 +3709,13 @@ test_object_copy_by_soft_link(void) if (H5Aiterate2(tmp_group_id, H5_INDEX_NAME, H5_ITER_INC, NULL, object_copy_attribute_iter_callback, &i) < 0) { H5_FAILED(); - HDprintf(" failed to iterate over copied group's attributes\n"); + printf(" failed to iterate over copied group's attributes\n"); PART_ERROR(H5Ocopy_through_soft_link); } if (i != OBJECT_COPY_SOFT_LINK_TEST_NUM_ATTRS) { H5_FAILED(); - HDprintf( + printf( " number of attributes on copied group (%llu) didn't match expected number (%llu)!\n", (unsigned long long)i, (unsigned long long)OBJECT_COPY_SOFT_LINK_TEST_NUM_ATTRS); PART_ERROR(H5Ocopy_through_soft_link); @@ -3729,7 +3723,7 @@ test_object_copy_by_soft_link(void) if (H5Gclose(tmp_group_id) < 0) { H5_FAILED(); - HDprintf(" failed to close group copy\n"); + printf(" failed to close group copy\n"); PART_ERROR(H5Ocopy_through_soft_link); } @@ -3757,8 +3751,8 @@ test_object_copy_by_soft_link(void) group_id, OBJECT_COPY_SOFT_LINK_TEST_DANGLING_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to create dangling soft link '%s'\n", - OBJECT_COPY_SOFT_LINK_TEST_DANGLING_LINK_NAME); + printf(" failed to create dangling soft link '%s'\n", + OBJECT_COPY_SOFT_LINK_TEST_DANGLING_LINK_NAME); PART_ERROR(H5Ocopy_through_dangling_soft_link); } @@ -3772,7 +3766,7 @@ test_object_copy_by_soft_link(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" copied non-existent object through use of a dangling soft link!\n"); + printf(" copied non-existent object through use of a dangling soft link!\n"); PART_ERROR(H5Ocopy_through_dangling_soft_link); } @@ -3841,9 +3835,9 @@ test_object_copy_group_with_soft_links(void) !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_MORE) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ITERATE) || !(vol_cap_flags_g & H5VL_CAP_FLAG_SOFT_LINKS)) { SKIPPED(); - HDprintf(" API functions for basic file, group, object, link, iterate, or soft link aren't " - "supported with " - "this connector\n"); + printf(" API functions for basic file, group, object, link, iterate, or soft link aren't " + "supported with " + "this connector\n"); return 0; } @@ -3851,21 +3845,21 @@ test_object_copy_group_with_soft_links(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, OBJECT_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", OBJECT_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", OBJECT_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_SUBGROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container subgroup '%s'\n", - OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_SUBGROUP_NAME); + printf(" couldn't create container subgroup '%s'\n", + OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_SUBGROUP_NAME); goto error; } @@ -3873,7 +3867,7 @@ test_object_copy_group_with_soft_links(void) if ((group_id2 = H5Gcreate2(group_id, OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create group '%s'\n", OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_GROUP_NAME); + printf(" couldn't create group '%s'\n", OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_GROUP_NAME); goto error; } @@ -3893,20 +3887,20 @@ test_object_copy_group_with_soft_links(void) if ((tmp_group_id = H5Gcreate2(group_id, grp_name, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create group '%s' under group '%s'\n", grp_name, - OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_SUBGROUP_NAME); + printf(" couldn't create group '%s' under group '%s'\n", grp_name, + OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_SUBGROUP_NAME); goto error; } if (H5Lcreate_soft(lnk_target, group_id2, lnk_name, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to create soft link '%s'\n", lnk_name); + printf(" failed to create soft link '%s'\n", lnk_name); goto error; } if (H5Gclose(tmp_group_id) < 0) { H5_FAILED(); - HDprintf(" couldn't close group '%s'\n", grp_name); + printf(" couldn't close group '%s'\n", grp_name); goto error; } } @@ -3923,9 +3917,9 @@ test_object_copy_group_with_soft_links(void) OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_NON_EXPAND_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to copy group '%s' to '%s'\n", - OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_GROUP_NAME, - OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_NON_EXPAND_GROUP_NAME); + printf(" failed to copy group '%s' to '%s'\n", + OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_GROUP_NAME, + OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_NON_EXPAND_GROUP_NAME); PART_ERROR(H5Ocopy_dont_expand_soft_links); } @@ -3933,15 +3927,15 @@ test_object_copy_group_with_soft_links(void) H5Lexists(group_id, OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_NON_EXPAND_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if link '%s' to copied group exists\n", - OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_NON_EXPAND_GROUP_NAME); + printf(" couldn't determine if link '%s' to copied group exists\n", + OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_NON_EXPAND_GROUP_NAME); PART_ERROR(H5Ocopy_dont_expand_soft_links); } if (!object_link_exists) { H5_FAILED(); - HDprintf(" link '%s' to copied group didn't exist!\n", - OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_NON_EXPAND_GROUP_NAME); + printf(" link '%s' to copied group didn't exist!\n", + OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_NON_EXPAND_GROUP_NAME); PART_ERROR(H5Ocopy_dont_expand_soft_links); } @@ -3950,8 +3944,8 @@ test_object_copy_group_with_soft_links(void) H5Gopen2(group_id, OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_NON_EXPAND_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" failed to open group copy '%s'\n", - OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_NON_EXPAND_GROUP_NAME); + printf(" failed to open group copy '%s'\n", + OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_NON_EXPAND_GROUP_NAME); PART_ERROR(H5Ocopy_dont_expand_soft_links); } @@ -3965,14 +3959,14 @@ test_object_copy_group_with_soft_links(void) if (H5Gget_info(tmp_group_id, &group_info) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve group info\n"); + printf(" failed to retrieve group info\n"); PART_ERROR(H5Ocopy_dont_expand_soft_links); } if (group_info.nlinks != OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_NUM_NESTED_OBJS) { H5_FAILED(); - HDprintf(" copied group contained %d members instead of %d members after copy!\n", - (int)group_info.nlinks, OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_NUM_NESTED_OBJS); + printf(" copied group contained %d members instead of %d members after copy!\n", + (int)group_info.nlinks, OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_NUM_NESTED_OBJS); PART_ERROR(H5Ocopy_dont_expand_soft_links); } @@ -3984,22 +3978,22 @@ test_object_copy_group_with_soft_links(void) if (H5Literate2(tmp_group_id, H5_INDEX_NAME, H5_ITER_INC, NULL, object_copy_soft_link_non_expand_callback, &i) < 0) { H5_FAILED(); - HDprintf(" failed to iterate over links in group '%s'\n", - OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_NON_EXPAND_GROUP_NAME); + printf(" failed to iterate over links in group '%s'\n", + OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_NON_EXPAND_GROUP_NAME); PART_ERROR(H5Ocopy_dont_expand_soft_links); } if (i != OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_NUM_NESTED_OBJS) { H5_FAILED(); - HDprintf(" number of links in copied group (%llu) didn't match expected number (%llu)!\n", - (unsigned long long)i, - (unsigned long long)OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_NUM_NESTED_OBJS); + printf(" number of links in copied group (%llu) didn't match expected number (%llu)!\n", + (unsigned long long)i, + (unsigned long long)OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_NUM_NESTED_OBJS); PART_ERROR(H5Ocopy_dont_expand_soft_links); } if (H5Gclose(tmp_group_id) < 0) { H5_FAILED(); - HDprintf(" failed to close group copy\n"); + printf(" failed to close group copy\n"); PART_ERROR(H5Ocopy_dont_expand_soft_links); } @@ -4022,13 +4016,13 @@ test_object_copy_group_with_soft_links(void) if ((ocpypl_id = H5Pcreate(H5P_OBJECT_COPY)) < 0) { H5_FAILED(); - HDprintf(" couldn't create OCopyPL\n"); + printf(" couldn't create OCopyPL\n"); PART_ERROR(H5Ocopy_expand_soft_links); } if (H5Pset_copy_object(ocpypl_id, H5O_COPY_EXPAND_SOFT_LINK_FLAG) < 0) { H5_FAILED(); - HDprintf(" couldn't set object copying options\n"); + printf(" couldn't set object copying options\n"); PART_ERROR(H5Ocopy_expand_soft_links); } @@ -4036,24 +4030,24 @@ test_object_copy_group_with_soft_links(void) OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_EXPAND_GROUP_NAME, ocpypl_id, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to copy group '%s' to '%s'\n", - OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_GROUP_NAME, - OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_EXPAND_GROUP_NAME); + printf(" failed to copy group '%s' to '%s'\n", + OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_GROUP_NAME, + OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_EXPAND_GROUP_NAME); PART_ERROR(H5Ocopy_expand_soft_links); } if ((object_link_exists = H5Lexists( group_id, OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_EXPAND_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if link '%s' to copied group exists\n", - OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_EXPAND_GROUP_NAME); + printf(" couldn't determine if link '%s' to copied group exists\n", + OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_EXPAND_GROUP_NAME); PART_ERROR(H5Ocopy_expand_soft_links); } if (!object_link_exists) { H5_FAILED(); - HDprintf(" link '%s' to copied group didn't exist!\n", - OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_EXPAND_GROUP_NAME); + printf(" link '%s' to copied group didn't exist!\n", + OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_EXPAND_GROUP_NAME); PART_ERROR(H5Ocopy_expand_soft_links); } @@ -4061,8 +4055,8 @@ test_object_copy_group_with_soft_links(void) if ((tmp_group_id = H5Gopen2(group_id, OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_EXPAND_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" failed to open group copy '%s'\n", - OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_EXPAND_GROUP_NAME); + printf(" failed to open group copy '%s'\n", + OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_EXPAND_GROUP_NAME); PART_ERROR(H5Ocopy_expand_soft_links); } @@ -4076,14 +4070,14 @@ test_object_copy_group_with_soft_links(void) if (H5Gget_info(tmp_group_id, &group_info) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve group info\n"); + printf(" failed to retrieve group info\n"); PART_ERROR(H5Ocopy_expand_soft_links); } if (group_info.nlinks != OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_NUM_NESTED_OBJS) { H5_FAILED(); - HDprintf(" copied group contained %d members instead of %d members after copy!\n", - (int)group_info.nlinks, OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_NUM_NESTED_OBJS); + printf(" copied group contained %d members instead of %d members after copy!\n", + (int)group_info.nlinks, OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_NUM_NESTED_OBJS); PART_ERROR(H5Ocopy_expand_soft_links); } @@ -4096,28 +4090,28 @@ test_object_copy_group_with_soft_links(void) if (H5Literate2(tmp_group_id, H5_INDEX_NAME, H5_ITER_INC, NULL, object_copy_soft_link_expand_callback, &i) < 0) { H5_FAILED(); - HDprintf(" failed to iterate over links in group '%s'\n", - OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_EXPAND_GROUP_NAME); + printf(" failed to iterate over links in group '%s'\n", + OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_EXPAND_GROUP_NAME); PART_ERROR(H5Ocopy_expand_soft_links); } if (i != OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_NUM_NESTED_OBJS) { H5_FAILED(); - HDprintf(" number of links in copied group (%llu) didn't match expected number (%llu)!\n", - (unsigned long long)i, - (unsigned long long)OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_NUM_NESTED_OBJS); + printf(" number of links in copied group (%llu) didn't match expected number (%llu)!\n", + (unsigned long long)i, + (unsigned long long)OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_NUM_NESTED_OBJS); PART_ERROR(H5Ocopy_expand_soft_links); } if (H5Pclose(ocpypl_id) < 0) { H5_FAILED(); - HDprintf(" failed to close OCopyPL\n"); + printf(" failed to close OCopyPL\n"); PART_ERROR(H5Ocopy_expand_soft_links); } if (H5Gclose(tmp_group_id) < 0) { H5_FAILED(); - HDprintf(" failed to close group copy\n"); + printf(" failed to close group copy\n"); PART_ERROR(H5Ocopy_expand_soft_links); } @@ -4211,8 +4205,8 @@ test_object_copy_between_files(void) !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_MORE) || !(vol_cap_flags_g & H5VL_CAP_FLAG_STORED_DATATYPES)) { SKIPPED(); - HDprintf(" API functions for basic file, group, object, link, dataset, attribute, stored " - "datatype, or iterate aren't supported with this connector\n"); + printf(" API functions for basic file, group, object, link, dataset, attribute, stored " + "datatype, or iterate aren't supported with this connector\n"); return 0; } @@ -4224,27 +4218,26 @@ test_object_copy_between_files(void) if ((file_id2 = H5Fcreate(OBJECT_COPY_BETWEEN_FILES_TEST_FILE_NAME, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create file '%s'\n", H5_api_test_filename); + printf(" couldn't create file '%s'\n", H5_api_test_filename); goto error; } if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, OBJECT_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", OBJECT_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", OBJECT_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, OBJECT_COPY_BETWEEN_FILES_TEST_SUBGROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container subgroup '%s'\n", - OBJECT_COPY_BETWEEN_FILES_TEST_SUBGROUP_NAME); + printf(" couldn't create container subgroup '%s'\n", OBJECT_COPY_BETWEEN_FILES_TEST_SUBGROUP_NAME); goto error; } @@ -4262,7 +4255,7 @@ test_object_copy_between_files(void) if ((group_id2 = H5Gcreate2(group_id, OBJECT_COPY_BETWEEN_FILES_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create group '%s'\n", OBJECT_COPY_BETWEEN_FILES_TEST_GROUP_NAME); + printf(" couldn't create group '%s'\n", OBJECT_COPY_BETWEEN_FILES_TEST_GROUP_NAME); goto error; } @@ -4273,8 +4266,8 @@ test_object_copy_between_files(void) if ((tmp_group_id = H5Gcreate2(group_id2, grp_name, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create group '%s' under group '%s'\n", grp_name, - OBJECT_COPY_BETWEEN_FILES_TEST_GROUP_NAME); + printf(" couldn't create group '%s' under group '%s'\n", grp_name, + OBJECT_COPY_BETWEEN_FILES_TEST_GROUP_NAME); goto error; } @@ -4283,15 +4276,15 @@ test_object_copy_between_files(void) if (H5Gclose(H5Gcreate2(tmp_group_id, OBJECT_COPY_BETWEEN_FILES_TEST_DEEP_NESTED_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create nested group '%s' under group '%s'\n", - OBJECT_COPY_BETWEEN_FILES_TEST_DEEP_NESTED_GROUP_NAME, grp_name); + printf(" couldn't create nested group '%s' under group '%s'\n", + OBJECT_COPY_BETWEEN_FILES_TEST_DEEP_NESTED_GROUP_NAME, grp_name); goto error; } } if (H5Gclose(tmp_group_id) < 0) { H5_FAILED(); - HDprintf(" couldn't close group '%s'\n", grp_name); + printf(" couldn't close group '%s'\n", grp_name); goto error; } } @@ -4304,14 +4297,14 @@ test_object_copy_between_files(void) if ((attr_id = H5Acreate2(group_id2, attr_name, H5T_NATIVE_INT, attr_space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create attribute '%s' on group '%s'\n", attr_name, - OBJECT_COPY_BETWEEN_FILES_TEST_GROUP_NAME); + printf(" couldn't create attribute '%s' on group '%s'\n", attr_name, + OBJECT_COPY_BETWEEN_FILES_TEST_GROUP_NAME); goto error; } if (H5Aclose(attr_id) < 0) { H5_FAILED(); - HDprintf(" couldn't close attribute '%s'\n", attr_name); + printf(" couldn't close attribute '%s'\n", attr_name); goto error; } } @@ -4320,7 +4313,7 @@ test_object_copy_between_files(void) if ((dset_id = H5Dcreate2(group_id, OBJECT_COPY_BETWEEN_FILES_TEST_DSET_NAME, dset_dtype, space_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create dataset '%s'\n", OBJECT_COPY_BETWEEN_FILES_TEST_DSET_NAME); + printf(" couldn't create dataset '%s'\n", OBJECT_COPY_BETWEEN_FILES_TEST_DSET_NAME); goto error; } @@ -4332,14 +4325,14 @@ test_object_copy_between_files(void) if ((attr_id = H5Acreate2(dset_id, attr_name, H5T_NATIVE_INT, attr_space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create attribute '%s' on dataset '%s'\n", attr_name, - OBJECT_COPY_BETWEEN_FILES_TEST_DSET_NAME); + printf(" couldn't create attribute '%s' on dataset '%s'\n", attr_name, + OBJECT_COPY_BETWEEN_FILES_TEST_DSET_NAME); goto error; } if (H5Aclose(attr_id) < 0) { H5_FAILED(); - HDprintf(" couldn't close attribute '%s'\n", attr_name); + printf(" couldn't close attribute '%s'\n", attr_name); goto error; } } @@ -4347,14 +4340,14 @@ 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) { H5_FAILED(); - HDprintf(" couldn't create datatype\n"); + printf(" couldn't create datatype\n"); goto error; } if (H5Tcommit2(group_id, OBJECT_COPY_BETWEEN_FILES_TEST_DTYPE_NAME, dtype_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't commit datatype '%s'\n", OBJECT_COPY_BETWEEN_FILES_TEST_DTYPE_NAME); + printf(" couldn't commit datatype '%s'\n", OBJECT_COPY_BETWEEN_FILES_TEST_DTYPE_NAME); goto error; } @@ -4366,14 +4359,14 @@ test_object_copy_between_files(void) if ((attr_id = H5Acreate2(dtype_id, attr_name, H5T_NATIVE_INT, attr_space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create attribute '%s' on committed datatype '%s'\n", attr_name, - OBJECT_COPY_BETWEEN_FILES_TEST_DTYPE_NAME); + printf(" couldn't create attribute '%s' on committed datatype '%s'\n", attr_name, + OBJECT_COPY_BETWEEN_FILES_TEST_DTYPE_NAME); goto error; } if (H5Aclose(attr_id) < 0) { H5_FAILED(); - HDprintf(" couldn't close attribute '%s'\n", attr_name); + printf(" couldn't close attribute '%s'\n", attr_name); goto error; } } @@ -4389,25 +4382,25 @@ test_object_copy_between_files(void) if (H5Ocopy(group_id, OBJECT_COPY_BETWEEN_FILES_TEST_GROUP_NAME, file_id2, OBJECT_COPY_BETWEEN_FILES_TEST_NEW_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to copy group '%s' to second file '%s'\n", - OBJECT_COPY_BETWEEN_FILES_TEST_GROUP_NAME, - OBJECT_COPY_BETWEEN_FILES_TEST_NEW_GROUP_NAME); + printf(" failed to copy group '%s' to second file '%s'\n", + OBJECT_COPY_BETWEEN_FILES_TEST_GROUP_NAME, + OBJECT_COPY_BETWEEN_FILES_TEST_NEW_GROUP_NAME); PART_ERROR(H5Ocopy_group_between_files); } if ((object_link_exists = H5Lexists(file_id2, OBJECT_COPY_BETWEEN_FILES_TEST_NEW_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if link '%s' to copied group exists\n", - OBJECT_COPY_BETWEEN_FILES_TEST_NEW_GROUP_NAME); + printf(" couldn't determine if link '%s' to copied group exists\n", + OBJECT_COPY_BETWEEN_FILES_TEST_NEW_GROUP_NAME); PART_ERROR(H5Ocopy_group_between_files); } if (!object_link_exists) { H5_FAILED(); - HDprintf(" link '%s' to copied group in second file '%s' didn't exist!\n", - OBJECT_COPY_BETWEEN_FILES_TEST_NEW_GROUP_NAME, - OBJECT_COPY_BETWEEN_FILES_TEST_FILE_NAME); + printf(" link '%s' to copied group in second file '%s' didn't exist!\n", + OBJECT_COPY_BETWEEN_FILES_TEST_NEW_GROUP_NAME, + OBJECT_COPY_BETWEEN_FILES_TEST_FILE_NAME); PART_ERROR(H5Ocopy_group_between_files); } @@ -4415,8 +4408,7 @@ test_object_copy_between_files(void) if ((tmp_group_id = H5Gopen2(file_id2, OBJECT_COPY_BETWEEN_FILES_TEST_NEW_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" failed to open group copy '%s'\n", - OBJECT_COPY_BETWEEN_FILES_TEST_NEW_GROUP_NAME); + printf(" failed to open group copy '%s'\n", OBJECT_COPY_BETWEEN_FILES_TEST_NEW_GROUP_NAME); PART_ERROR(H5Ocopy_group_between_files); } @@ -4430,14 +4422,14 @@ test_object_copy_between_files(void) if (H5Gget_info(tmp_group_id, &group_info) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve group info\n"); + printf(" failed to retrieve group info\n"); PART_ERROR(H5Ocopy_group_between_files); } if (group_info.nlinks != OBJECT_COPY_BETWEEN_FILES_TEST_NUM_NESTED_OBJS) { H5_FAILED(); - HDprintf(" copied group contained %d members instead of %d members after a deep copy!\n", - (int)group_info.nlinks, OBJECT_COPY_BETWEEN_FILES_TEST_NUM_NESTED_OBJS); + printf(" copied group contained %d members instead of %d members after a deep copy!\n", + (int)group_info.nlinks, OBJECT_COPY_BETWEEN_FILES_TEST_NUM_NESTED_OBJS); PART_ERROR(H5Ocopy_group_between_files); } @@ -4451,13 +4443,13 @@ test_object_copy_between_files(void) if (H5Oget_info3(tmp_group_id, &object_info, H5O_INFO_ALL) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve object info\n"); + printf(" failed to retrieve object info\n"); PART_ERROR(H5Ocopy_group_between_files); } if (object_info.num_attrs == 0) { H5_FAILED(); - HDprintf(" copied group didn't contain any attributes after copy operation!\n"); + printf(" copied group didn't contain any attributes after copy operation!\n"); PART_ERROR(H5Ocopy_group_between_files); } @@ -4466,13 +4458,13 @@ test_object_copy_between_files(void) if (H5Aiterate2(tmp_group_id, H5_INDEX_NAME, H5_ITER_INC, NULL, object_copy_attribute_iter_callback, &i) < 0) { H5_FAILED(); - HDprintf(" failed to iterate over copied group's attributes\n"); + printf(" failed to iterate over copied group's attributes\n"); PART_ERROR(H5Ocopy_group_between_files); } if (i != OBJECT_COPY_BETWEEN_FILES_TEST_NUM_ATTRS) { H5_FAILED(); - HDprintf( + printf( " number of attributes on copied group (%llu) didn't match expected number (%llu)!\n", (unsigned long long)i, (unsigned long long)OBJECT_COPY_BETWEEN_FILES_TEST_NUM_ATTRS); PART_ERROR(H5Ocopy_group_between_files); @@ -4480,7 +4472,7 @@ test_object_copy_between_files(void) if (H5Gclose(tmp_group_id) < 0) { H5_FAILED(); - HDprintf(" failed to close group copy\n"); + printf(" failed to close group copy\n"); PART_ERROR(H5Ocopy_group_between_files); } @@ -4497,7 +4489,7 @@ test_object_copy_between_files(void) if ((tmp_group_id = H5Gopen2(file_id2, grp_name, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" failed to open group '%s'\n", grp_name); + printf(" failed to open group '%s'\n", grp_name); PART_ERROR(H5Ocopy_group_between_files); } @@ -4511,20 +4503,20 @@ test_object_copy_between_files(void) if (H5Gget_info(tmp_group_id, &group_info) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve group info\n"); + printf(" failed to retrieve group info\n"); PART_ERROR(H5Ocopy_group_between_files); } if (group_info.nlinks != 1) { H5_FAILED(); - HDprintf(" copied group's immediate members didn't contain nested members after a " - "deep copy!\n"); + printf(" copied group's immediate members didn't contain nested members after a " + "deep copy!\n"); PART_ERROR(H5Ocopy_group_between_files); } if (H5Gclose(tmp_group_id) < 0) { H5_FAILED(); - HDprintf(" failed to close group '%s'\n", grp_name); + printf(" failed to close group '%s'\n", grp_name); PART_ERROR(H5Ocopy_group_between_files); } } @@ -4549,25 +4541,25 @@ test_object_copy_between_files(void) if (H5Ocopy(group_id, OBJECT_COPY_BETWEEN_FILES_TEST_DSET_NAME, file_id2, OBJECT_COPY_BETWEEN_FILES_TEST_NEW_DSET_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to copy dataset '%s' to second file '%s'\n", - OBJECT_COPY_BETWEEN_FILES_TEST_DSET_NAME, - OBJECT_COPY_BETWEEN_FILES_TEST_NEW_DSET_NAME); + printf(" failed to copy dataset '%s' to second file '%s'\n", + OBJECT_COPY_BETWEEN_FILES_TEST_DSET_NAME, + OBJECT_COPY_BETWEEN_FILES_TEST_NEW_DSET_NAME); PART_ERROR(H5Ocopy_dset_between_files); } if ((object_link_exists = H5Lexists(file_id2, OBJECT_COPY_BETWEEN_FILES_TEST_NEW_DSET_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if link '%s' to copied dataset exists\n", - OBJECT_COPY_BETWEEN_FILES_TEST_NEW_DSET_NAME); + printf(" couldn't determine if link '%s' to copied dataset exists\n", + OBJECT_COPY_BETWEEN_FILES_TEST_NEW_DSET_NAME); PART_ERROR(H5Ocopy_dset_between_files); } if (!object_link_exists) { H5_FAILED(); - HDprintf(" link '%s' to copied dataset in second file '%s' didn't exist!\n", - OBJECT_COPY_BETWEEN_FILES_TEST_NEW_DSET_NAME, - OBJECT_COPY_BETWEEN_FILES_TEST_FILE_NAME); + printf(" link '%s' to copied dataset in second file '%s' didn't exist!\n", + OBJECT_COPY_BETWEEN_FILES_TEST_NEW_DSET_NAME, + OBJECT_COPY_BETWEEN_FILES_TEST_FILE_NAME); PART_ERROR(H5Ocopy_dset_between_files); } @@ -4575,8 +4567,8 @@ test_object_copy_between_files(void) if ((tmp_dset_id = H5Dopen2(file_id2, OBJECT_COPY_BETWEEN_FILES_TEST_NEW_DSET_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" failed to open dataset copy '%s'\n", - OBJECT_COPY_BETWEEN_FILES_TEST_NEW_DSET_NAME); + printf(" failed to open dataset copy '%s'\n", + OBJECT_COPY_BETWEEN_FILES_TEST_NEW_DSET_NAME); PART_ERROR(H5Ocopy_dset_between_files); } @@ -4590,13 +4582,13 @@ test_object_copy_between_files(void) if (H5Oget_info3(tmp_dset_id, &object_info, H5O_INFO_ALL) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve object info\n"); + printf(" failed to retrieve object info\n"); PART_ERROR(H5Ocopy_dset_between_files); } if (object_info.num_attrs == 0) { H5_FAILED(); - HDprintf(" copied dataset didn't contain any attributes after copy operation!\n"); + printf(" copied dataset didn't contain any attributes after copy operation!\n"); PART_ERROR(H5Ocopy_dset_between_files); } @@ -4605,21 +4597,21 @@ test_object_copy_between_files(void) if (H5Aiterate2(tmp_dset_id, H5_INDEX_NAME, H5_ITER_INC, NULL, object_copy_attribute_iter_callback, &i) < 0) { H5_FAILED(); - HDprintf(" failed to iterate over copied dataset's attributes\n"); + printf(" failed to iterate over copied dataset's attributes\n"); PART_ERROR(H5Ocopy_dset_between_files); } if (i != OBJECT_COPY_BETWEEN_FILES_TEST_NUM_ATTRS) { H5_FAILED(); - HDprintf(" number of attributes on copied dataset (%llu) didn't match expected number " - "(%llu)!\n", - (unsigned long long)i, (unsigned long long)OBJECT_COPY_BETWEEN_FILES_TEST_NUM_ATTRS); + printf(" number of attributes on copied dataset (%llu) didn't match expected number " + "(%llu)!\n", + (unsigned long long)i, (unsigned long long)OBJECT_COPY_BETWEEN_FILES_TEST_NUM_ATTRS); PART_ERROR(H5Ocopy_dset_between_files); } if (H5Dclose(tmp_dset_id) < 0) { H5_FAILED(); - HDprintf(" failed to close dataset copy\n"); + printf(" failed to close dataset copy\n"); PART_ERROR(H5Ocopy_dset_between_files); } @@ -4643,25 +4635,25 @@ test_object_copy_between_files(void) if (H5Ocopy(group_id, OBJECT_COPY_BETWEEN_FILES_TEST_DTYPE_NAME, file_id2, OBJECT_COPY_BETWEEN_FILES_TEST_NEW_DTYPE_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" failed to copy committed datatype '%s' to second file '%s'\n", - OBJECT_COPY_BETWEEN_FILES_TEST_DTYPE_NAME, - OBJECT_COPY_BETWEEN_FILES_TEST_NEW_DTYPE_NAME); + printf(" failed to copy committed datatype '%s' to second file '%s'\n", + OBJECT_COPY_BETWEEN_FILES_TEST_DTYPE_NAME, + OBJECT_COPY_BETWEEN_FILES_TEST_NEW_DTYPE_NAME); PART_ERROR(H5Ocopy_dtype_between_files); } if ((object_link_exists = H5Lexists(file_id2, OBJECT_COPY_BETWEEN_FILES_TEST_NEW_DTYPE_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't determine if link '%s' to copied committed datatype exists\n", - OBJECT_COPY_BETWEEN_FILES_TEST_NEW_DTYPE_NAME); + printf(" couldn't determine if link '%s' to copied committed datatype exists\n", + OBJECT_COPY_BETWEEN_FILES_TEST_NEW_DTYPE_NAME); PART_ERROR(H5Ocopy_dtype_between_files); } if (!object_link_exists) { H5_FAILED(); - HDprintf(" link '%s' to copied committed datatype in second file '%s' didn't exist!\n", - OBJECT_COPY_BETWEEN_FILES_TEST_NEW_DTYPE_NAME, - OBJECT_COPY_BETWEEN_FILES_TEST_FILE_NAME); + printf(" link '%s' to copied committed datatype in second file '%s' didn't exist!\n", + OBJECT_COPY_BETWEEN_FILES_TEST_NEW_DTYPE_NAME, + OBJECT_COPY_BETWEEN_FILES_TEST_FILE_NAME); PART_ERROR(H5Ocopy_dtype_between_files); } @@ -4670,8 +4662,8 @@ test_object_copy_between_files(void) if ((tmp_dtype_id = H5Topen2(file_id2, OBJECT_COPY_BETWEEN_FILES_TEST_NEW_DTYPE_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" failed to open committed datatype copy '%s'\n", - OBJECT_COPY_BETWEEN_FILES_TEST_NEW_DTYPE_NAME); + printf(" failed to open committed datatype copy '%s'\n", + OBJECT_COPY_BETWEEN_FILES_TEST_NEW_DTYPE_NAME); PART_ERROR(H5Ocopy_dtype_between_files); } @@ -4685,14 +4677,13 @@ test_object_copy_between_files(void) if (H5Oget_info3(tmp_dtype_id, &object_info, H5O_INFO_ALL) < 0) { H5_FAILED(); - HDprintf(" failed to retrieve object info\n"); + printf(" failed to retrieve object info\n"); PART_ERROR(H5Ocopy_dtype_between_files); } if (object_info.num_attrs == 0) { H5_FAILED(); - HDprintf( - " copied committed datatype didn't contain any attributes after copy operation!\n"); + printf(" copied committed datatype didn't contain any attributes after copy operation!\n"); PART_ERROR(H5Ocopy_dtype_between_files); } @@ -4701,21 +4692,21 @@ test_object_copy_between_files(void) if (H5Aiterate2(tmp_dtype_id, H5_INDEX_NAME, H5_ITER_INC, NULL, object_copy_attribute_iter_callback, &i) < 0) { H5_FAILED(); - HDprintf(" failed to iterate over copied datatype's attributes\n"); + printf(" failed to iterate over copied datatype's attributes\n"); PART_ERROR(H5Ocopy_dtype_between_files); } if (i != OBJECT_COPY_BETWEEN_FILES_TEST_NUM_ATTRS) { H5_FAILED(); - HDprintf(" number of attributes on copied datatype (%llu) didn't match expected number " - "(%llu)!\n", - (unsigned long long)i, (unsigned long long)OBJECT_COPY_BETWEEN_FILES_TEST_NUM_ATTRS); + printf(" number of attributes on copied datatype (%llu) didn't match expected number " + "(%llu)!\n", + (unsigned long long)i, (unsigned long long)OBJECT_COPY_BETWEEN_FILES_TEST_NUM_ATTRS); PART_ERROR(H5Ocopy_dtype_between_files); } if (H5Tclose(tmp_dtype_id) < 0) { H5_FAILED(); - HDprintf(" failed to close committed datatype copy\n"); + printf(" failed to close committed datatype copy\n"); PART_ERROR(H5Ocopy_dtype_between_files); } @@ -4803,7 +4794,7 @@ test_object_copy_invalid_params(void) if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_OBJECT_MORE)) { SKIPPED(); - HDprintf(" API functions for basic file, group, or object aren't supported with this connector\n"); + printf(" API functions for basic file, group, or object aren't supported with this connector\n"); return 0; } @@ -4811,28 +4802,28 @@ test_object_copy_invalid_params(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, OBJECT_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", OBJECT_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", OBJECT_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, OBJECT_COPY_INVALID_PARAMS_TEST_SUBGROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container subgroup '%s'\n", - OBJECT_COPY_INVALID_PARAMS_TEST_SUBGROUP_NAME); + printf(" couldn't create container subgroup '%s'\n", + OBJECT_COPY_INVALID_PARAMS_TEST_SUBGROUP_NAME); goto error; } if ((group_id2 = H5Gcreate2(group_id, OBJECT_COPY_INVALID_PARAMS_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create group '%s'\n", OBJECT_COPY_INVALID_PARAMS_TEST_GROUP_NAME); + printf(" couldn't create group '%s'\n", OBJECT_COPY_INVALID_PARAMS_TEST_GROUP_NAME); goto error; } @@ -4853,7 +4844,7 @@ test_object_copy_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Ocopy succeeded with an invalid source location ID!\n"); + printf(" H5Ocopy succeeded with an invalid source location ID!\n"); PART_ERROR(H5Ocopy_invalid_src_loc_id); } @@ -4874,7 +4865,7 @@ test_object_copy_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Ocopy succeeded with a NULL source object name!\n"); + printf(" H5Ocopy succeeded with a NULL source object name!\n"); PART_ERROR(H5Ocopy_invalid_src_obj_name); } @@ -4887,7 +4878,7 @@ test_object_copy_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Ocopy succeeded with an invalid source object name of ''!\n"); + printf(" H5Ocopy succeeded with an invalid source object name of ''!\n"); PART_ERROR(H5Ocopy_invalid_src_obj_name); } @@ -4908,7 +4899,7 @@ test_object_copy_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Ocopy succeeded with an invalid destination location ID!\n"); + printf(" H5Ocopy succeeded with an invalid destination location ID!\n"); PART_ERROR(H5Ocopy_invalid_dst_loc_id); } @@ -4929,7 +4920,7 @@ test_object_copy_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Ocopy succeeded with a NULL destination object name!\n"); + printf(" H5Ocopy succeeded with a NULL destination object name!\n"); PART_ERROR(H5Ocopy_invalid_dst_obj_name); } @@ -4942,7 +4933,7 @@ test_object_copy_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Ocopy succeeded with an invalid destination object name of ''!\n"); + printf(" H5Ocopy succeeded with an invalid destination object name of ''!\n"); PART_ERROR(H5Ocopy_invalid_dst_obj_name); } @@ -4963,7 +4954,7 @@ test_object_copy_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Ocopy succeeded with an invalid OcpyPL!\n"); + printf(" H5Ocopy succeeded with an invalid OcpyPL!\n"); PART_ERROR(H5Ocopy_invalid_ocpypl); } @@ -4984,7 +4975,7 @@ test_object_copy_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Ocopy succeeded with an invalid LCPL!\n"); + printf(" H5Ocopy succeeded with an invalid LCPL!\n"); PART_ERROR(H5Ocopy_invalid_lcpl); } @@ -5075,8 +5066,8 @@ test_object_visit(void) !(vol_cap_flags_g & H5VL_CAP_FLAG_STORED_DATATYPES) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ITERATE) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC)) { SKIPPED(); - HDprintf(" API functions for basic file, group, object, dataset, attribute, stored datatype, or " - "iterate aren't supported with this connector\n"); + printf(" API functions for basic file, group, object, dataset, attribute, stored datatype, or " + "iterate aren't supported with this connector\n"); return 0; } @@ -5084,26 +5075,26 @@ test_object_visit(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, OBJECT_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", OBJECT_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", OBJECT_TEST_GROUP_NAME); goto error; } if ((gcpl_id = H5Pcreate(H5P_GROUP_CREATE)) < 0) { H5_FAILED(); - HDprintf(" couldn't create a GCPL\n"); + printf(" couldn't create a GCPL\n"); goto error; } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (H5Pset_link_creation_order(gcpl_id, H5P_CRT_ORDER_TRACKED | H5P_CRT_ORDER_INDEXED) < 0) { H5_FAILED(); - HDprintf(" couldn't enable link creation order tracking and indexing on GCPL\n"); + printf(" couldn't enable link creation order tracking and indexing on GCPL\n"); goto error; } } @@ -5111,7 +5102,7 @@ test_object_visit(void) if ((group_id = H5Gcreate2(container_group, OBJECT_VISIT_TEST_SUBGROUP_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container sub-group '%s'\n", OBJECT_VISIT_TEST_SUBGROUP_NAME); + printf(" couldn't create container sub-group '%s'\n", OBJECT_VISIT_TEST_SUBGROUP_NAME); goto error; } @@ -5123,28 +5114,28 @@ test_object_visit(void) if ((type_id = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) { H5_FAILED(); - HDprintf(" couldn't create datatype '%s'\n", OBJECT_VISIT_TEST_TYPE_NAME); + printf(" couldn't create datatype '%s'\n", OBJECT_VISIT_TEST_TYPE_NAME); goto error; } if ((group_id2 = H5Gcreate2(group_id, OBJECT_VISIT_TEST_GROUP_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create group '%s'\n", OBJECT_VISIT_TEST_GROUP_NAME); + printf(" couldn't create group '%s'\n", OBJECT_VISIT_TEST_GROUP_NAME); goto error; } if ((dset_id = H5Dcreate2(group_id, OBJECT_VISIT_TEST_DSET_NAME, dset_dtype, fspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create dataset '%s'\n", OBJECT_VISIT_TEST_DSET_NAME); + printf(" couldn't create dataset '%s'\n", OBJECT_VISIT_TEST_DSET_NAME); goto error; } if (H5Tcommit2(group_id, OBJECT_VISIT_TEST_TYPE_NAME, type_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't commit datatype '%s'\n", OBJECT_VISIT_TEST_TYPE_NAME); + printf(" couldn't commit datatype '%s'\n", OBJECT_VISIT_TEST_TYPE_NAME); goto error; } @@ -5168,13 +5159,13 @@ test_object_visit(void) if (H5Ovisit3(group_id, H5_INDEX_NAME, H5_ITER_INC, object_visit_callback, &i, H5O_INFO_ALL) < 0) { H5_FAILED(); - HDprintf(" H5Ovisit by object name in increasing order failed\n"); + printf(" H5Ovisit by object name in increasing order failed\n"); PART_ERROR(H5Ovisit_obj_name_increasing); } if (i != OBJECT_VISIT_TEST_NUM_OBJS_VISITED) { H5_FAILED(); - HDprintf(" some objects were not visited!\n"); + printf(" some objects were not visited!\n"); PART_ERROR(H5Ovisit_obj_name_increasing); } @@ -5192,13 +5183,13 @@ test_object_visit(void) if (H5Ovisit3(group_id, H5_INDEX_NAME, H5_ITER_DEC, object_visit_callback, &i, H5O_INFO_ALL) < 0) { H5_FAILED(); - HDprintf(" H5Ovisit by object name in decreasing order failed\n"); + printf(" H5Ovisit by object name in decreasing order failed\n"); PART_ERROR(H5Ovisit_obj_name_decreasing); } if (i != 2 * OBJECT_VISIT_TEST_NUM_OBJS_VISITED) { H5_FAILED(); - HDprintf(" some objects were not visited!\n"); + printf(" some objects were not visited!\n"); PART_ERROR(H5Ovisit_obj_name_decreasing); } @@ -5212,7 +5203,7 @@ test_object_visit(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" creation order tracking isn't supported with this VOL connector\n"); + printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Ovisit_create_order_increasing); } @@ -5222,13 +5213,13 @@ test_object_visit(void) if (H5Ovisit3(group_id, H5_INDEX_CRT_ORDER, H5_ITER_INC, object_visit_callback, &i, H5O_INFO_ALL) < 0) { H5_FAILED(); - HDprintf(" H5Ovisit by creation order in increasing order failed\n"); + printf(" H5Ovisit by creation order in increasing order failed\n"); PART_ERROR(H5Ovisit_create_order_increasing); } if (i != 3 * OBJECT_VISIT_TEST_NUM_OBJS_VISITED) { H5_FAILED(); - HDprintf(" some objects were not visited!\n"); + printf(" some objects were not visited!\n"); PART_ERROR(H5Ovisit_create_order_increasing); } @@ -5242,7 +5233,7 @@ test_object_visit(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" creation order tracking isn't supported with this VOL connector\n"); + printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Ovisit_create_order_decreasing); } @@ -5252,13 +5243,13 @@ test_object_visit(void) if (H5Ovisit3(group_id, H5_INDEX_CRT_ORDER, H5_ITER_DEC, object_visit_callback, &i, H5O_INFO_ALL) < 0) { H5_FAILED(); - HDprintf(" H5Ovisit by creation order in decreasing order failed\n"); + printf(" H5Ovisit by creation order in decreasing order failed\n"); PART_ERROR(H5Ovisit_create_order_decreasing); } if (i != 4 * OBJECT_VISIT_TEST_NUM_OBJS_VISITED) { H5_FAILED(); - HDprintf(" some objects were not visited!\n"); + printf(" some objects were not visited!\n"); PART_ERROR(H5Ovisit_create_order_decreasing); } @@ -5286,7 +5277,7 @@ test_object_visit(void) if (H5Ovisit3(dset_id, H5_INDEX_NAME, H5_ITER_INC, object_visit_dset_callback, NULL, H5O_INFO_ALL) < 0) { H5_FAILED(); - HDprintf(" H5Ovisit failed\n"); + printf(" H5Ovisit failed\n"); PART_ERROR(H5Ovisit_dset); } @@ -5301,7 +5292,7 @@ test_object_visit(void) if (H5Ovisit3(type_id, H5_INDEX_NAME, H5_ITER_INC, object_visit_dtype_callback, NULL, H5O_INFO_ALL) < 0) { H5_FAILED(); - HDprintf(" H5Ovisit failed\n"); + printf(" H5Ovisit failed\n"); PART_ERROR(H5Ovisit_dtype); } @@ -5320,13 +5311,13 @@ test_object_visit(void) if (H5Ovisit_by_name3(group_id, ".", H5_INDEX_NAME, H5_ITER_INC, object_visit_callback, &i, H5O_INFO_ALL, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" H5Ovisit_by_name by object name in increasing order failed\n"); + printf(" H5Ovisit_by_name by object name in increasing order failed\n"); PART_ERROR(H5Ovisit_by_name_obj_name_increasing); } if (i != OBJECT_VISIT_TEST_NUM_OBJS_VISITED) { H5_FAILED(); - HDprintf(" some objects were not visited!\n"); + printf(" some objects were not visited!\n"); PART_ERROR(H5Ovisit_by_name_obj_name_increasing); } @@ -5336,13 +5327,13 @@ test_object_visit(void) if (H5Ovisit_by_name3(container_group, OBJECT_VISIT_TEST_SUBGROUP_NAME, H5_INDEX_NAME, H5_ITER_INC, object_visit_callback, &i, H5O_INFO_ALL, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" H5Ovisit_by_name by object name in increasing order failed\n"); + printf(" H5Ovisit_by_name by object name in increasing order failed\n"); PART_ERROR(H5Ovisit_by_name_obj_name_increasing); } if (i != OBJECT_VISIT_TEST_NUM_OBJS_VISITED) { H5_FAILED(); - HDprintf(" some objects were not visited!\n"); + printf(" some objects were not visited!\n"); PART_ERROR(H5Ovisit_by_name_obj_name_increasing); } @@ -5361,13 +5352,13 @@ test_object_visit(void) if (H5Ovisit_by_name3(group_id, ".", H5_INDEX_NAME, H5_ITER_DEC, object_visit_callback, &i, H5O_INFO_ALL, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" H5Ovisit_by_name by object name in decreasing order failed\n"); + printf(" H5Ovisit_by_name by object name in decreasing order failed\n"); PART_ERROR(H5Ovisit_by_name_obj_name_decreasing); } if (i != 2 * OBJECT_VISIT_TEST_NUM_OBJS_VISITED) { H5_FAILED(); - HDprintf(" some objects were not visited!\n"); + printf(" some objects were not visited!\n"); PART_ERROR(H5Ovisit_by_name_obj_name_decreasing); } @@ -5377,13 +5368,13 @@ test_object_visit(void) if (H5Ovisit_by_name3(container_group, OBJECT_VISIT_TEST_SUBGROUP_NAME, H5_INDEX_NAME, H5_ITER_DEC, object_visit_callback, &i, H5O_INFO_ALL, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" H5Ovisit_by_name by object name in decreasing order failed\n"); + printf(" H5Ovisit_by_name by object name in decreasing order failed\n"); PART_ERROR(H5Ovisit_by_name_obj_name_decreasing); } if (i != 2 * OBJECT_VISIT_TEST_NUM_OBJS_VISITED) { H5_FAILED(); - HDprintf(" some objects were not visited!\n"); + printf(" some objects were not visited!\n"); PART_ERROR(H5Ovisit_by_name_obj_name_decreasing); } @@ -5397,7 +5388,7 @@ test_object_visit(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" creation order tracking isn't supported with this VOL connector\n"); + printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Ovisit_by_name_create_order_increasing); } @@ -5408,13 +5399,13 @@ test_object_visit(void) if (H5Ovisit_by_name3(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, object_visit_callback, &i, H5O_INFO_ALL, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" H5Ovisit_by_name by creation order in increasing order failed\n"); + printf(" H5Ovisit_by_name by creation order in increasing order failed\n"); PART_ERROR(H5Ovisit_by_name_create_order_increasing); } if (i != 3 * OBJECT_VISIT_TEST_NUM_OBJS_VISITED) { H5_FAILED(); - HDprintf(" some objects were not visited!\n"); + printf(" some objects were not visited!\n"); PART_ERROR(H5Ovisit_by_name_create_order_increasing); } @@ -5424,13 +5415,13 @@ test_object_visit(void) if (H5Ovisit_by_name3(container_group, OBJECT_VISIT_TEST_SUBGROUP_NAME, H5_INDEX_CRT_ORDER, H5_ITER_INC, object_visit_callback, &i, H5O_INFO_ALL, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" H5Ovisit_by_name by creation order in increasing order failed\n"); + printf(" H5Ovisit_by_name by creation order in increasing order failed\n"); PART_ERROR(H5Ovisit_by_name_create_order_increasing); } if (i != 3 * OBJECT_VISIT_TEST_NUM_OBJS_VISITED) { H5_FAILED(); - HDprintf(" some objects were not visited!\n"); + printf(" some objects were not visited!\n"); PART_ERROR(H5Ovisit_by_name_create_order_increasing); } @@ -5444,7 +5435,7 @@ test_object_visit(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" creation order tracking isn't supported with this VOL connector\n"); + printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Ovisit_by_name_create_order_decreasing); } @@ -5455,13 +5446,13 @@ test_object_visit(void) if (H5Ovisit_by_name3(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, object_visit_callback, &i, H5O_INFO_ALL, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" H5Ovisit_by_name by creation order in decreasing order failed\n"); + printf(" H5Ovisit_by_name by creation order in decreasing order failed\n"); PART_ERROR(H5Ovisit_by_name_create_order_decreasing); } if (i != 4 * OBJECT_VISIT_TEST_NUM_OBJS_VISITED) { H5_FAILED(); - HDprintf(" some objects were not visited!\n"); + printf(" some objects were not visited!\n"); PART_ERROR(H5Ovisit_by_name_create_order_decreasing); } @@ -5471,13 +5462,13 @@ test_object_visit(void) if (H5Ovisit_by_name3(container_group, OBJECT_VISIT_TEST_SUBGROUP_NAME, H5_INDEX_CRT_ORDER, H5_ITER_DEC, object_visit_callback, &i, H5O_INFO_ALL, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" H5Ovisit_by_name by creation order in decreasing order failed\n"); + printf(" H5Ovisit_by_name by creation order in decreasing order failed\n"); PART_ERROR(H5Ovisit_by_name_create_order_decreasing); } if (i != 4 * OBJECT_VISIT_TEST_NUM_OBJS_VISITED) { H5_FAILED(); - HDprintf(" some objects were not visited!\n"); + printf(" some objects were not visited!\n"); PART_ERROR(H5Ovisit_by_name_create_order_decreasing); } @@ -5505,7 +5496,7 @@ test_object_visit(void) if (H5Ovisit_by_name3(group_id, OBJECT_VISIT_TEST_DSET_NAME, H5_INDEX_NAME, H5_ITER_INC, object_visit_dset_callback, NULL, H5O_INFO_ALL, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" H5Ovisit_by_name failed\n"); + printf(" H5Ovisit_by_name failed\n"); PART_ERROR(H5Ovisit_by_name_dset); } @@ -5520,7 +5511,7 @@ test_object_visit(void) if (H5Ovisit_by_name3(group_id, OBJECT_VISIT_TEST_TYPE_NAME, H5_INDEX_NAME, H5_ITER_INC, object_visit_dtype_callback, NULL, H5O_INFO_ALL, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" H5Ovisit_by_name failed\n"); + printf(" H5Ovisit_by_name failed\n"); PART_ERROR(H5Ovisit_by_name_dtype); } @@ -5599,8 +5590,8 @@ test_object_visit_soft_link(void) !(vol_cap_flags_g & H5VL_CAP_FLAG_OBJECT_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ITERATE) || !(vol_cap_flags_g & H5VL_CAP_FLAG_SOFT_LINKS)) { SKIPPED(); - HDprintf(" API functions for basic file, group, object, soft link, or iterate " - "aren't supported with this connector\n"); + printf(" API functions for basic file, group, object, soft link, or iterate " + "aren't supported with this connector\n"); return 0; } @@ -5608,26 +5599,26 @@ test_object_visit_soft_link(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, OBJECT_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", OBJECT_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", OBJECT_TEST_GROUP_NAME); goto error; } if ((gcpl_id = H5Pcreate(H5P_GROUP_CREATE)) < 0) { H5_FAILED(); - HDprintf(" couldn't create a GCPL\n"); + printf(" couldn't create a GCPL\n"); goto error; } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (H5Pset_link_creation_order(gcpl_id, H5P_CRT_ORDER_TRACKED | H5P_CRT_ORDER_INDEXED) < 0) { H5_FAILED(); - HDprintf(" couldn't enable link creation order tracking and indexing on GCPL\n"); + printf(" couldn't enable link creation order tracking and indexing on GCPL\n"); goto error; } } @@ -5635,7 +5626,7 @@ test_object_visit_soft_link(void) if ((group_id = H5Gcreate2(container_group, OBJECT_VISIT_SOFT_LINK_TEST_SUBGROUP_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container sub-group '%s'\n", OBJECT_VISIT_SOFT_LINK_TEST_SUBGROUP_NAME); + printf(" couldn't create container sub-group '%s'\n", OBJECT_VISIT_SOFT_LINK_TEST_SUBGROUP_NAME); goto error; } @@ -5643,7 +5634,7 @@ test_object_visit_soft_link(void) if ((subgroup_id = H5Gcreate2(group_id, OBJECT_VISIT_SOFT_LINK_TEST_GROUP_NAME1, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create group '%s'\n", OBJECT_VISIT_SOFT_LINK_TEST_GROUP_NAME1); + printf(" couldn't create group '%s'\n", OBJECT_VISIT_SOFT_LINK_TEST_GROUP_NAME1); goto error; } @@ -5651,7 +5642,7 @@ test_object_visit_soft_link(void) if ((subgroup_id2 = H5Gcreate2(group_id, OBJECT_VISIT_SOFT_LINK_TEST_GROUP_NAME2, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create group '%s'\n", OBJECT_VISIT_SOFT_LINK_TEST_GROUP_NAME2); + printf(" couldn't create group '%s'\n", OBJECT_VISIT_SOFT_LINK_TEST_GROUP_NAME2); goto error; } @@ -5659,45 +5650,45 @@ test_object_visit_soft_link(void) if ((linked_group_id = H5Gcreate2(subgroup_id2, OBJECT_VISIT_SOFT_LINK_TEST_OBJ_NAME1, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create group '%s'\n", OBJECT_VISIT_SOFT_LINK_TEST_OBJ_NAME1); + printf(" couldn't create group '%s'\n", OBJECT_VISIT_SOFT_LINK_TEST_OBJ_NAME1); goto error; } if (H5Gclose(linked_group_id) < 0) { H5_FAILED(); - HDprintf(" couldn't close group '%s'\n", OBJECT_VISIT_SOFT_LINK_TEST_OBJ_NAME1); + printf(" couldn't close group '%s'\n", OBJECT_VISIT_SOFT_LINK_TEST_OBJ_NAME1); goto error; } if ((linked_group_id = H5Gcreate2(subgroup_id2, OBJECT_VISIT_SOFT_LINK_TEST_OBJ_NAME2, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create group '%s'\n", OBJECT_VISIT_SOFT_LINK_TEST_OBJ_NAME2); + printf(" couldn't create group '%s'\n", OBJECT_VISIT_SOFT_LINK_TEST_OBJ_NAME2); goto error; } if (H5Gclose(linked_group_id) < 0) { H5_FAILED(); - HDprintf(" couldn't close group '%s'\n", OBJECT_VISIT_SOFT_LINK_TEST_OBJ_NAME2); + printf(" couldn't close group '%s'\n", OBJECT_VISIT_SOFT_LINK_TEST_OBJ_NAME2); goto error; } if ((linked_group_id = H5Gcreate2(subgroup_id2, OBJECT_VISIT_SOFT_LINK_TEST_OBJ_NAME3, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create group '%s'\n", OBJECT_VISIT_SOFT_LINK_TEST_OBJ_NAME3); + printf(" couldn't create group '%s'\n", OBJECT_VISIT_SOFT_LINK_TEST_OBJ_NAME3); goto error; } if (H5Gclose(linked_group_id) < 0) { H5_FAILED(); - HDprintf(" couldn't close group '%s'\n", OBJECT_VISIT_SOFT_LINK_TEST_OBJ_NAME3); + printf(" couldn't close group '%s'\n", OBJECT_VISIT_SOFT_LINK_TEST_OBJ_NAME3); goto error; } if (H5Gclose(subgroup_id2) < 0) { H5_FAILED(); - HDprintf(" couldn't close group '%s'\n", OBJECT_VISIT_SOFT_LINK_TEST_GROUP_NAME2); + printf(" couldn't close group '%s'\n", OBJECT_VISIT_SOFT_LINK_TEST_GROUP_NAME2); goto error; } @@ -5706,7 +5697,7 @@ test_object_visit_soft_link(void) "/" OBJECT_VISIT_SOFT_LINK_TEST_GROUP_NAME2 "/" OBJECT_VISIT_SOFT_LINK_TEST_OBJ_NAME1, subgroup_id, OBJECT_VISIT_SOFT_LINK_TEST_LINK_NAME1, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create soft link '%s'\n", OBJECT_VISIT_SOFT_LINK_TEST_LINK_NAME1); + printf(" couldn't create soft link '%s'\n", OBJECT_VISIT_SOFT_LINK_TEST_LINK_NAME1); goto error; } @@ -5714,7 +5705,7 @@ test_object_visit_soft_link(void) "/" OBJECT_VISIT_SOFT_LINK_TEST_GROUP_NAME2 "/" OBJECT_VISIT_SOFT_LINK_TEST_OBJ_NAME2, subgroup_id, OBJECT_VISIT_SOFT_LINK_TEST_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create soft link '%s'\n", OBJECT_VISIT_SOFT_LINK_TEST_LINK_NAME2); + printf(" couldn't create soft link '%s'\n", OBJECT_VISIT_SOFT_LINK_TEST_LINK_NAME2); goto error; } @@ -5722,7 +5713,7 @@ test_object_visit_soft_link(void) "/" OBJECT_VISIT_SOFT_LINK_TEST_GROUP_NAME2 "/" OBJECT_VISIT_SOFT_LINK_TEST_OBJ_NAME3, subgroup_id, OBJECT_VISIT_SOFT_LINK_TEST_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't create soft link '%s'\n", OBJECT_VISIT_SOFT_LINK_TEST_LINK_NAME3); + printf(" couldn't create soft link '%s'\n", OBJECT_VISIT_SOFT_LINK_TEST_LINK_NAME3); goto error; } @@ -5746,13 +5737,13 @@ test_object_visit_soft_link(void) if (H5Ovisit3(subgroup_id, H5_INDEX_NAME, H5_ITER_INC, object_visit_soft_link_callback, &i, H5O_INFO_ALL) < 0) { H5_FAILED(); - HDprintf(" H5Ovisit by object name in increasing order failed\n"); + printf(" H5Ovisit by object name in increasing order failed\n"); PART_ERROR(H5Ovisit_obj_name_increasing); } if (i != OBJECT_VISIT_SOFT_LINK_TEST_NUM_OBJS_VISITED) { H5_FAILED(); - HDprintf(" some objects were not visited!\n"); + printf(" some objects were not visited!\n"); PART_ERROR(H5Ovisit_obj_name_increasing); } @@ -5770,13 +5761,13 @@ test_object_visit_soft_link(void) if (H5Ovisit3(subgroup_id, H5_INDEX_NAME, H5_ITER_DEC, object_visit_soft_link_callback, &i, H5O_INFO_ALL) < 0) { H5_FAILED(); - HDprintf(" H5Ovisit by object name in decreasing order failed\n"); + printf(" H5Ovisit by object name in decreasing order failed\n"); PART_ERROR(H5Ovisit_obj_name_decreasing); } if (i != 2 * OBJECT_VISIT_SOFT_LINK_TEST_NUM_OBJS_VISITED) { H5_FAILED(); - HDprintf(" some objects were not visited!\n"); + printf(" some objects were not visited!\n"); PART_ERROR(H5Ovisit_obj_name_decreasing); } @@ -5790,7 +5781,7 @@ test_object_visit_soft_link(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" creation order tracking isn't supported with this VOL connector\n"); + printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Ovisit_create_order_increasing); } @@ -5800,13 +5791,13 @@ test_object_visit_soft_link(void) if (H5Ovisit3(subgroup_id, H5_INDEX_CRT_ORDER, H5_ITER_INC, object_visit_soft_link_callback, &i, H5O_INFO_ALL) < 0) { H5_FAILED(); - HDprintf(" H5Ovisit by creation order in increasing order failed\n"); + printf(" H5Ovisit by creation order in increasing order failed\n"); PART_ERROR(H5Ovisit_create_order_increasing); } if (i != 3 * OBJECT_VISIT_SOFT_LINK_TEST_NUM_OBJS_VISITED) { H5_FAILED(); - HDprintf(" some objects were not visited!\n"); + printf(" some objects were not visited!\n"); PART_ERROR(H5Ovisit_create_order_increasing); } @@ -5820,7 +5811,7 @@ test_object_visit_soft_link(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" creation order tracking isn't supported with this VOL connector\n"); + printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Ovisit_create_order_decreasing); } @@ -5830,13 +5821,13 @@ test_object_visit_soft_link(void) if (H5Ovisit3(subgroup_id, H5_INDEX_CRT_ORDER, H5_ITER_DEC, object_visit_soft_link_callback, &i, H5O_INFO_ALL) < 0) { H5_FAILED(); - HDprintf(" H5Ovisit by creation order in decreasing order failed\n"); + printf(" H5Ovisit by creation order in decreasing order failed\n"); PART_ERROR(H5Ovisit_create_order_decreasing); } if (i != 4 * OBJECT_VISIT_SOFT_LINK_TEST_NUM_OBJS_VISITED) { H5_FAILED(); - HDprintf(" some objects were not visited!\n"); + printf(" some objects were not visited!\n"); PART_ERROR(H5Ovisit_create_order_decreasing); } @@ -5855,13 +5846,13 @@ test_object_visit_soft_link(void) if (H5Ovisit_by_name3(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, object_visit_soft_link_callback, &i, H5O_INFO_ALL, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" H5Ovisit_by_name by object name in increasing order failed\n"); + printf(" H5Ovisit_by_name by object name in increasing order failed\n"); PART_ERROR(H5Ovisit_by_name_obj_name_increasing); } if (i != OBJECT_VISIT_SOFT_LINK_TEST_NUM_OBJS_VISITED) { H5_FAILED(); - HDprintf(" some objects were not visited!\n"); + printf(" some objects were not visited!\n"); PART_ERROR(H5Ovisit_by_name_obj_name_increasing); } @@ -5873,13 +5864,13 @@ test_object_visit_soft_link(void) H5_ITER_INC, object_visit_soft_link_callback, &i, H5O_INFO_ALL, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" H5Ovisit_by_name by object name in increasing order failed\n"); + printf(" H5Ovisit_by_name by object name in increasing order failed\n"); PART_ERROR(H5Ovisit_by_name_obj_name_increasing); } if (i != OBJECT_VISIT_SOFT_LINK_TEST_NUM_OBJS_VISITED) { H5_FAILED(); - HDprintf(" some objects were not visited!\n"); + printf(" some objects were not visited!\n"); PART_ERROR(H5Ovisit_by_name_obj_name_increasing); } @@ -5898,13 +5889,13 @@ test_object_visit_soft_link(void) if (H5Ovisit_by_name3(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, object_visit_soft_link_callback, &i, H5O_INFO_ALL, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" H5Ovisit_by_name by object name in decreasing order failed\n"); + printf(" H5Ovisit_by_name by object name in decreasing order failed\n"); PART_ERROR(H5Ovisit_by_name_obj_name_decreasing); } if (i != 2 * OBJECT_VISIT_SOFT_LINK_TEST_NUM_OBJS_VISITED) { H5_FAILED(); - HDprintf(" some objects were not visited!\n"); + printf(" some objects were not visited!\n"); PART_ERROR(H5Ovisit_by_name_obj_name_decreasing); } @@ -5916,13 +5907,13 @@ test_object_visit_soft_link(void) H5_ITER_DEC, object_visit_soft_link_callback, &i, H5O_INFO_ALL, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" H5Ovisit_by_name by object name in decreasing order failed\n"); + printf(" H5Ovisit_by_name by object name in decreasing order failed\n"); PART_ERROR(H5Ovisit_by_name_obj_name_decreasing); } if (i != 2 * OBJECT_VISIT_SOFT_LINK_TEST_NUM_OBJS_VISITED) { H5_FAILED(); - HDprintf(" some objects were not visited!\n"); + printf(" some objects were not visited!\n"); PART_ERROR(H5Ovisit_by_name_obj_name_decreasing); } @@ -5936,7 +5927,7 @@ test_object_visit_soft_link(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" creation order tracking isn't supported with this VOL connector\n"); + printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Ovisit_by_name_create_order_increasing); } @@ -5947,13 +5938,13 @@ test_object_visit_soft_link(void) if (H5Ovisit_by_name3(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, object_visit_soft_link_callback, &i, H5O_INFO_ALL, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" H5Ovisit_by_name by creation order in increasing order failed\n"); + printf(" H5Ovisit_by_name by creation order in increasing order failed\n"); PART_ERROR(H5Ovisit_by_name_create_order_increasing); } if (i != 3 * OBJECT_VISIT_SOFT_LINK_TEST_NUM_OBJS_VISITED) { H5_FAILED(); - HDprintf(" some objects were not visited!\n"); + printf(" some objects were not visited!\n"); PART_ERROR(H5Ovisit_by_name_create_order_increasing); } @@ -5965,13 +5956,13 @@ test_object_visit_soft_link(void) H5_ITER_INC, object_visit_soft_link_callback, &i, H5O_INFO_ALL, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" H5Ovisit_by_name by creation order in increasing order failed\n"); + printf(" H5Ovisit_by_name by creation order in increasing order failed\n"); PART_ERROR(H5Ovisit_by_name_create_order_increasing); } if (i != 3 * OBJECT_VISIT_SOFT_LINK_TEST_NUM_OBJS_VISITED) { H5_FAILED(); - HDprintf(" some objects were not visited!\n"); + printf(" some objects were not visited!\n"); PART_ERROR(H5Ovisit_by_name_create_order_increasing); } @@ -5985,7 +5976,7 @@ test_object_visit_soft_link(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { SKIPPED(); - HDprintf(" creation order tracking isn't supported with this VOL connector\n"); + printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Ovisit_by_name_create_order_decreasing); } @@ -5996,13 +5987,13 @@ test_object_visit_soft_link(void) if (H5Ovisit_by_name3(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, object_visit_soft_link_callback, &i, H5O_INFO_ALL, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" H5Ovisit_by_name by creation order in decreasing order failed\n"); + printf(" H5Ovisit_by_name by creation order in decreasing order failed\n"); PART_ERROR(H5Ovisit_by_name_create_order_decreasing); } if (i != 4 * OBJECT_VISIT_SOFT_LINK_TEST_NUM_OBJS_VISITED) { H5_FAILED(); - HDprintf(" some objects were not visited!\n"); + printf(" some objects were not visited!\n"); PART_ERROR(H5Ovisit_by_name_create_order_decreasing); } @@ -6014,13 +6005,13 @@ test_object_visit_soft_link(void) H5_ITER_DEC, object_visit_soft_link_callback, &i, H5O_INFO_ALL, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" H5Ovisit_by_name by creation order in decreasing order failed\n"); + printf(" H5Ovisit_by_name by creation order in decreasing order failed\n"); PART_ERROR(H5Ovisit_by_name_create_order_decreasing); } if (i != 4 * OBJECT_VISIT_SOFT_LINK_TEST_NUM_OBJS_VISITED) { H5_FAILED(); - HDprintf(" some objects were not visited!\n"); + printf(" some objects were not visited!\n"); PART_ERROR(H5Ovisit_by_name_create_order_decreasing); } @@ -6081,8 +6072,7 @@ test_object_visit_invalid_params(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ITERATE)) { SKIPPED(); - HDprintf( - " API functions for basic file, group, or iterate aren't supported with this connector\n"); + printf(" API functions for basic file, group, or iterate aren't supported with this connector\n"); return 0; } @@ -6090,28 +6080,28 @@ test_object_visit_invalid_params(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, OBJECT_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", OBJECT_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", OBJECT_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, OBJECT_VISIT_INVALID_PARAMS_TEST_SUBGROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container sub-group '%s'\n", - OBJECT_VISIT_INVALID_PARAMS_TEST_SUBGROUP_NAME); + printf(" couldn't create container sub-group '%s'\n", + OBJECT_VISIT_INVALID_PARAMS_TEST_SUBGROUP_NAME); goto error; } if ((group_id2 = H5Gcreate2(group_id, OBJECT_VISIT_INVALID_PARAMS_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create group '%s'\n", OBJECT_VISIT_INVALID_PARAMS_TEST_GROUP_NAME); + printf(" couldn't create group '%s'\n", OBJECT_VISIT_INVALID_PARAMS_TEST_GROUP_NAME); goto error; } @@ -6132,7 +6122,7 @@ test_object_visit_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Ovisit succeeded with an invalid object ID!\n"); + printf(" H5Ovisit succeeded with an invalid object ID!\n"); PART_ERROR(H5Ovisit_invalid_obj_id); } @@ -6153,7 +6143,7 @@ test_object_visit_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Ovisit succeeded with invalid index type H5_INDEX_UNKNOWN!\n"); + printf(" H5Ovisit succeeded with invalid index type H5_INDEX_UNKNOWN!\n"); PART_ERROR(H5Ovisit_invalid_index_type); } @@ -6166,7 +6156,7 @@ test_object_visit_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Ovisit succeeded with invalid index type H5_INDEX_N!\n"); + printf(" H5Ovisit succeeded with invalid index type H5_INDEX_N!\n"); PART_ERROR(H5Ovisit_invalid_index_type); } @@ -6187,7 +6177,7 @@ test_object_visit_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Ovisit succeeded with invalid iteration ordering H5_ITER_UNKNOWN!\n"); + printf(" H5Ovisit succeeded with invalid iteration ordering H5_ITER_UNKNOWN!\n"); PART_ERROR(H5Ovisit_invalid_iter_order); } @@ -6200,7 +6190,7 @@ test_object_visit_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Ovisit succeeded with invalid iteration ordering H5_ITER_N!\n"); + printf(" H5Ovisit succeeded with invalid iteration ordering H5_ITER_N!\n"); PART_ERROR(H5Ovisit_invalid_iter_order); } @@ -6221,7 +6211,7 @@ test_object_visit_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Ovisit_by_name succeeded with an invalid location ID!\n"); + printf(" H5Ovisit_by_name succeeded with an invalid location ID!\n"); PART_ERROR(H5Ovisit_by_name_invalid_loc_id); } @@ -6242,7 +6232,7 @@ test_object_visit_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Ovisit_by_name succeeded with a NULL object name!\n"); + printf(" H5Ovisit_by_name succeeded with a NULL object name!\n"); PART_ERROR(H5Ovisit_by_name_invalid_obj_name); } @@ -6255,7 +6245,7 @@ test_object_visit_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Ovisit_by_name succeeded with an invalid object name of ''!\n"); + printf(" H5Ovisit_by_name succeeded with an invalid object name of ''!\n"); PART_ERROR(H5Ovisit_by_name_invalid_obj_name); } @@ -6276,7 +6266,7 @@ test_object_visit_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Ovisit_by_name succeeded with invalid index type H5_INDEX_UNKNOWN!\n"); + printf(" H5Ovisit_by_name succeeded with invalid index type H5_INDEX_UNKNOWN!\n"); PART_ERROR(H5Ovisit_by_name_invalid_index_type); } @@ -6289,7 +6279,7 @@ test_object_visit_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Ovisit_by_name succeeded with invalid index type H5_INDEX_N!\n"); + printf(" H5Ovisit_by_name succeeded with invalid index type H5_INDEX_N!\n"); PART_ERROR(H5Ovisit_by_name_invalid_index_type); } @@ -6310,7 +6300,7 @@ test_object_visit_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Ovisit_by_name succeeded with invalid iteration ordering H5_ITER_UNKNOWN!\n"); + printf(" H5Ovisit_by_name succeeded with invalid iteration ordering H5_ITER_UNKNOWN!\n"); PART_ERROR(H5Ovisit_by_name_invalid_iter_order); } @@ -6323,7 +6313,7 @@ test_object_visit_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Ovisit_by_name succeeded with invalid iteration ordering H5_ITER_N!\n"); + printf(" H5Ovisit_by_name succeeded with invalid iteration ordering H5_ITER_N!\n"); PART_ERROR(H5Ovisit_by_name_invalid_iter_order); } @@ -6344,7 +6334,7 @@ test_object_visit_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Ovisit_by_name succeeded with an invalid LAPL!\n"); + printf(" H5Ovisit_by_name succeeded with an invalid LAPL!\n"); PART_ERROR(H5Ovisit_by_name_invalid_lapl); } @@ -6404,8 +6394,8 @@ test_close_object(void) !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_STORED_DATATYPES)) { SKIPPED(); - HDprintf(" API functions for basic file, group, object, dataset, attribute, or stored datatype " - "aren't supported with this connector\n"); + printf(" API functions for basic file, group, object, dataset, attribute, or stored datatype " + "aren't supported with this connector\n"); return 0; } @@ -6413,20 +6403,20 @@ test_close_object(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, OBJECT_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", OBJECT_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", OBJECT_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, OBJECT_CLOSE_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container subgroup '%s'\n", OBJECT_CLOSE_TEST_GROUP_NAME); + printf(" couldn't create container subgroup '%s'\n", OBJECT_CLOSE_TEST_GROUP_NAME); goto error; } @@ -6447,7 +6437,7 @@ test_close_object(void) if ((group_id2 = H5Gcreate2(group_id, OBJECT_CLOSE_TEST_GRP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create group '%s'\n", OBJECT_CLOSE_TEST_GRP_NAME); + printf(" couldn't create group '%s'\n", OBJECT_CLOSE_TEST_GRP_NAME); PART_ERROR(H5Oclose_group); } @@ -6459,13 +6449,13 @@ test_close_object(void) if ((group_id2 = H5Oopen(group_id, OBJECT_CLOSE_TEST_GRP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open group '%s' with H5Oopen\n", OBJECT_CLOSE_TEST_GRP_NAME); + printf(" couldn't open group '%s' with H5Oopen\n", OBJECT_CLOSE_TEST_GRP_NAME); PART_ERROR(H5Oclose_group); } if (H5Oclose(group_id2) < 0) { H5_FAILED(); - HDprintf(" couldn't close group '%s' with H5Oclose\n", OBJECT_CLOSE_TEST_GRP_NAME); + printf(" couldn't close group '%s' with H5Oclose\n", OBJECT_CLOSE_TEST_GRP_NAME); PART_ERROR(H5Oclose_group); } @@ -6480,7 +6470,7 @@ test_close_object(void) if ((dset_id = H5Dcreate2(group_id, OBJECT_CLOSE_TEST_DSET_NAME, dset_dtype, fspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create dataset '%s'\n", OBJECT_CLOSE_TEST_DSET_NAME); + printf(" couldn't create dataset '%s'\n", OBJECT_CLOSE_TEST_DSET_NAME); PART_ERROR(H5Oclose_dset); } @@ -6492,13 +6482,13 @@ test_close_object(void) if ((dset_id = H5Oopen(group_id, OBJECT_CLOSE_TEST_DSET_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open dataset '%s' with H5Oopen\n", OBJECT_CLOSE_TEST_DSET_NAME); + printf(" couldn't open dataset '%s' with H5Oopen\n", OBJECT_CLOSE_TEST_DSET_NAME); PART_ERROR(H5Oclose_dset); } if (H5Oclose(dset_id) < 0) { H5_FAILED(); - HDprintf(" couldn't close dataset '%s' with H5Oclose\n", OBJECT_CLOSE_TEST_DSET_NAME); + printf(" couldn't close dataset '%s' with H5Oclose\n", OBJECT_CLOSE_TEST_DSET_NAME); PART_ERROR(H5Oclose_dset); } @@ -6512,14 +6502,14 @@ test_close_object(void) if ((dtype_id = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) { H5_FAILED(); - HDprintf(" couldn't create datatype '%s'\n", OBJECT_CLOSE_TEST_TYPE_NAME); + printf(" couldn't create datatype '%s'\n", OBJECT_CLOSE_TEST_TYPE_NAME); PART_ERROR(H5Oclose_dtype); } if (H5Tcommit2(group_id, OBJECT_CLOSE_TEST_TYPE_NAME, dtype_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" couldn't commit datatype '%s'\n", OBJECT_CLOSE_TEST_TYPE_NAME); + printf(" couldn't commit datatype '%s'\n", OBJECT_CLOSE_TEST_TYPE_NAME); PART_ERROR(H5Oclose_dtype); } @@ -6531,13 +6521,13 @@ test_close_object(void) if ((dtype_id = H5Oopen(group_id, OBJECT_CLOSE_TEST_TYPE_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open datatype '%s' with H5Oopen\n", OBJECT_CLOSE_TEST_TYPE_NAME); + printf(" couldn't open datatype '%s' with H5Oopen\n", OBJECT_CLOSE_TEST_TYPE_NAME); PART_ERROR(H5Oclose_dtype); } if (H5Oclose(dtype_id) < 0) { H5_FAILED(); - HDprintf(" couldn't close datatype '%s' with H5Oclose\n", OBJECT_CLOSE_TEST_TYPE_NAME); + printf(" couldn't close datatype '%s' with H5Oclose\n", OBJECT_CLOSE_TEST_TYPE_NAME); PART_ERROR(H5Oclose_dtype); } @@ -6596,13 +6586,13 @@ test_close_object_invalid_params(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_OBJECT_BASIC)) { SKIPPED(); - HDprintf(" API functions for basic file or object aren't supported with this connector\n"); + printf(" API functions for basic file or object aren't supported with this connector\n"); return 0; } if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } @@ -6614,7 +6604,7 @@ test_close_object_invalid_params(void) if (err_ret >= 0) { H5_FAILED(); - HDprintf(" H5Oclose succeeded with an invalid object ID!\n"); + printf(" H5Oclose succeeded with an invalid object ID!\n"); goto error; } @@ -6656,8 +6646,8 @@ test_close_invalid_objects(void) if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_OBJECT_BASIC)) { SKIPPED(); - HDprintf(" API functions for basic file, group, or object " - "aren't supported with this connector\n"); + printf(" API functions for basic file, group, or object " + "aren't supported with this connector\n"); return 0; } @@ -6668,20 +6658,20 @@ test_close_invalid_objects(void) if ((file_id = H5Fopen(H5_api_test_filename, H5F_ACC_RDWR, fapl_id)) < 0) { H5_FAILED(); - HDprintf(" couldn't open file '%s'\n", H5_api_test_filename); + printf(" couldn't open file '%s'\n", H5_api_test_filename); goto error; } if ((container_group = H5Gopen2(file_id, OBJECT_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't open container group '%s'\n", OBJECT_TEST_GROUP_NAME); + printf(" couldn't open container group '%s'\n", OBJECT_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, OBJECT_CLOSE_INVALID_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" couldn't create container sub-group '%s'\n", OBJECT_OPEN_TEST_GROUP_NAME); + printf(" couldn't create container sub-group '%s'\n", OBJECT_OPEN_TEST_GROUP_NAME); goto error; } @@ -6712,7 +6702,7 @@ test_close_invalid_objects(void) if (status >= 0) { H5_FAILED(); - HDprintf(" H5Oclose succeeded with an invalid object (file)!\n"); + printf(" H5Oclose succeeded with an invalid object (file)!\n"); PART_ERROR(H5Oclose_file); } @@ -6732,7 +6722,7 @@ test_close_invalid_objects(void) if (status >= 0) { H5_FAILED(); - HDprintf(" H5Oclose succeeded with an invalid object (property list)!\n"); + printf(" H5Oclose succeeded with an invalid object (property list)!\n"); PART_ERROR(H5Oclose_plist); } @@ -6752,7 +6742,7 @@ test_close_invalid_objects(void) if (status >= 0) { H5_FAILED(); - HDprintf(" H5Oclose succeeded with an invalid object (data space)!\n"); + printf(" H5Oclose succeeded with an invalid object (data space)!\n"); PART_ERROR(H5Oclose_dspace); } @@ -6772,7 +6762,7 @@ test_close_invalid_objects(void) if (status >= 0) { H5_FAILED(); - HDprintf(" H5Oclose succeeded with an invalid object (attribute)!\n"); + printf(" H5Oclose succeeded with an invalid object (attribute)!\n"); PART_ERROR(H5Oclose_attribute); } @@ -6894,31 +6884,31 @@ object_copy_attribute_iter_callback(hid_t location_id, const char *attr_name, co snprintf(expected_name, 256, "attr%d", (int)(*counter)); if (HDstrncmp(attr_name, expected_name, 256)) { - HDprintf(" attribute name '%s' did not match expected name '%s'\n", attr_name, expected_name); + printf(" attribute name '%s' did not match expected name '%s'\n", attr_name, expected_name); ret_value = H5_ITER_ERROR; goto done; } if ((attr_id = H5Aopen(location_id, attr_name, H5P_DEFAULT)) < 0) { - HDprintf(" failed to open attribute '%s'\n", attr_name); + printf(" failed to open attribute '%s'\n", attr_name); ret_value = H5_ITER_ERROR; goto done; } if ((attr_type = H5Aget_type(attr_id)) < 0) { - HDprintf(" failed to retrieve attribute's datatype\n"); + printf(" failed to retrieve attribute's datatype\n"); ret_value = H5_ITER_ERROR; goto done; } if ((types_equal = H5Tequal(attr_type, H5T_NATIVE_INT)) < 0) { - HDprintf(" failed to determine if attribute's datatype matched what is expected\n"); + printf(" failed to determine if attribute's datatype matched what is expected\n"); ret_value = H5_ITER_ERROR; goto done; } if (!types_equal) { - HDprintf(" attribute datatype did not match expected H5T_NATIVE_INT\n"); + printf(" attribute datatype did not match expected H5T_NATIVE_INT\n"); ret_value = H5_ITER_ERROR; goto done; } @@ -6950,20 +6940,20 @@ object_copy_soft_link_non_expand_callback(hid_t group, const char *name, const H /* Make sure the link type is soft */ if (H5L_TYPE_SOFT != info->type) { - HDprintf(" link type was not H5L_TYPE_SOFT; link must have been expanded!\n"); + printf(" link type was not H5L_TYPE_SOFT; link must have been expanded!\n"); ret_value = H5_ITER_ERROR; goto done; } if (NULL == (link_val_buf = calloc(1, info->u.val_size))) { - HDprintf(" failed to allocate buffer for link value\n"); + printf(" failed to allocate buffer for link value\n"); ret_value = H5_ITER_ERROR; goto done; } /* Retrieve the link's value */ if (H5Lget_val(group, name, link_val_buf, info->u.val_size, H5P_DEFAULT) < 0) { - HDprintf(" failed to retrieve value of link '%s'\n", name); + printf(" failed to retrieve value of link '%s'\n", name); ret_value = H5_ITER_ERROR; goto done; } @@ -6974,8 +6964,8 @@ object_copy_soft_link_non_expand_callback(hid_t group, const char *name, const H (int)(*counter)); if (strncmp(link_val_buf, expected_link_val, OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_BUF_SIZE)) { - HDprintf(" value '%s' for link '%s' did not match expected value '%s'\n", (char *)link_val_buf, - name, expected_link_val); + printf(" value '%s' for link '%s' did not match expected value '%s'\n", (char *)link_val_buf, name, + expected_link_val); ret_value = H5_ITER_ERROR; goto done; } @@ -7005,7 +6995,7 @@ object_copy_soft_link_expand_callback(hid_t group, const char *name, const H5L_i /* Make sure the link type is hard */ if (H5L_TYPE_HARD != info->type) { - HDprintf(" link type was not H5L_TYPE_HARD; link must not have been expanded!\n"); + printf(" link type was not H5L_TYPE_HARD; link must not have been expanded!\n"); ret_value = H5_ITER_ERROR; goto done; } @@ -7014,7 +7004,7 @@ object_copy_soft_link_expand_callback(hid_t group, const char *name, const H5L_i snprintf(expected_link_name, OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_BUF_SIZE, "link%d", (int)(*counter)); if (strncmp(name, expected_link_name, OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_BUF_SIZE)) { - HDprintf(" link name '%s' did not match expected name '%s'\n", name, expected_link_name); + printf(" link name '%s' did not match expected name '%s'\n", name, expected_link_name); ret_value = H5_ITER_ERROR; goto done; } @@ -7043,31 +7033,31 @@ object_visit_callback(hid_t o_id, const char *name, const H5O_info2_t *object_in if (H5O_TYPE_GROUP == object_info->type) goto done; else - HDprintf(" type for object '%s' was not H5O_TYPE_GROUP\n", name); + printf(" type for object '%s' was not H5O_TYPE_GROUP\n", name); } else if (!HDstrncmp(name, OBJECT_VISIT_TEST_GROUP_NAME, strlen(OBJECT_VISIT_TEST_GROUP_NAME) + 1) && (counter_val == 2 || counter_val == 6 || counter_val == 9 || counter_val == 15)) { if (H5O_TYPE_GROUP == object_info->type) goto done; else - HDprintf(" type for object '%s' was not H5O_TYPE_GROUP\n", name); + printf(" type for object '%s' was not H5O_TYPE_GROUP\n", name); } else if (!HDstrncmp(name, OBJECT_VISIT_TEST_DSET_NAME, strlen(OBJECT_VISIT_TEST_DSET_NAME) + 1) && (counter_val == 1 || counter_val == 7 || counter_val == 10 || counter_val == 14)) { if (H5O_TYPE_DATASET == object_info->type) goto done; else - HDprintf(" type for object '%s' was not H5O_TYPE_DATASET\n", name); + printf(" type for object '%s' was not H5O_TYPE_DATASET\n", name); } else if (!HDstrncmp(name, OBJECT_VISIT_TEST_TYPE_NAME, strlen(OBJECT_VISIT_TEST_TYPE_NAME) + 1) && (counter_val == 3 || counter_val == 5 || counter_val == 11 || counter_val == 13)) { if (H5O_TYPE_NAMED_DATATYPE == object_info->type) goto done; else - HDprintf(" type for object '%s' was not H5O_TYPE_NAMED_DATATYPE\n", name); + printf(" type for object '%s' was not H5O_TYPE_NAMED_DATATYPE\n", name); } else - HDprintf(" object '%s' didn't match known names or came in an incorrect order\n", name); + printf(" object '%s' didn't match known names or came in an incorrect order\n", name); ret_val = -1; @@ -7089,12 +7079,12 @@ object_visit_dset_callback(hid_t o_id, const char *name, const H5O_info2_t *obje UNUSED(op_data); if (HDstrncmp(name, ".", strlen(".") + 1)) { - HDprintf(" object '%s' didn't match known names\n", name); + printf(" object '%s' didn't match known names\n", name); return -1; } if (H5O_TYPE_DATASET != object_info->type) { - HDprintf(" object type was not H5O_TYPE_DATASET\n"); + printf(" object type was not H5O_TYPE_DATASET\n"); return -1; } @@ -7113,12 +7103,12 @@ object_visit_dtype_callback(hid_t o_id, const char *name, const H5O_info2_t *obj UNUSED(op_data); if (HDstrncmp(name, ".", strlen(".") + 1)) { - HDprintf(" object '%s' didn't match known names\n", name); + printf(" object '%s' didn't match known names\n", name); return -1; } if (H5O_TYPE_NAMED_DATATYPE != object_info->type) { - HDprintf(" object type was not H5O_TYPE_NAMED_DATATYPE\n"); + printf(" object type was not H5O_TYPE_NAMED_DATATYPE\n"); return -1; } @@ -7142,10 +7132,10 @@ object_visit_soft_link_callback(hid_t o_id, const char *name, const H5O_info2_t if (H5O_TYPE_GROUP == object_info->type) goto done; else - HDprintf(" type for object '%s' was not H5O_TYPE_GROUP\n", name); + printf(" type for object '%s' was not H5O_TYPE_GROUP\n", name); } else - HDprintf(" object '%s' didn't match known names or came in an incorrect order\n", name); + printf(" object '%s' didn't match known names or came in an incorrect order\n", name); ret_val = -1; @@ -7185,19 +7175,19 @@ H5_api_object_test(void) size_t i; int nerrors; - HDprintf("**********************************************\n"); - HDprintf("* *\n"); - HDprintf("* API Object Tests *\n"); - HDprintf("* *\n"); - HDprintf("**********************************************\n\n"); + printf("**********************************************\n"); + printf("* *\n"); + printf("* API Object Tests *\n"); + printf("* *\n"); + printf("**********************************************\n\n"); for (i = 0, nerrors = 0; i < ARRAY_LENGTH(object_tests); i++) { nerrors += (*object_tests[i])() ? 1 : 0; } - HDprintf("\n"); + printf("\n"); - HDprintf("Cleaning up testing files\n"); + printf("Cleaning up testing files\n"); cleanup_files(); return nerrors; diff --git a/test/API/H5_api_test.c b/test/API/H5_api_test.c index 3719524..6c91721 100644 --- a/test/API/H5_api_test.c +++ b/test/API/H5_api_test.c @@ -162,7 +162,7 @@ main(int argc, char **argv) TEST_FILE_NAME); if (NULL == (vol_connector_string = HDgetenv(HDF5_VOL_CONNECTOR))) { - HDprintf("No VOL connector selected; using native VOL connector\n"); + printf("No VOL connector selected; using native VOL connector\n"); vol_connector_name = "native"; vol_connector_info = NULL; } @@ -170,13 +170,13 @@ main(int argc, char **argv) char *token; if (NULL == (vol_connector_string_copy = HDstrdup(vol_connector_string))) { - HDfprintf(stderr, "Unable to copy VOL connector string\n"); + fprintf(stderr, "Unable to copy VOL connector string\n"); err_occurred = TRUE; goto done; } if (NULL == (token = HDstrtok(vol_connector_string_copy, " "))) { - HDfprintf(stderr, "Error while parsing VOL connector string\n"); + fprintf(stderr, "Error while parsing VOL connector string\n"); err_occurred = TRUE; goto done; } @@ -188,15 +188,15 @@ main(int argc, char **argv) } } - HDprintf("Running API tests with VOL connector '%s' and info string '%s'\n\n", vol_connector_name, - vol_connector_info ? vol_connector_info : ""); - HDprintf("Test parameters:\n"); - HDprintf(" - Test file name: '%s'\n", H5_api_test_filename); - HDprintf(" - Test seed: %u\n", seed); - HDprintf("\n\n"); + printf("Running API tests with VOL connector '%s' and info string '%s'\n\n", vol_connector_name, + vol_connector_info ? vol_connector_info : ""); + printf("Test parameters:\n"); + printf(" - Test file name: '%s'\n", H5_api_test_filename); + printf(" - Test seed: %u\n", seed); + printf("\n\n"); if ((fapl_id = H5Pcreate(H5P_FILE_ACCESS)) < 0) { - HDfprintf(stderr, "Unable to create FAPL\n"); + fprintf(stderr, "Unable to create FAPL\n"); err_occurred = TRUE; goto done; } @@ -212,14 +212,14 @@ main(int argc, char **argv) htri_t is_registered; if ((is_registered = H5VLis_connector_registered_by_name(vol_connector_name)) < 0) { - HDfprintf(stderr, "Unable to determine if VOL connector is registered\n"); + fprintf(stderr, "Unable to determine if VOL connector is registered\n"); err_occurred = TRUE; goto done; } if (!is_registered) { - HDfprintf(stderr, "Specified VOL connector '%s' wasn't correctly registered!\n", - vol_connector_name); + fprintf(stderr, "Specified VOL connector '%s' wasn't correctly registered!\n", + vol_connector_name); err_occurred = TRUE; goto done; } @@ -230,19 +230,19 @@ main(int argc, char **argv) * for the registered connector before running the tests. */ if (H5Pget_vol_id(fapl_id, &default_con_id) < 0) { - HDfprintf(stderr, "Couldn't retrieve ID of VOL connector set on default FAPL\n"); + fprintf(stderr, "Couldn't retrieve ID of VOL connector set on default FAPL\n"); err_occurred = TRUE; goto done; } if ((registered_con_id = H5VLget_connector_id_by_name(vol_connector_name)) < 0) { - HDfprintf(stderr, "Couldn't retrieve ID of registered VOL connector\n"); + fprintf(stderr, "Couldn't retrieve ID of registered VOL connector\n"); err_occurred = TRUE; goto done; } if (default_con_id != registered_con_id) { - HDfprintf(stderr, "VOL connector set on default FAPL didn't match specified VOL connector\n"); + fprintf(stderr, "VOL connector set on default FAPL didn't match specified VOL connector\n"); err_occurred = TRUE; goto done; } @@ -254,7 +254,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) { - HDfprintf(stderr, "Unable to retrieve VOL connector capability flags\n"); + fprintf(stderr, "Unable to retrieve VOL connector capability flags\n"); err_occurred = TRUE; goto done; } @@ -264,7 +264,7 @@ main(int argc, char **argv) * except for those which test file creation. */ if (create_test_container(H5_api_test_filename, vol_cap_flags_g) < 0) { - HDfprintf(stderr, "Unable to create testing container file '%s'\n", H5_api_test_filename); + fprintf(stderr, "Unable to create testing container file '%s'\n", H5_api_test_filename); err_occurred = TRUE; goto done; } @@ -272,36 +272,34 @@ main(int argc, char **argv) /* Run all the tests that are enabled */ H5_api_test_run(); - HDprintf("Cleaning up testing files\n"); + printf("Cleaning up testing files\n"); H5Fdelete(H5_api_test_filename, fapl_id); if (n_tests_run_g > 0) { - HDprintf("%zu/%zu (%.2f%%) API tests passed with VOL connector '%s'\n", n_tests_passed_g, - n_tests_run_g, ((double)n_tests_passed_g / (double)n_tests_run_g * 100.0), - vol_connector_name); - HDprintf("%zu/%zu (%.2f%%) API tests did not pass with VOL connector '%s'\n", n_tests_failed_g, - n_tests_run_g, ((double)n_tests_failed_g / (double)n_tests_run_g * 100.0), - vol_connector_name); - HDprintf("%zu/%zu (%.2f%%) API tests were skipped with VOL connector '%s'\n", n_tests_skipped_g, - n_tests_run_g, ((double)n_tests_skipped_g / (double)n_tests_run_g * 100.0), - vol_connector_name); + printf("%zu/%zu (%.2f%%) API tests passed with VOL connector '%s'\n", n_tests_passed_g, n_tests_run_g, + ((double)n_tests_passed_g / (double)n_tests_run_g * 100.0), vol_connector_name); + printf("%zu/%zu (%.2f%%) API tests did not pass with VOL connector '%s'\n", n_tests_failed_g, + n_tests_run_g, ((double)n_tests_failed_g / (double)n_tests_run_g * 100.0), vol_connector_name); + printf("%zu/%zu (%.2f%%) API tests were skipped with VOL connector '%s'\n", n_tests_skipped_g, + n_tests_run_g, ((double)n_tests_skipped_g / (double)n_tests_run_g * 100.0), + vol_connector_name); } done: - HDfree(vol_connector_string_copy); + free(vol_connector_string_copy); if (default_con_id >= 0 && H5VLclose(default_con_id) < 0) { - HDfprintf(stderr, "Unable to close VOL connector ID\n"); + fprintf(stderr, "Unable to close VOL connector ID\n"); err_occurred = TRUE; } if (registered_con_id >= 0 && H5VLclose(registered_con_id) < 0) { - HDfprintf(stderr, "Unable to close VOL connector ID\n"); + fprintf(stderr, "Unable to close VOL connector ID\n"); err_occurred = TRUE; } if (fapl_id >= 0 && H5Pclose(fapl_id) < 0) { - HDfprintf(stderr, "Unable to close FAPL\n"); + fprintf(stderr, "Unable to close FAPL\n"); err_occurred = TRUE; } @@ -311,5 +309,5 @@ done: MPI_Finalize(); #endif - HDexit(((err_occurred || n_tests_failed_g > 0) ? EXIT_FAILURE : EXIT_SUCCESS)); + exit(((err_occurred || n_tests_failed_g > 0) ? EXIT_FAILURE : EXIT_SUCCESS)); } diff --git a/test/API/H5_api_test_util.c b/test/API/H5_api_test_util.c index c37a9ed..d7d330f 100644 --- a/test/API/H5_api_test_util.c +++ b/test/API/H5_api_test_util.c @@ -167,13 +167,13 @@ roll_datatype: gen_func = generate_random_datatype_array; break; default: - HDprintf(" invalid datatype class\n"); + printf(" invalid datatype class\n"); goto done; break; } if ((datatype = (gen_func)(parent_class, is_compact)) < 0) { - HDprintf(" couldn't generate datatype\n"); + printf(" couldn't generate datatype\n"); goto done; } @@ -185,7 +185,7 @@ roll_datatype: */ if (depth == 1) { if (0 == (type_size = H5Tget_size(datatype))) { - HDprintf(" failed to retrieve datatype's size\n"); + printf(" failed to retrieve datatype's size\n"); H5Tclose(datatype); datatype = H5I_INVALID_HID; goto done; @@ -267,12 +267,12 @@ generate_random_datatype_integer(H5T_class_t H5_ATTR_UNUSED parent_class, hbool_ type_to_copy = H5T_STD_U64LE; break; default: - HDprintf(" invalid value for predefined integer type; should not happen\n"); + printf(" invalid value for predefined integer type; should not happen\n"); goto done; } if ((datatype = H5Tcopy(type_to_copy)) < 0) { - HDprintf(" couldn't copy predefined integer type\n"); + printf(" couldn't copy predefined integer type\n"); goto done; } @@ -281,7 +281,7 @@ generate_random_datatype_integer(H5T_class_t H5_ATTR_UNUSED parent_class, hbool_ done: if ((ret_value == H5I_INVALID_HID) && (datatype >= 0)) { if (H5Tclose(datatype) < 0) - HDprintf(" couldn't close datatype\n"); + printf(" couldn't close datatype\n"); } return ret_value; @@ -309,12 +309,12 @@ generate_random_datatype_float(H5T_class_t H5_ATTR_UNUSED parent_class, hbool_t break; default: - HDprintf(" invalid value for floating point type; should not happen\n"); + printf(" invalid value for floating point type; should not happen\n"); goto done; } if ((datatype = H5Tcopy(type_to_copy)) < 0) { - HDprintf(" couldn't copy predefined floating-point type\n"); + printf(" couldn't copy predefined floating-point type\n"); goto done; } @@ -323,7 +323,7 @@ generate_random_datatype_float(H5T_class_t H5_ATTR_UNUSED parent_class, hbool_t done: if ((ret_value == H5I_INVALID_HID) && (datatype >= 0)) { if (H5Tclose(datatype) < 0) - HDprintf(" couldn't close datatype\n"); + printf(" couldn't close datatype\n"); } return ret_value; @@ -344,12 +344,12 @@ generate_random_datatype_string(H5T_class_t H5_ATTR_UNUSED parent_class, hbool_t if (0 == (rand() % 2)) { #endif if ((datatype = H5Tcreate(H5T_STRING, (size_t)(rand() % STRING_TYPE_MAX_SIZE) + 1)) < 0) { - HDprintf(" couldn't create fixed-length string datatype\n"); + printf(" couldn't create fixed-length string datatype\n"); goto done; } if (H5Tset_strpad(datatype, H5T_STR_NULLPAD) < 0) { - HDprintf(" couldn't set H5T_STR_NULLPAD for fixed-length string type\n"); + printf(" couldn't set H5T_STR_NULLPAD for fixed-length string type\n"); goto done; } #if 0 /* Currently, all VL types are disabled */ @@ -358,20 +358,20 @@ generate_random_datatype_string(H5T_class_t H5_ATTR_UNUSED parent_class, hbool_t if ((datatype = H5Tcreate(H5T_STRING, H5T_VARIABLE)) < 0) { H5_FAILED(); - HDprintf(" couldn't create variable-length string datatype\n"); + printf(" couldn't create variable-length string datatype\n"); goto done; } if (H5Tset_strpad(datatype, H5T_STR_NULLTERM) < 0) { H5_FAILED(); - HDprintf(" couldn't set H5T_STR_NULLTERM for variable-length string type\n"); + printf(" couldn't set H5T_STR_NULLTERM for variable-length string type\n"); goto done; } } #endif if (H5Tset_cset(datatype, H5T_CSET_ASCII) < 0) { - HDprintf(" couldn't set string datatype character set\n"); + printf(" couldn't set string datatype character set\n"); goto done; } @@ -380,7 +380,7 @@ generate_random_datatype_string(H5T_class_t H5_ATTR_UNUSED parent_class, hbool_t done: if ((ret_value == H5I_INVALID_HID) && (datatype >= 0)) { if (H5Tclose(datatype) < 0) - HDprintf(" couldn't close datatype\n"); + printf(" couldn't close datatype\n"); } return ret_value; @@ -400,7 +400,7 @@ generate_random_datatype_compound(H5T_class_t H5_ATTR_UNUSED parent_class, hbool compound_members[i] = H5I_INVALID_HID; if ((datatype = H5Tcreate(H5T_COMPOUND, 1)) < 0) { - HDprintf(" couldn't create compound datatype\n"); + printf(" couldn't create compound datatype\n"); goto done; } @@ -413,24 +413,24 @@ generate_random_datatype_compound(H5T_class_t H5_ATTR_UNUSED parent_class, hbool HDsnprintf(member_name, 256, "compound_member%zu", i); if ((compound_members[i] = generate_random_datatype(H5T_COMPOUND, is_compact)) < 0) { - HDprintf(" couldn't create compound datatype member %zu\n", i); + printf(" couldn't create compound datatype member %zu\n", i); goto done; } if (!(member_size = H5Tget_size(compound_members[i]))) { - HDprintf(" couldn't get compound member %zu size\n", i); + printf(" couldn't get compound member %zu size\n", i); goto done; } compound_size += member_size; if (H5Tset_size(datatype, compound_size) < 0) { - HDprintf(" couldn't set size for compound datatype\n"); + printf(" couldn't set size for compound datatype\n"); goto done; } if (H5Tinsert(datatype, member_name, next_offset, compound_members[i]) < 0) { - HDprintf(" couldn't insert compound datatype member %zu\n", i); + printf(" couldn't insert compound datatype member %zu\n", i); goto done; } @@ -442,13 +442,13 @@ generate_random_datatype_compound(H5T_class_t H5_ATTR_UNUSED parent_class, hbool done: for (size_t i = 0; i < COMPOUND_TYPE_MAX_MEMBERS; i++) { if (compound_members[i] > 0 && H5Tclose(compound_members[i]) < 0) { - HDprintf(" couldn't close compound member %zu\n", i); + printf(" couldn't close compound member %zu\n", i); } } if ((ret_value == H5I_INVALID_HID) && (datatype >= 0)) { if (H5Tclose(datatype) < 0) - HDprintf(" couldn't close datatype\n"); + printf(" couldn't close datatype\n"); } return ret_value; @@ -464,7 +464,7 @@ generate_random_datatype_reference(H5T_class_t H5_ATTR_UNUSED parent_class, hboo if (0 == (rand() % 2)) { #endif if ((datatype = H5Tcopy(H5T_STD_REF_OBJ)) < 0) { - HDprintf(" couldn't copy object reference datatype\n"); + printf(" couldn't copy object reference datatype\n"); goto done; } #if 0 /* Region references are currently unsupported */ @@ -472,7 +472,7 @@ generate_random_datatype_reference(H5T_class_t H5_ATTR_UNUSED parent_class, hboo else { if ((datatype = H5Tcopy(H5T_STD_REF_DSETREG)) < 0) { H5_FAILED(); - HDprintf(" couldn't copy region reference datatype\n"); + printf(" couldn't copy region reference datatype\n"); goto done; } } @@ -483,7 +483,7 @@ generate_random_datatype_reference(H5T_class_t H5_ATTR_UNUSED parent_class, hboo done: if ((ret_value == H5I_INVALID_HID) && (datatype >= 0)) { if (H5Tclose(datatype) < 0) - HDprintf(" couldn't close datatype\n"); + printf(" couldn't close datatype\n"); } return ret_value; @@ -498,14 +498,14 @@ generate_random_datatype_enum(H5T_class_t H5_ATTR_UNUSED parent_class, hbool_t H hid_t ret_value = H5I_INVALID_HID; if ((datatype = H5Tenum_create(H5T_NATIVE_INT)) < 0) { - HDprintf(" couldn't create enum datatype\n"); + printf(" couldn't create enum datatype\n"); goto done; } num_members = (size_t)(rand() % ENUM_TYPE_MAX_MEMBERS + 1); - if (NULL == (enum_member_vals = HDmalloc(num_members * sizeof(int)))) { - HDprintf(" couldn't allocate space for enum members\n"); + if (NULL == (enum_member_vals = malloc(num_members * sizeof(int)))) { + printf(" couldn't allocate space for enum members\n"); goto done; } @@ -529,7 +529,7 @@ generate_random_datatype_enum(H5T_class_t H5_ATTR_UNUSED parent_class, hbool_t H enum_member_vals[i] = enum_val; if (H5Tenum_insert(datatype, name, &enum_val) < 0) { - HDprintf(" couldn't insert member into enum datatype\n"); + printf(" couldn't insert member into enum datatype\n"); goto done; } } @@ -537,11 +537,11 @@ generate_random_datatype_enum(H5T_class_t H5_ATTR_UNUSED parent_class, hbool_t H ret_value = datatype; done: - HDfree(enum_member_vals); + free(enum_member_vals); if ((ret_value == H5I_INVALID_HID) && (datatype >= 0)) { if (H5Tclose(datatype) < 0) - HDprintf(" couldn't close datatype\n"); + printf(" couldn't close datatype\n"); } return ret_value; @@ -558,8 +558,8 @@ generate_random_datatype_array(H5T_class_t H5_ATTR_UNUSED parent_class, hbool_t ndims = (unsigned)(rand() % ARRAY_TYPE_MAX_DIMS + 1); - if (NULL == (array_dims = HDmalloc(ndims * sizeof(*array_dims)))) { - HDprintf(" couldn't allocate space for array datatype dims\n"); + if (NULL == (array_dims = malloc(ndims * sizeof(*array_dims)))) { + printf(" couldn't allocate space for array datatype dims\n"); goto done; } @@ -567,28 +567,28 @@ generate_random_datatype_array(H5T_class_t H5_ATTR_UNUSED parent_class, hbool_t array_dims[i] = (hsize_t)(rand() % MAX_DIM_SIZE + 1); if ((base_datatype = generate_random_datatype(H5T_ARRAY, is_compact)) < 0) { - HDprintf(" couldn't create array base datatype\n"); + printf(" couldn't create array base datatype\n"); goto done; } if ((datatype = H5Tarray_create2(base_datatype, ndims, array_dims)) < 0) { - HDprintf(" couldn't create array datatype\n"); + printf(" couldn't create array datatype\n"); goto done; } ret_value = datatype; done: - HDfree(array_dims); + free(array_dims); if (base_datatype >= 0) { if (H5Tclose(base_datatype) < 0) - HDprintf(" couldn't close array base datatype\n"); + printf(" couldn't close array base datatype\n"); } if ((ret_value == H5I_INVALID_HID) && (datatype >= 0)) { if (H5Tclose(datatype) < 0) - HDprintf(" couldn't close datatype\n"); + printf(" couldn't close datatype\n"); } return ret_value; @@ -608,8 +608,8 @@ generate_random_dataspace(int rank, const hsize_t *max_dims, hsize_t *dims_out, if (rank < 0) TEST_ERROR; if (is_compact && (rank > COMPACT_SPACE_MAX_DIMS)) { - HDprintf(" current rank of compact dataspace (%lld) exceeds maximum dimensionality (%lld)\n", - (long long)rank, (long long)COMPACT_SPACE_MAX_DIMS); + printf(" current rank of compact dataspace (%lld) exceeds maximum dimensionality (%lld)\n", + (long long)rank, (long long)COMPACT_SPACE_MAX_DIMS); TEST_ERROR; } @@ -643,12 +643,12 @@ create_test_container(char *filename, uint64_t vol_cap_flags) hid_t group_id = H5I_INVALID_HID; if (!(vol_cap_flags & H5VL_CAP_FLAG_FILE_BASIC)) { - HDprintf(" VOL connector doesn't support file creation\n"); + printf(" VOL connector doesn't support file creation\n"); goto error; } if ((file_id = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - HDprintf(" couldn't create testing container file '%s'\n", filename); + printf(" couldn't create testing container file '%s'\n", filename); goto error; } @@ -658,49 +658,49 @@ create_test_container(char *filename, uint64_t vol_cap_flags) */ if ((group_id = H5Gcreate2(file_id, GROUP_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) >= 0) { - HDprintf(" created container group for Group tests\n"); + printf(" created container group for Group tests\n"); H5Gclose(group_id); } if ((group_id = H5Gcreate2(file_id, ATTRIBUTE_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) >= 0) { - HDprintf(" created container group for Attribute tests\n"); + printf(" created container group for Attribute tests\n"); H5Gclose(group_id); } if ((group_id = H5Gcreate2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) >= 0) { - HDprintf(" created container group for Dataset tests\n"); + printf(" created container group for Dataset tests\n"); H5Gclose(group_id); } if ((group_id = H5Gcreate2(file_id, DATATYPE_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) >= 0) { - HDprintf(" created container group for Datatype tests\n"); + printf(" created container group for Datatype tests\n"); H5Gclose(group_id); } if ((group_id = H5Gcreate2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) >= 0) { - HDprintf(" created container group for Link tests\n"); + printf(" created container group for Link tests\n"); H5Gclose(group_id); } if ((group_id = H5Gcreate2(file_id, OBJECT_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) >= 0) { - HDprintf(" created container group for Object tests\n"); + printf(" created container group for Object tests\n"); H5Gclose(group_id); } if ((group_id = H5Gcreate2(file_id, MISCELLANEOUS_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) >= 0) { - HDprintf(" created container group for Miscellaneous tests\n"); + printf(" created container group for Miscellaneous tests\n"); H5Gclose(group_id); } } if (H5Fclose(file_id) < 0) { - HDprintf(" failed to close testing container\n"); + printf(" failed to close testing container\n"); goto error; } @@ -720,7 +720,7 @@ error: /* * Add a prefix to the given filename. The caller * is responsible for freeing the returned filename - * pointer with HDfree(). + * pointer with free(). */ herr_t prefix_filename(const char *prefix, const char *filename, char **filename_out) @@ -729,23 +729,23 @@ prefix_filename(const char *prefix, const char *filename, char **filename_out) herr_t ret_value = SUCCEED; if (!prefix) { - HDprintf(" invalid file prefix\n"); + printf(" invalid file prefix\n"); ret_value = FAIL; goto done; } if (!filename || (*filename == '\0')) { - HDprintf(" invalid filename\n"); + printf(" invalid filename\n"); ret_value = FAIL; goto done; } if (!filename_out) { - HDprintf(" invalid filename_out buffer\n"); + printf(" invalid filename_out buffer\n"); ret_value = FAIL; goto done; } - if (NULL == (out_buf = HDmalloc(H5_API_TEST_FILENAME_MAX_LENGTH))) { - HDprintf(" couldn't allocated filename buffer\n"); + if (NULL == (out_buf = malloc(H5_API_TEST_FILENAME_MAX_LENGTH))) { + printf(" couldn't allocated filename buffer\n"); ret_value = FAIL; goto done; } @@ -772,7 +772,7 @@ remove_test_file(const char *prefix, const char *filename) if (prefix) { if (prefix_filename(prefix, filename, &prefixed_filename) < 0) { - HDprintf(" couldn't prefix filename\n"); + printf(" couldn't prefix filename\n"); ret_value = FAIL; goto done; } @@ -783,13 +783,13 @@ remove_test_file(const char *prefix, const char *filename) test_file = filename; if (H5Fdelete(test_file, H5P_DEFAULT) < 0) { - HDprintf(" couldn't remove file '%s'\n", test_file); + printf(" couldn't remove file '%s'\n", test_file); ret_value = FAIL; goto done; } done: - HDfree(prefixed_filename); + free(prefixed_filename); return ret_value; } diff --git a/test/API/tarray.c b/test/API/tarray.c index 214a022..7996d91 100644 --- a/test/API/tarray.c +++ b/test/API/tarray.c @@ -1055,7 +1055,7 @@ test_array_alloc_custom(size_t size, void *info) */ extra = MAX(sizeof(void *), sizeof(size_t)); - if ((ret_value = HDmalloc(extra + size)) != NULL) { + if ((ret_value = malloc(extra + size)) != NULL) { *(size_t *)ret_value = size; *mem_used += size; } /* end if */ @@ -1093,7 +1093,7 @@ test_array_free_custom(void *_mem, void *info) if (_mem != NULL) { mem = ((unsigned char *)_mem) - extra; *mem_used -= *(size_t *)((void *)mem); - HDfree(mem); + free(mem); } /* end if */ } /* end test_array_free_custom() */ @@ -1136,7 +1136,7 @@ test_array_vlen_atomic(void) /* Initialize array data to write */ for (i = 0; i < SPACE1_DIM1; i++) for (j = 0; j < ARRAY1_DIM1; j++) { - wdata[i][j].p = HDmalloc((size_t)(i + j + 1) * sizeof(unsigned int)); + wdata[i][j].p = malloc((size_t)(i + j + 1) * sizeof(unsigned int)); wdata[i][j].len = (size_t)(i + j + 1); for (k = 0; k < (i + j + 1); k++) ((unsigned int *)wdata[i][j].p)[k] = (unsigned int)(i * 100 + j * 10 + k); @@ -1357,7 +1357,7 @@ test_array_vlen_array(void) /* Initialize array data to write */ for (i = 0; i < SPACE1_DIM1; i++) for (j = 0; j < ARRAY1_DIM1; j++) { - wdata[i][j].p = HDmalloc((size_t)(i + j + 1) * sizeof(unsigned int) * (size_t)ARRAY1_DIM1); + wdata[i][j].p = malloc((size_t)(i + j + 1) * sizeof(unsigned int) * (size_t)ARRAY1_DIM1); wdata[i][j].len = (size_t)(i + j + 1); for (k = 0; k < (i + j + 1); k++) for (l = 0; l < ARRAY1_DIM1; l++) @@ -1632,9 +1632,9 @@ test_array_bkg(void) /* Initialize the data */ /* ------------------- */ - dtsinfo = (CmpDTSinfo *)HDmalloc(sizeof(CmpDTSinfo)); - CHECK_PTR(dtsinfo, "HDmalloc"); - HDmemset(dtsinfo, 0, sizeof(CmpDTSinfo)); + dtsinfo = (CmpDTSinfo *)malloc(sizeof(CmpDTSinfo)); + CHECK_PTR(dtsinfo, "malloc"); + memset(dtsinfo, 0, sizeof(CmpDTSinfo)); for (i = 0; i < LENGTH; i++) { for (j = 0; j < ALEN; j++) { cf[i].a[j] = 100 * (i + 1) + j; @@ -1662,7 +1662,7 @@ test_array_bkg(void) /* Initialize the names of data members */ /* ------------------------------------ */ for (i = 0; i < dtsinfo->nsubfields; i++) - dtsinfo->name[i] = (char *)HDcalloc((size_t)20, sizeof(char)); + dtsinfo->name[i] = (char *)calloc((size_t)20, sizeof(char)); HDstrcpy(dtsinfo->name[0], "One"); HDstrcpy(dtsinfo->name[1], "Two"); @@ -1734,7 +1734,7 @@ test_array_bkg(void) /* Release memory resources */ /* ------------------------ */ for (i = 0; i < dtsinfo->nsubfields; i++) - HDfree(dtsinfo->name[i]); + free(dtsinfo->name[i]); /* Release IDs */ /* ----------- */ @@ -1849,7 +1849,7 @@ test_array_bkg(void) /* Reset the data to read in */ /* ------------------------- */ - HDmemset(cfr, 0, sizeof(CmpField) * LENGTH); + memset(cfr, 0, sizeof(CmpField) * LENGTH); status = H5Dread(dataset, type, H5S_ALL, H5S_ALL, H5P_DEFAULT, cfr); CHECK(status, FAIL, "H5Dread"); @@ -1885,7 +1885,7 @@ test_array_bkg(void) status = H5Fclose(fid); CHECK(status, FAIL, "H5Fclose"); - HDfree(dtsinfo); + free(dtsinfo); } /* end test_array_bkg() */ /*------------------------------------------------------------------------- @@ -1938,7 +1938,7 @@ test_compat(void) if (h5_driver_is_default_vfd_compatible(H5P_DEFAULT, &driver_is_default_compatible) < 0) TestErrPrintf("can't check if VFD is default VFD compatible\n"); if (!driver_is_default_compatible) { - HDprintf(" -- SKIPPED --\n"); + printf(" -- SKIPPED --\n"); return; } @@ -2194,7 +2194,7 @@ test_compat(void) CHECK_I(ret, "H5Fclose"); } /* end if */ else - HDprintf("***cannot open the pre-created compound datatype test file (%s)\n", testfile); + printf("***cannot open the pre-created compound datatype test file (%s)\n", testfile); } /* end test_compat() */ #endif diff --git a/test/API/tattr.c b/test/API/tattr.c index 0e01134..c29db0b 100644 --- a/test/API/tattr.c +++ b/test/API/tattr.c @@ -308,8 +308,8 @@ test_attr_basic_write(hid_t fapl) CHECK(attr_name_size, FAIL, "H5Aget_name"); if (attr_name_size > 0) { - attr_name = (char *)HDcalloc((size_t)(attr_name_size + 1), sizeof(char)); - CHECK_PTR(attr_name, "HDcalloc"); + attr_name = (char *)calloc((size_t)(attr_name_size + 1), sizeof(char)); + CHECK_PTR(attr_name, "calloc"); if (attr_name) { ret = (herr_t)H5Aget_name(attr, (size_t)(attr_name_size + 1), attr_name); @@ -317,7 +317,7 @@ test_attr_basic_write(hid_t fapl) ret = HDstrcmp(attr_name, ATTR_TMP_NAME); VERIFY(ret, 0, "HDstrcmp"); - HDfree(attr_name); + free(attr_name); attr_name = NULL; } /* end if */ } /* end if */ @@ -345,8 +345,8 @@ test_attr_basic_write(hid_t fapl) CHECK(attr_name_size, FAIL, "H5Aget_name"); if (attr_name_size > 0) { - attr_name = (char *)HDcalloc((size_t)(attr_name_size + 1), sizeof(char)); - CHECK_PTR(attr_name, "HDcalloc"); + attr_name = (char *)calloc((size_t)(attr_name_size + 1), sizeof(char)); + CHECK_PTR(attr_name, "calloc"); if (attr_name) { ret = (herr_t)H5Aget_name(attr2, (size_t)(attr_name_size + 1), attr_name); @@ -354,7 +354,7 @@ test_attr_basic_write(hid_t fapl) ret = HDstrcmp(attr_name, ATTR1A_NAME); VERIFY(ret, 0, "HDstrcmp"); - HDfree(attr_name); + free(attr_name); attr_name = NULL; } /* end if */ } /* end if */ @@ -576,7 +576,7 @@ test_attr_flush(hid_t fapl) TestErrPrintf("attribute value wrong: rdata=%f, should be %f\n", rdata, 0.0); } else { - HDprintf("** SKIPPED attribute pre-read due to fill values not being supported **\n"); + printf("** SKIPPED attribute pre-read due to fill values not being supported **\n"); } ret = H5Awrite(att, H5T_NATIVE_DOUBLE, &wdata); @@ -935,11 +935,11 @@ test_attr_compound_read(hid_t fapl) /* Verify values read in */ for (i = 0; i < ATTR4_DIM1; i++) for (j = 0; j < ATTR4_DIM2; j++) - if (HDmemcmp(&attr_data4[i][j], &read_data4[i][j], sizeof(struct attr4_struct)) != 0) { - HDprintf("%d: attribute data different: attr_data4[%d][%d].i=%d, read_data4[%d][%d].i=%d\n", - __LINE__, i, j, attr_data4[i][j].i, i, j, read_data4[i][j].i); - HDprintf("%d: attribute data different: attr_data4[%d][%d].d=%f, read_data4[%d][%d].d=%f\n", - __LINE__, i, j, attr_data4[i][j].d, i, j, read_data4[i][j].d); + if (memcmp(&attr_data4[i][j], &read_data4[i][j], sizeof(struct attr4_struct)) != 0) { + printf("%d: attribute data different: attr_data4[%d][%d].i=%d, read_data4[%d][%d].i=%d\n", + __LINE__, i, j, attr_data4[i][j].i, i, j, read_data4[i][j].i); + printf("%d: attribute data different: attr_data4[%d][%d].d=%f, read_data4[%d][%d].d=%f\n", + __LINE__, i, j, attr_data4[i][j].d, i, j, read_data4[i][j].d); TestErrPrintf( "%d: attribute data different: attr_data4[%d][%d].c=%c, read_data4[%d][%d].c=%c\n", __LINE__, i, j, attr_data4[i][j].c, i, j, read_data4[i][j].c); @@ -1082,8 +1082,8 @@ test_attr_scalar_read(hid_t fapl) /* Verify the floating-poing value in this way to avoid compiler warning. */ if (!H5_FLT_ABS_EQUAL(rdata, attr_data5)) - HDprintf("*** UNEXPECTED VALUE from %s should be %f, but is %f at line %4d in %s\n", "H5Aread", - (double)attr_data5, (double)rdata, (int)__LINE__, __FILE__); + printf("*** UNEXPECTED VALUE from %s should be %f, but is %f at line %4d in %s\n", "H5Aread", + (double)attr_data5, (double)rdata, (int)__LINE__, __FILE__); /* Get the attribute's dataspace */ sid = H5Aget_space(attr); @@ -4717,7 +4717,7 @@ test_attr_corder_create_compact(hid_t fcpl, hid_t fapl) break; default: - HDassert(0 && "Too many datasets!"); + assert(0 && "Too many datasets!"); } /* end switch */ #if 0 /* Check on dataset's attribute storage status */ @@ -4801,7 +4801,7 @@ test_attr_corder_create_compact(hid_t fcpl, hid_t fapl) break; default: - HDassert(0 && "Too many datasets!"); + assert(0 && "Too many datasets!"); } /* end switch */ #if 0 /* Check on dataset's attribute storage status */ @@ -4924,7 +4924,7 @@ test_attr_corder_create_dense(hid_t fcpl, hid_t fapl) break; default: - HDassert(0 && "Too many datasets!"); + assert(0 && "Too many datasets!"); } /* end switch */ #if 0 /* Check on dataset's attribute storage status */ @@ -5036,7 +5036,7 @@ test_attr_corder_create_dense(hid_t fcpl, hid_t fapl) break; default: - HDassert(0 && "Too many datasets!"); + assert(0 && "Too many datasets!"); } /* end switch */ #if 0 /* Check on dataset's attribute storage status */ @@ -5269,7 +5269,7 @@ test_attr_corder_transition(hid_t fcpl, hid_t fapl) break; default: - HDassert(0 && "Too many datasets!"); + assert(0 && "Too many datasets!"); } /* end switch */ #if 0 /* Check on dataset's attribute storage status */ @@ -5324,7 +5324,7 @@ test_attr_corder_transition(hid_t fcpl, hid_t fapl) break; default: - HDassert(0 && "Too many datasets!"); + assert(0 && "Too many datasets!"); } /* end switch */ /* Create several attributes, but keep storage in compact form */ @@ -5488,7 +5488,7 @@ test_attr_corder_transition(hid_t fcpl, hid_t fapl) break; default: - HDassert(0 && "Too many datasets!"); + assert(0 && "Too many datasets!"); } /* end switch */ #if 0 /* Check on dataset's attribute storage status */ @@ -5707,7 +5707,7 @@ test_attr_corder_delete(hid_t fcpl, hid_t fapl) break; default: - HDassert(0 && "Too many datasets!"); + assert(0 && "Too many datasets!"); } /* end switch */ #if 0 /* Check on dataset's attribute storage status */ @@ -5835,19 +5835,19 @@ attr_info_by_idx_check(hid_t obj_id, const char *attrname, hsize_t n, hbool_t us old_nerrs = nerrors; /* Verify the information for first attribute, in increasing creation order */ - HDmemset(&ainfo, 0, sizeof(ainfo)); + memset(&ainfo, 0, sizeof(ainfo)); ret = H5Aget_info_by_idx(obj_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)0, &ainfo, H5P_DEFAULT); CHECK(ret, FAIL, "H5Aget_info_by_idx"); VERIFY(ainfo.corder, 0, "H5Aget_info_by_idx"); /* Verify the information for new attribute, in increasing creation order */ - HDmemset(&ainfo, 0, sizeof(ainfo)); + memset(&ainfo, 0, sizeof(ainfo)); ret = H5Aget_info_by_idx(obj_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, n, &ainfo, H5P_DEFAULT); CHECK(ret, FAIL, "H5Aget_info_by_idx"); VERIFY(ainfo.corder, n, "H5Aget_info_by_idx"); /* Verify the name for new link, in increasing creation order */ - HDmemset(tmpname, 0, (size_t)NAME_BUF_SIZE); + memset(tmpname, 0, (size_t)NAME_BUF_SIZE); ret = (herr_t)H5Aget_name_by_idx(obj_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, n, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT); CHECK(ret, FAIL, "H5Aget_name_by_idx"); @@ -5860,21 +5860,21 @@ attr_info_by_idx_check(hid_t obj_id, const char *attrname, hsize_t n, hbool_t us */ if (use_index) { /* Verify the information for first attribute, in native creation order */ - HDmemset(&ainfo, 0, sizeof(ainfo)); + memset(&ainfo, 0, sizeof(ainfo)); ret = H5Aget_info_by_idx(obj_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC /* H5_ITER_NATIVE */, (hsize_t)0, &ainfo, H5P_DEFAULT); CHECK(ret, FAIL, "H5Aget_info_by_idx"); VERIFY(ainfo.corder, 0, "H5Aget_info_by_idx"); /* Verify the information for new attribute, in native creation order */ - HDmemset(&ainfo, 0, sizeof(ainfo)); + memset(&ainfo, 0, sizeof(ainfo)); ret = H5Aget_info_by_idx(obj_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC /* H5_ITER_NATIVE */, n, &ainfo, H5P_DEFAULT); CHECK(ret, FAIL, "H5Aget_info_by_idx"); VERIFY(ainfo.corder, n, "H5Aget_info_by_idx"); /* Verify the name for new link, in increasing native order */ - HDmemset(tmpname, 0, (size_t)NAME_BUF_SIZE); + memset(tmpname, 0, (size_t)NAME_BUF_SIZE); ret = (herr_t)H5Aget_name_by_idx(obj_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC /* H5_ITER_NATIVE */, n, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT); CHECK(ret, FAIL, "H5Aget_name_by_idx"); @@ -5883,19 +5883,19 @@ attr_info_by_idx_check(hid_t obj_id, const char *attrname, hsize_t n, hbool_t us } /* end if */ /* Verify the information for first attribute, in decreasing creation order */ - HDmemset(&ainfo, 0, sizeof(ainfo)); + memset(&ainfo, 0, sizeof(ainfo)); ret = H5Aget_info_by_idx(obj_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, n, &ainfo, H5P_DEFAULT); CHECK(ret, FAIL, "H5Aget_info_by_idx"); VERIFY(ainfo.corder, 0, "H5Aget_info_by_idx"); /* Verify the information for new attribute, in increasing creation order */ - HDmemset(&ainfo, 0, sizeof(ainfo)); + memset(&ainfo, 0, sizeof(ainfo)); ret = H5Aget_info_by_idx(obj_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, (hsize_t)0, &ainfo, H5P_DEFAULT); CHECK(ret, FAIL, "H5Aget_info_by_idx"); VERIFY(ainfo.corder, n, "H5Aget_info_by_idx"); /* Verify the name for new link, in increasing creation order */ - HDmemset(tmpname, 0, (size_t)NAME_BUF_SIZE); + memset(tmpname, 0, (size_t)NAME_BUF_SIZE); ret = (herr_t)H5Aget_name_by_idx(obj_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, (hsize_t)0, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT); CHECK(ret, FAIL, "H5Aget_name_by_idx"); @@ -5903,19 +5903,19 @@ attr_info_by_idx_check(hid_t obj_id, const char *attrname, hsize_t n, hbool_t us TestErrPrintf("Line %d: attribute name size wrong!\n", __LINE__); /* Verify the information for first attribute, in increasing name order */ - HDmemset(&ainfo, 0, sizeof(ainfo)); + memset(&ainfo, 0, sizeof(ainfo)); ret = H5Aget_info_by_idx(obj_id, ".", H5_INDEX_NAME, H5_ITER_INC, (hsize_t)0, &ainfo, H5P_DEFAULT); CHECK(ret, FAIL, "H5Aget_info_by_idx"); VERIFY(ainfo.corder, 0, "H5Aget_info_by_idx"); /* Verify the information for new attribute, in increasing name order */ - HDmemset(&ainfo, 0, sizeof(ainfo)); + memset(&ainfo, 0, sizeof(ainfo)); ret = H5Aget_info_by_idx(obj_id, ".", H5_INDEX_NAME, H5_ITER_INC, n, &ainfo, H5P_DEFAULT); CHECK(ret, FAIL, "H5Aget_info_by_idx"); VERIFY(ainfo.corder, n, "H5Aget_info_by_idx"); /* Verify the name for new link, in increasing name order */ - HDmemset(tmpname, 0, (size_t)NAME_BUF_SIZE); + memset(tmpname, 0, (size_t)NAME_BUF_SIZE); ret = (herr_t)H5Aget_name_by_idx(obj_id, ".", H5_INDEX_NAME, H5_ITER_INC, n, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT); CHECK(ret, FAIL, "H5Aget_name_by_idx"); @@ -5927,19 +5927,19 @@ attr_info_by_idx_check(hid_t obj_id, const char *attrname, hsize_t n, hbool_t us */ /* Verify the information for first attribute, in decreasing name order */ - HDmemset(&ainfo, 0, sizeof(ainfo)); + memset(&ainfo, 0, sizeof(ainfo)); ret = H5Aget_info_by_idx(obj_id, ".", H5_INDEX_NAME, H5_ITER_DEC, n, &ainfo, H5P_DEFAULT); CHECK(ret, FAIL, "H5Aget_info_by_idx"); VERIFY(ainfo.corder, 0, "H5Aget_info_by_idx"); /* Verify the information for new attribute, in increasing name order */ - HDmemset(&ainfo, 0, sizeof(ainfo)); + memset(&ainfo, 0, sizeof(ainfo)); ret = H5Aget_info_by_idx(obj_id, ".", H5_INDEX_NAME, H5_ITER_DEC, (hsize_t)0, &ainfo, H5P_DEFAULT); CHECK(ret, FAIL, "H5Aget_info_by_idx"); VERIFY(ainfo.corder, n, "H5Aget_info_by_idx"); /* Verify the name for new link, in increasing name order */ - HDmemset(tmpname, 0, (size_t)NAME_BUF_SIZE); + memset(tmpname, 0, (size_t)NAME_BUF_SIZE); ret = (herr_t)H5Aget_name_by_idx(obj_id, ".", H5_INDEX_NAME, H5_ITER_DEC, (hsize_t)0, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT); CHECK(ret, FAIL, "H5Aget_name_by_idx"); @@ -6046,7 +6046,7 @@ test_attr_info_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) break; default: - HDassert(0 && "Too many datasets!"); + assert(0 && "Too many datasets!"); } /* end switch */ #if 0 /* Check on dataset's attribute storage status */ @@ -6575,7 +6575,7 @@ test_attr_delete_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) break; default: - HDassert(0 && "Too many datasets!"); + assert(0 && "Too many datasets!"); } /* end switch */ #if 0 /* Check on dataset's attribute storage status */ @@ -6647,7 +6647,7 @@ test_attr_delete_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) break; default: - HDassert(0 && "Too many datasets!"); + assert(0 && "Too many datasets!"); } /* end switch */ /* Delete attributes from compact storage */ @@ -6657,7 +6657,7 @@ test_attr_delete_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) CHECK(ret, FAIL, "H5Adelete_by_idx"); /* Verify the attribute information for first attribute in appropriate order */ - HDmemset(&ainfo, 0, sizeof(ainfo)); + memset(&ainfo, 0, sizeof(ainfo)); ret = H5Aget_info_by_idx(my_dataset, ".", idx_type, order, (hsize_t)0, &ainfo, H5P_DEFAULT); if (new_format) { @@ -6670,7 +6670,7 @@ test_attr_delete_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) } /* end if */ /* Verify the name for first attribute in appropriate order */ - HDmemset(tmpname, 0, (size_t)NAME_BUF_SIZE); + memset(tmpname, 0, (size_t)NAME_BUF_SIZE); ret = (herr_t)H5Aget_name_by_idx(my_dataset, ".", idx_type, order, (hsize_t)0, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT); if (order == H5_ITER_INC) @@ -6707,7 +6707,7 @@ test_attr_delete_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) break; default: - HDassert(0 && "Too many datasets!"); + assert(0 && "Too many datasets!"); } /* end switch */ /* Create more attributes, to push into dense form */ @@ -6780,7 +6780,7 @@ test_attr_delete_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) break; default: - HDassert(0 && "Too many datasets!"); + assert(0 && "Too many datasets!"); } /* end switch */ /* Delete attributes from dense storage */ @@ -6790,7 +6790,7 @@ test_attr_delete_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) CHECK(ret, FAIL, "H5Adelete_by_idx"); /* Verify the attribute information for first attribute in appropriate order */ - HDmemset(&ainfo, 0, sizeof(ainfo)); + memset(&ainfo, 0, sizeof(ainfo)); ret = H5Aget_info_by_idx(my_dataset, ".", idx_type, order, (hsize_t)0, &ainfo, H5P_DEFAULT); if (new_format) { @@ -6803,7 +6803,7 @@ test_attr_delete_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) } /* end if */ /* Verify the name for first attribute in appropriate order */ - HDmemset(tmpname, 0, (size_t)NAME_BUF_SIZE); + memset(tmpname, 0, (size_t)NAME_BUF_SIZE); ret = (herr_t)H5Aget_name_by_idx(my_dataset, ".", idx_type, order, (hsize_t)0, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT); if (order == H5_ITER_INC) @@ -6850,7 +6850,7 @@ test_attr_delete_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) break; default: - HDassert(0 && "Too many datasets!"); + assert(0 && "Too many datasets!"); } /* end switch */ /* Create attributes, to push into dense form */ @@ -6897,7 +6897,7 @@ test_attr_delete_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) break; default: - HDassert(0 && "Too many datasets!"); + assert(0 && "Too many datasets!"); } /* end switch */ /* Delete every other attribute from dense storage, in appropriate order */ @@ -6907,7 +6907,7 @@ test_attr_delete_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) CHECK(ret, FAIL, "H5Adelete_by_idx"); /* Verify the attribute information for first attribute in appropriate order */ - HDmemset(&ainfo, 0, sizeof(ainfo)); + memset(&ainfo, 0, sizeof(ainfo)); ret = H5Aget_info_by_idx(my_dataset, ".", idx_type, order, (hsize_t)u, &ainfo, H5P_DEFAULT); if (new_format) { @@ -6921,7 +6921,7 @@ test_attr_delete_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) } /* end if */ /* Verify the name for first attribute in appropriate order */ - HDmemset(tmpname, 0, (size_t)NAME_BUF_SIZE); + memset(tmpname, 0, (size_t)NAME_BUF_SIZE); ret = (herr_t)H5Aget_name_by_idx(my_dataset, ".", idx_type, order, (hsize_t)u, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT); if (order == H5_ITER_INC) @@ -6950,7 +6950,7 @@ test_attr_delete_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) break; default: - HDassert(0 && "Too many datasets!"); + assert(0 && "Too many datasets!"); } /* end switch */ /* Delete remaining attributes from dense storage, in appropriate order */ @@ -6960,7 +6960,7 @@ test_attr_delete_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) CHECK(ret, FAIL, "H5Adelete_by_idx"); /* Verify the attribute information for first attribute in appropriate order */ - HDmemset(&ainfo, 0, sizeof(ainfo)); + memset(&ainfo, 0, sizeof(ainfo)); ret = H5Aget_info_by_idx(my_dataset, ".", idx_type, order, (hsize_t)0, &ainfo, H5P_DEFAULT); if (new_format) { @@ -6974,7 +6974,7 @@ test_attr_delete_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) } /* end if */ /* Verify the name for first attribute in appropriate order */ - HDmemset(tmpname, 0, (size_t)NAME_BUF_SIZE); + memset(tmpname, 0, (size_t)NAME_BUF_SIZE); ret = (herr_t)H5Aget_name_by_idx(my_dataset, ".", idx_type, order, (hsize_t)0, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT); if (order == H5_ITER_INC) @@ -7160,8 +7160,8 @@ attr_iterate_check(hid_t fid, const char *dsetname, hid_t obj_id, H5_index_t idx if (!(vol_cap_flags_g & H5VL_CAP_FLAG_ITERATE)) { SKIPPED(); - HDprintf(" API functions for iterate aren't " - "supported with this connector\n"); + printf(" API functions for iterate aren't " + "supported with this connector\n"); return 1; } @@ -7171,7 +7171,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 ? 0 : (max_attrs - 1); - HDmemset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); ret = H5Aiterate2(obj_id, idx_type, order, &skip, attr_iterate2_cb, iter_info); CHECK(ret, FAIL, "H5Aiterate2"); @@ -7186,7 +7186,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 ? 0 : (max_attrs - 1); - HDmemset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(hbool_t) * 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"); @@ -7201,7 +7201,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 ? 0 : (max_attrs - 1); - HDmemset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(hbool_t) * 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"); @@ -7218,7 +7218,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 ? 0 : (max_attrs - 1); - HDmemset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); ret = H5Aiterate1(obj_id, &oskip, attr_iterate1_cb, iter_info); CHECK(ret, FAIL, "H5Aiterate1"); @@ -7235,7 +7235,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); - HDmemset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); ret = H5Aiterate2(obj_id, idx_type, order, &skip, attr_iterate2_cb, iter_info); CHECK(ret, FAIL, "H5Aiterate2"); @@ -7252,7 +7252,7 @@ attr_iterate_check(hid_t fid, const char *dsetname, hid_t obj_id, H5_index_t idx else { unsigned nvisit = 0; /* # of links visited */ - HDassert(order == H5_ITER_NATIVE); + assert(order == H5_ITER_NATIVE); for (v = 0; v < max_attrs; v++) if (iter_info->visited[v] == TRUE) nvisit++; @@ -7266,7 +7266,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); - HDmemset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(hbool_t) * 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"); @@ -7283,7 +7283,7 @@ attr_iterate_check(hid_t fid, const char *dsetname, hid_t obj_id, H5_index_t idx else { unsigned nvisit = 0; /* # of links visited */ - HDassert(order == H5_ITER_NATIVE); + assert(order == H5_ITER_NATIVE); for (v = 0; v < max_attrs; v++) if (iter_info->visited[v] == TRUE) nvisit++; @@ -7297,7 +7297,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); - HDmemset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(hbool_t) * 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"); @@ -7314,7 +7314,7 @@ attr_iterate_check(hid_t fid, const char *dsetname, hid_t obj_id, H5_index_t idx else { unsigned nvisit = 0; /* # of links visited */ - HDassert(order == H5_ITER_NATIVE); + assert(order == H5_ITER_NATIVE); for (v = 0; v < max_attrs; v++) if (iter_info->visited[v] == TRUE) nvisit++; @@ -7330,7 +7330,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); - HDmemset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); ret = H5Aiterate1(obj_id, &oskip, attr_iterate1_cb, iter_info); CHECK(ret, FAIL, "H5Aiterate1"); @@ -7347,7 +7347,7 @@ attr_iterate_check(hid_t fid, const char *dsetname, hid_t obj_id, H5_index_t idx else { unsigned nvisit = 0; /* # of links visited */ - HDassert(order == H5_ITER_NATIVE); + assert(order == H5_ITER_NATIVE); for (v = 0; v < max_attrs; v++) if (iter_info->visited[v] == TRUE) nvisit++; @@ -7363,7 +7363,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); - HDmemset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(hbool_t) * 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"); @@ -7375,7 +7375,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); - HDmemset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(hbool_t) * 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"); @@ -7387,7 +7387,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); - HDmemset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(hbool_t) * 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"); @@ -7401,7 +7401,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); - HDmemset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); ret = H5Aiterate1(obj_id, &oskip, attr_iterate1_cb, iter_info); CHECK(ret, FAIL, "H5Aiterate1"); VERIFY(ret, CORDER_ITER_STOP, "H5Aiterate1"); @@ -7503,8 +7503,8 @@ 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 *)HDmalloc(sizeof(hbool_t) * iter_info.max_visit); - CHECK_PTR(visited, "HDmalloc"); + visited = (hbool_t *)malloc(sizeof(hbool_t) * iter_info.max_visit); + CHECK_PTR(visited, "malloc"); iter_info.visited = visited; /* Loop over operating on different indices on link fields */ @@ -7589,7 +7589,7 @@ test_attr_iterate2(hbool_t new_format, hid_t fcpl, hid_t fapl) break; default: - HDassert(0 && "Too many datasets!"); + assert(0 && "Too many datasets!"); } /* end switch */ #if 0 /* Check on dataset's attribute storage status */ @@ -7694,7 +7694,7 @@ test_attr_iterate2(hbool_t new_format, hid_t fcpl, hid_t fapl) break; default: - HDassert(0 && "Too many datasets!"); + assert(0 && "Too many datasets!"); } /* end switch */ /* Create more attributes, to push into dense form */ @@ -7801,7 +7801,7 @@ test_attr_iterate2(hbool_t new_format, hid_t fcpl, hid_t fapl) CHECK(ret, FAIL, "H5Sclose"); /* Free the "visited link" array */ - HDfree(visited); + free(visited); } /* test_attr_iterate2() */ /*------------------------------------------------------------------------- @@ -7996,7 +7996,7 @@ test_attr_open_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) break; default: - HDassert(0 && "Too many datasets!"); + assert(0 && "Too many datasets!"); } /* end switch */ #if 0 /* Check on dataset's attribute storage status */ @@ -8074,7 +8074,7 @@ test_attr_open_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) break; default: - HDassert(0 && "Too many datasets!"); + assert(0 && "Too many datasets!"); } /* end switch */ /* Create more attributes, to push into dense form */ @@ -8338,7 +8338,7 @@ test_attr_open_by_name(hbool_t new_format, hid_t fcpl, hid_t fapl) break; default: - HDassert(0 && "Too many datasets!"); + assert(0 && "Too many datasets!"); } /* end switch */ #if 0 /* Check on dataset's attribute storage status */ @@ -8444,7 +8444,7 @@ test_attr_open_by_name(hbool_t new_format, hid_t fcpl, hid_t fapl) break; default: - HDassert(0 && "Too many datasets!"); + assert(0 && "Too many datasets!"); } /* end switch */ /* Create more attributes, to push into dense form */ @@ -8635,7 +8635,7 @@ test_attr_create_by_name(hbool_t new_format, hid_t fcpl, hid_t fapl) break; default: - HDassert(0 && "Too many datasets!"); + assert(0 && "Too many datasets!"); } /* end switch */ #if 0 /* Check on dataset's attribute storage status */ @@ -8698,7 +8698,7 @@ test_attr_create_by_name(hbool_t new_format, hid_t fcpl, hid_t fapl) break; default: - HDassert(0 && "Too many datasets!"); + assert(0 && "Too many datasets!"); } /* end switch */ /* Create more attributes, to push into dense form */ @@ -8815,9 +8815,9 @@ test_attr_shared_write(hid_t fcpl, hid_t fapl) MESSAGE(5, ("Testing Writing Shared & Unshared Attributes in Compact & Dense Storage\n")); /* Allocate & initialize "big" attribute data */ - big_value = (unsigned *)HDmalloc((size_t)(SPACE1_DIM1 * SPACE1_DIM2 * SPACE1_DIM3) * sizeof(unsigned)); - CHECK_PTR(big_value, "HDmalloc"); - HDmemset(big_value, 1, sizeof(unsigned) * (size_t)(SPACE1_DIM1 * SPACE1_DIM2 * SPACE1_DIM3)); + big_value = (unsigned *)malloc((size_t)(SPACE1_DIM1 * SPACE1_DIM2 * SPACE1_DIM3) * sizeof(unsigned)); + CHECK_PTR(big_value, "malloc"); + memset(big_value, 1, sizeof(unsigned) * (size_t)(SPACE1_DIM1 * SPACE1_DIM2 * SPACE1_DIM3)); /* Create dataspace for dataset */ sid = H5Screate(H5S_SCALAR); @@ -9120,7 +9120,7 @@ test_attr_shared_write(hid_t fcpl, hid_t fapl) CHECK(ret, FAIL, "H5Sclose"); /* Release memory */ - HDfree(big_value); + free(big_value); } /* test_attr_shared_write() */ /**************************************************************** @@ -9166,9 +9166,9 @@ test_attr_shared_rename(hid_t fcpl, hid_t fapl) MESSAGE(5, ("Testing Renaming Shared & Unshared Attributes in Compact & Dense Storage\n")); /* Allocate & initialize "big" attribute data */ - big_value = (unsigned *)HDmalloc((size_t)(SPACE1_DIM1 * SPACE1_DIM2 * SPACE1_DIM3) * sizeof(unsigned)); - CHECK_PTR(big_value, "HDmalloc"); - HDmemset(big_value, 1, sizeof(unsigned) * (size_t)(SPACE1_DIM1 * SPACE1_DIM2 * SPACE1_DIM3)); + big_value = (unsigned *)malloc((size_t)(SPACE1_DIM1 * SPACE1_DIM2 * SPACE1_DIM3) * sizeof(unsigned)); + CHECK_PTR(big_value, "malloc"); + memset(big_value, 1, sizeof(unsigned) * (size_t)(SPACE1_DIM1 * SPACE1_DIM2 * SPACE1_DIM3)); /* Create dataspace for dataset */ sid = H5Screate(H5S_SCALAR); @@ -9580,7 +9580,7 @@ test_attr_shared_rename(hid_t fcpl, hid_t fapl) CHECK(ret, FAIL, "H5Sclose"); /* Release memory */ - HDfree(big_value); + free(big_value); } /* test_attr_shared_rename() */ /**************************************************************** @@ -9625,9 +9625,9 @@ test_attr_shared_delete(hid_t fcpl, hid_t fapl) MESSAGE(5, ("Testing Deleting Shared & Unshared Attributes in Compact & Dense Storage\n")); /* Allocate & initialize "big" attribute data */ - big_value = (unsigned *)HDmalloc((size_t)(SPACE1_DIM1 * SPACE1_DIM2 * SPACE1_DIM3) * sizeof(unsigned)); - CHECK_PTR(big_value, "HDmalloc"); - HDmemset(big_value, 1, sizeof(unsigned) * (size_t)(SPACE1_DIM1 * SPACE1_DIM2 * SPACE1_DIM3)); + big_value = (unsigned *)malloc((size_t)(SPACE1_DIM1 * SPACE1_DIM2 * SPACE1_DIM3) * sizeof(unsigned)); + CHECK_PTR(big_value, "malloc"); + memset(big_value, 1, sizeof(unsigned) * (size_t)(SPACE1_DIM1 * SPACE1_DIM2 * SPACE1_DIM3)); /* Create dataspace for dataset */ sid = H5Screate(H5S_SCALAR); @@ -9964,7 +9964,7 @@ test_attr_shared_delete(hid_t fcpl, hid_t fapl) CHECK(ret, FAIL, "H5Sclose"); /* Release memory */ - HDfree(big_value); + free(big_value); } /* test_attr_shared_delete() */ /**************************************************************** @@ -10009,9 +10009,9 @@ test_attr_shared_unlink(hid_t fcpl, hid_t fapl) MESSAGE(5, ("Testing Unlinking Object with Shared Attributes in Compact & Dense Storage\n")); /* Allocate & initialize "big" attribute data */ - big_value = (unsigned *)HDmalloc((size_t)(SPACE1_DIM1 * SPACE1_DIM2 * SPACE1_DIM3) * sizeof(unsigned)); - CHECK_PTR(big_value, "HDmalloc"); - HDmemset(big_value, 1, sizeof(unsigned) * (size_t)(SPACE1_DIM1 * SPACE1_DIM2 * SPACE1_DIM3)); + big_value = (unsigned *)malloc((size_t)(SPACE1_DIM1 * SPACE1_DIM2 * SPACE1_DIM3) * sizeof(unsigned)); + CHECK_PTR(big_value, "malloc"); + memset(big_value, 1, sizeof(unsigned) * (size_t)(SPACE1_DIM1 * SPACE1_DIM2 * SPACE1_DIM3)); /* Create dataspace for dataset */ sid = H5Screate(H5S_SCALAR); @@ -10336,7 +10336,7 @@ test_attr_shared_unlink(hid_t fcpl, hid_t fapl) CHECK(ret, FAIL, "H5Sclose"); /* Release memory */ - HDfree(big_value); + free(big_value); } /* test_attr_shared_unlink() */ /**************************************************************** @@ -11629,8 +11629,8 @@ test_attr_delete_last_dense(hid_t fcpl, hid_t fapl) CHECK(aid, FAIL, "H5Acreate2"); /* Allocate the data buffer */ - data = (double *)HDmalloc((size_t)(DIM0 * DIM1) * sizeof(double)); - CHECK_PTR(data, "HDmalloc"); + data = (double *)malloc((size_t)(DIM0 * DIM1) * sizeof(double)); + CHECK_PTR(data, "malloc"); /* Initialize the data */ for (i = 0; i < DIM0; i++) @@ -11671,7 +11671,7 @@ test_attr_delete_last_dense(hid_t fcpl, hid_t fapl) /* Free the data buffer */ if (data) - HDfree(data); + free(data); } /* test_attr_delete_last_dense() */ #endif diff --git a/test/API/tchecksum.c b/test/API/tchecksum.c index a77ffcd..e1c2a1a 100644 --- a/test/API/tchecksum.c +++ b/test/API/tchecksum.c @@ -57,7 +57,7 @@ test_chksum_size_one(void) VERIFY(chksum, 0xa209c931, "H5_checksum_lookup3"); /* Buffer w/zero(s) for data */ - HDmemset(buf, 0, sizeof(buf)); + memset(buf, 0, sizeof(buf)); chksum = H5_checksum_fletcher32(buf, sizeof(buf)); VERIFY(chksum, 0, "H5_checksum_fletcher32"); @@ -90,7 +90,7 @@ test_chksum_size_two(void) VERIFY(chksum, 0x8ba7a6c9, "H5_checksum_lookup3"); /* Buffer w/zero(s) for data */ - HDmemset(buf, 0, sizeof(buf)); + memset(buf, 0, sizeof(buf)); chksum = H5_checksum_fletcher32(buf, sizeof(buf)); VERIFY(chksum, 0, "H5_checksum_fletcher32"); @@ -123,7 +123,7 @@ test_chksum_size_three(void) VERIFY(chksum, 0xcebdf4f0, "H5_checksum_lookup3"); /* Buffer w/zero(s) for data */ - HDmemset(buf, 0, sizeof(buf)); + memset(buf, 0, sizeof(buf)); chksum = H5_checksum_fletcher32(buf, sizeof(buf)); VERIFY(chksum, 0, "H5_checksum_fletcher32"); @@ -156,7 +156,7 @@ test_chksum_size_four(void) VERIFY(chksum, 0x2c88bb51, "H5_checksum_lookup3"); /* Buffer w/zero(s) for data */ - HDmemset(buf, 0, sizeof(buf)); + memset(buf, 0, sizeof(buf)); chksum = H5_checksum_fletcher32(buf, sizeof(buf)); VERIFY(chksum, 0, "H5_checksum_fletcher32"); @@ -180,8 +180,8 @@ test_chksum_large(void) size_t u; /* Local index variable */ /* Allocate the buffer */ - large_buf = (uint8_t *)HDmalloc((size_t)BUF_LEN); - CHECK_PTR(large_buf, "HDmalloc"); + large_buf = (uint8_t *)malloc((size_t)BUF_LEN); + CHECK_PTR(large_buf, "malloc"); /* Initialize buffer w/known data */ for (u = 0; u < BUF_LEN; u++) @@ -198,7 +198,7 @@ test_chksum_large(void) VERIFY(chksum, 0x1bd2ee7b, "H5_checksum_lookup3"); /* Buffer w/zero(s) for data */ - HDmemset(large_buf, 0, (size_t)BUF_LEN); + memset(large_buf, 0, (size_t)BUF_LEN); chksum = H5_checksum_fletcher32(large_buf, (size_t)BUF_LEN); VERIFY(chksum, 0, "H5_checksum_fletcher32"); @@ -209,7 +209,7 @@ test_chksum_large(void) VERIFY(chksum, 0x930c7afc, "H5_checksum_lookup3"); /* Release memory for buffer */ - HDfree(large_buf); + free(large_buf); } /* test_chksum_large() */ /**************************************************************** diff --git a/test/API/tcoords.c b/test/API/tcoords.c index 9c66b40..04b4822 100644 --- a/test/API/tcoords.c +++ b/test/API/tcoords.c @@ -86,7 +86,7 @@ test_singleEnd_selElements(hid_t file, hbool_t is_chunked) } /* Construct dataset's name */ - HDmemset(dset_name, 0, (size_t)NAME_LEN); + memset(dset_name, 0, (size_t)NAME_LEN); HDstrcat(dset_name, SINGLE_END_DSET); if (is_chunked) HDstrcat(dset_name, "_chunked"); @@ -258,7 +258,7 @@ test_singleEnd_selHyperslab(hid_t file, hbool_t is_chunked) hsize_t mem3_block[4] = {1, 3, 6, 1}; /* Construct dataset's name */ - HDmemset(dset_name, 0, NAME_LEN); + memset(dset_name, 0, NAME_LEN); HDstrcat(dset_name, SINGLE_END_DSET); if (is_chunked) HDstrcat(dset_name, "_chunked"); @@ -435,18 +435,18 @@ test_multiple_ends(hid_t file, hbool_t is_chunked) hsize_t mem5_block[8] = {4, 5, 1, 4, 2, 1, 6, 2}; /* Initialize dynamic arrays */ - data_buf = HDcalloc(1, sizeof(*data_buf)); - CHECK_PTR(data_buf, "HDcalloc"); - mem1_buffer = HDcalloc(1, sizeof(*mem1_buffer)); - CHECK_PTR(data_buf, "HDcalloc"); - mem2_buffer = HDcalloc(1, sizeof(*mem2_buffer)); - CHECK_PTR(data_buf, "HDcalloc"); - mem3_buffer = HDcalloc(1, sizeof(*mem3_buffer)); - CHECK_PTR(data_buf, "HDcalloc"); - mem4_buffer = HDcalloc(1, sizeof(*mem4_buffer)); - CHECK_PTR(data_buf, "HDcalloc"); - mem5_buffer = HDcalloc(1, sizeof(*mem5_buffer)); - CHECK_PTR(data_buf, "HDcalloc"); + data_buf = calloc(1, sizeof(*data_buf)); + CHECK_PTR(data_buf, "calloc"); + mem1_buffer = calloc(1, sizeof(*mem1_buffer)); + CHECK_PTR(data_buf, "calloc"); + mem2_buffer = calloc(1, sizeof(*mem2_buffer)); + CHECK_PTR(data_buf, "calloc"); + mem3_buffer = calloc(1, sizeof(*mem3_buffer)); + CHECK_PTR(data_buf, "calloc"); + mem4_buffer = calloc(1, sizeof(*mem4_buffer)); + CHECK_PTR(data_buf, "calloc"); + mem5_buffer = calloc(1, sizeof(*mem5_buffer)); + CHECK_PTR(data_buf, "calloc"); /* Create and write the dataset */ sid = H5Screate_simple(8, da_dims, da_dims); @@ -461,7 +461,7 @@ test_multiple_ends(hid_t file, hbool_t is_chunked) } /* Construct dataset's name */ - HDmemset(dset_name, 0, NAME_LEN); + memset(dset_name, 0, NAME_LEN); HDstrcat(dset_name, MULTI_ENDS_SEL_HYPER_DSET); if (is_chunked) HDstrcat(dset_name, "_chunked"); @@ -664,12 +664,12 @@ test_multiple_ends(hid_t file, hbool_t is_chunked) ret = H5Pclose(plid); CHECK(ret, FAIL, "H5Pclose"); - HDfree(data_buf); - HDfree(mem1_buffer); - HDfree(mem2_buffer); - HDfree(mem3_buffer); - HDfree(mem4_buffer); - HDfree(mem5_buffer); + free(data_buf); + free(mem1_buffer); + free(mem2_buffer); + free(mem3_buffer); + free(mem4_buffer); + free(mem5_buffer); } /**************************************************************** diff --git a/test/API/testhdf5.c b/test/API/testhdf5.c index e4dc0b6..f38bfcb 100644 --- a/test/API/testhdf5.c +++ b/test/API/testhdf5.c @@ -55,9 +55,9 @@ print_func(const char *format, ...) va_list arglist; int ret_value; - HDva_start(arglist, format); + va_start(arglist, format); ret_value = HDvprintf(format, arglist); - HDva_end(arglist); + va_end(arglist); return ret_value; } @@ -75,9 +75,9 @@ TestErrPrintf(const char *format, ...) nerrors++; /* Print the requested information */ - HDva_start(arglist, format); + va_start(arglist, format); ret_value = HDvprintf(format, arglist); - HDva_end(arglist); + va_end(arglist); /* Return the length of the string produced (like printf() does) */ return ret_value; @@ -117,7 +117,7 @@ getenv_all(MPI_Comm comm, int root, const char *name) int len; static char *env = NULL; - HDassert(name); + assert(name); MPI_Initialized(&mpi_initialized); MPI_Finalized(&mpi_finalized); @@ -125,7 +125,7 @@ getenv_all(MPI_Comm comm, int root, const char *name) if (mpi_initialized && !mpi_finalized) { MPI_Comm_rank(comm, &mpi_rank); MPI_Comm_size(comm, &mpi_size); - HDassert(root < mpi_size); + assert(root < mpi_size); /* The root task does the getenv call * and sends the result to the other tasks */ @@ -146,16 +146,16 @@ getenv_all(MPI_Comm comm, int root, const char *name) MPI_Bcast(&len, 1, MPI_INT, root, comm); if (len >= 0) { if (env == NULL) - env = (char *)HDmalloc((size_t)len + 1); + env = (char *)malloc((size_t)len + 1); else if (HDstrlen(env) < (size_t)len) - env = (char *)HDrealloc(env, (size_t)len + 1); + env = (char *)realloc(env, (size_t)len + 1); MPI_Bcast(env, len, MPI_CHAR, root, comm); env[len] = '\0'; } else { if (env) - HDfree(env); + free(env); env = NULL; } } @@ -166,7 +166,7 @@ getenv_all(MPI_Comm comm, int root, const char *name) else { /* use original getenv */ if (env) - HDfree(env); + free(env); env = HDgetenv(name); } /* end if */ @@ -290,7 +290,7 @@ h5_fixname_real(const char *base_name, hid_t fapl, const char *_suffix, char *fu if (!base_name || !fullname || size < 1) return NULL; - HDmemset(fullname, 0, size); + memset(fullname, 0, size); /* Determine if driver is set by environment variable. If it is, * only generate a suffix if fixing the filename for the superblock @@ -377,13 +377,13 @@ h5_fixname_real(const char *base_name, hid_t fapl, const char *_suffix, char *fu MPI_Comm_rank(MPI_COMM_WORLD, &mpi_rank); if (mpi_rank == 0) - HDprintf("*** Hint ***\n" - "You can use environment variable HDF5_PARAPREFIX to " - "run parallel test files in a\n" - "different directory or to add file type prefix. e.g.,\n" - " HDF5_PARAPREFIX=pfs:/PFS/user/me\n" - " export HDF5_PARAPREFIX\n" - "*** End of Hint ***\n"); + printf("*** Hint ***\n" + "You can use environment variable HDF5_PARAPREFIX to " + "run parallel test files in a\n" + "different directory or to add file type prefix. e.g.,\n" + " HDF5_PARAPREFIX=pfs:/PFS/user/me\n" + " export HDF5_PARAPREFIX\n" + "*** End of Hint ***\n"); explained = TRUE; #ifdef HDF5_PARAPREFIX @@ -515,7 +515,7 @@ h5_using_default_driver(const char *drv_name) { hbool_t ret_val = TRUE; - HDassert(H5_DEFAULT_VFD == H5FD_SEC2); + assert(H5_DEFAULT_VFD == H5FD_SEC2); if (!drv_name) drv_name = HDgetenv(HDF5_DRIVER); @@ -533,8 +533,8 @@ h5_driver_is_default_vfd_compatible(hid_t fapl_id, hbool_t *default_vfd_compatib hid_t driver_id = H5I_INVALID_HID; herr_t ret_value = SUCCEED; - HDassert(fapl_id >= 0); - HDassert(default_vfd_compatible); + assert(fapl_id >= 0); + assert(default_vfd_compatible); if (fapl_id == H5P_DEFAULT) fapl_id = H5P_FILE_ACCESS_DEFAULT; @@ -560,25 +560,25 @@ main(int argc, char *argv[]) (void)argv; #endif - HDprintf("===================================\n"); - HDprintf("HDF5 TESTS START\n"); - HDprintf("===================================\n"); + printf("===================================\n"); + printf("HDF5 TESTS START\n"); + printf("===================================\n"); /* Initialize testing framework */ /* TestInit(argv[0], NULL, NULL); */ /* Tests are generally arranged from least to most complexity... */ /* AddTest("config", test_configure, cleanup_configure, "Configure definitions", NULL); */ - HDprintf("** CONFIGURE DEFINITIONS **\n"); + printf("** CONFIGURE DEFINITIONS **\n"); test_configure(); - HDprintf("\n"); + printf("\n"); /* AddTest("metadata", test_metadata, cleanup_metadata, "Encoding/decoding metadata", NULL); */ /* AddTest("checksum", test_checksum, cleanup_checksum, "Checksum algorithm", NULL); */ - HDprintf("** CHECKSUM ALGORITHM **\n"); + printf("** CHECKSUM ALGORITHM **\n"); test_checksum(); - HDprintf("\n"); + printf("\n"); /* AddTest("tst", test_tst, NULL, "Ternary Search Trees", NULL); */ @@ -589,89 +589,89 @@ main(int argc, char *argv[]) /* AddTest("refstr", test_refstr, NULL, "Reference Counted Strings", NULL); */ /* AddTest("file", test_file, cleanup_file, "Low-Level File I/O", NULL); */ - HDprintf("** LOW-LEVEL FILE I/O **\n"); + printf("** LOW-LEVEL FILE I/O **\n"); test_file(); - HDprintf("\n"); + printf("\n"); /* AddTest("objects", test_h5o, cleanup_h5o, "Generic Object Functions", NULL); */ - HDprintf("** GENERIC OBJECT FUNCTIONS **\n"); + printf("** GENERIC OBJECT FUNCTIONS **\n"); test_h5o(); - HDprintf("\n"); + printf("\n"); /* AddTest("h5s", test_h5s, cleanup_h5s, "Dataspaces", NULL); */ - HDprintf("** DATASPACES **\n"); + printf("** DATASPACES **\n"); test_h5s(); - HDprintf("\n"); + printf("\n"); /* AddTest("coords", test_coords, cleanup_coords, "Dataspace coordinates", NULL); */ - HDprintf("** DATASPACE COORDINATES **\n"); + printf("** DATASPACE COORDINATES **\n"); test_coords(); - HDprintf("\n"); + printf("\n"); /* AddTest("sohm", test_sohm, cleanup_sohm, "Shared Object Header Messages", NULL); */ /* AddTest("attr", test_attr, cleanup_attr, "Attributes", NULL); */ - HDprintf("** ATTRIBUTES **\n"); + printf("** ATTRIBUTES **\n"); test_attr(); - HDprintf("\n"); + printf("\n"); /* AddTest("select", test_select, cleanup_select, "Selections", NULL); */ - HDprintf("** SELECTIONS **\n"); + printf("** SELECTIONS **\n"); test_select(); - HDprintf("\n"); + printf("\n"); /* AddTest("time", test_time, cleanup_time, "Time Datatypes", NULL); */ - HDprintf("** TIME DATATYPES**\n"); + printf("** TIME DATATYPES**\n"); test_time(); - HDprintf("\n"); + printf("\n"); /* AddTest("ref_deprec", test_reference_deprec, cleanup_reference_deprec, "Deprecated References", NULL); */ /* AddTest("ref", test_reference, cleanup_reference, "References", NULL); */ - HDprintf("** REFERENCES **\n"); + printf("** REFERENCES **\n"); test_reference(); - HDprintf("\n"); + printf("\n"); /* AddTest("vltypes", test_vltypes, cleanup_vltypes, "Variable-Length Datatypes", NULL); */ - HDprintf("** VARIABLE-LENGTH DATATYPES **\n"); + printf("** VARIABLE-LENGTH DATATYPES **\n"); test_vltypes(); - HDprintf("\n"); + printf("\n"); /* AddTest("vlstrings", test_vlstrings, cleanup_vlstrings, "Variable-Length Strings", NULL); */ - HDprintf("** VARIABLE-LENGTH STRINGS **\n"); + printf("** VARIABLE-LENGTH STRINGS **\n"); test_vlstrings(); - HDprintf("\n"); + printf("\n"); /* AddTest("iterate", test_iterate, cleanup_iterate, "Group & Attribute Iteration", NULL); */ - HDprintf("** GROUP & ATTRIBUTE ITERATION **\n"); + printf("** GROUP & ATTRIBUTE ITERATION **\n"); test_iterate(); - HDprintf("\n"); + printf("\n"); /* AddTest("array", test_array, cleanup_array, "Array Datatypes", NULL); */ - HDprintf("** ARRAY DATATYPES **\n"); + printf("** ARRAY DATATYPES **\n"); test_array(); - HDprintf("\n"); + printf("\n"); /* AddTest("genprop", test_genprop, cleanup_genprop, "Generic Properties", NULL); */ - HDprintf("** GENERIC PROPERTIES **\n"); + printf("** GENERIC PROPERTIES **\n"); test_genprop(); - HDprintf("\n"); + printf("\n"); /* AddTest("unicode", test_unicode, cleanup_unicode, "UTF-8 Encoding", NULL); */ - HDprintf("** UTF-8 ENCODING **\n"); + printf("** UTF-8 ENCODING **\n"); test_unicode(); - HDprintf("\n"); + printf("\n"); /* AddTest("id", test_ids, NULL, "User-Created Identifiers", NULL); */ - HDprintf("** USER-CREATED IDENTIFIERS **\n"); + printf("** USER-CREATED IDENTIFIERS **\n"); test_ids(); - HDprintf("\n"); + printf("\n"); /* AddTest("misc", test_misc, cleanup_misc, "Miscellaneous", NULL); */ - HDprintf("** MISCELLANEOUS **\n"); + printf("** MISCELLANEOUS **\n"); test_misc(); - HDprintf("\n"); + printf("\n"); /* Display testing information */ /* TestInfo(argv[0]); */ @@ -690,7 +690,7 @@ main(int argc, char *argv[]) if (/* GetTestCleanup() && */ !getenv("HDF5_NOCLEANUP")) { /* TestCleanup(); */ - HDprintf("TEST CLEANUP\n"); + printf("TEST CLEANUP\n"); H5E_BEGIN_TRY cleanup_configure(); @@ -712,7 +712,7 @@ main(int argc, char *argv[]) cleanup_misc(); H5E_END_TRY; - HDprintf("\n"); + printf("\n"); } /* Release test infrastructure */ @@ -721,11 +721,11 @@ main(int argc, char *argv[]) /* Exit failure if errors encountered; else exit success. */ /* No need to print anything since PerformTests() already does. */ if (nerrors /* GetTestNumErrs() */ > 0) { - HDprintf("** HDF5 tests failed with %d errors **\n", nerrors); - HDexit(EXIT_FAILURE); + printf("** HDF5 tests failed with %d errors **\n", nerrors); + exit(EXIT_FAILURE); } else { - HDprintf("** HDF5 tests ran successfully **\n"); - HDexit(EXIT_SUCCESS); + printf("** HDF5 tests ran successfully **\n"); + exit(EXIT_SUCCESS); } } /* end main() */ diff --git a/test/API/tfile.c b/test/API/tfile.c index c0b2921..008fd5e 100644 --- a/test/API/tfile.c +++ b/test/API/tfile.c @@ -1230,8 +1230,8 @@ test_get_obj_ids(void) CHECK(oid_count, FAIL, "H5Fget_obj_count"); VERIFY(oid_count, (NGROUPS + NDSETS + 1), "H5Fget_obj_count"); - oid_list = (hid_t *)HDcalloc((size_t)oid_list_size, sizeof(hid_t)); - CHECK_PTR(oid_list, "HDcalloc"); + oid_list = (hid_t *)calloc((size_t)oid_list_size, sizeof(hid_t)); + CHECK_PTR(oid_list, "calloc"); /* Call the public function H5F_get_obj_ids to use H5F__get_objects. User reported having problem here. * that the returned size (ret_count) from H5Fget_obj_ids is one greater than the size passed in @@ -1271,7 +1271,7 @@ test_get_obj_ids(void) H5Sclose(filespace); H5Fclose(fid); - HDfree(oid_list); + free(oid_list); /* Reopen the file to check whether H5Fget_obj_count and H5Fget_obj_ids still works * when the file is closed first */ @@ -1294,8 +1294,8 @@ test_get_obj_ids(void) CHECK(oid_count, FAIL, "H5Fget_obj_count"); VERIFY(oid_count, NDSETS, "H5Fget_obj_count"); - oid_list = (hid_t *)HDcalloc((size_t)oid_count, sizeof(hid_t)); - CHECK_PTR(oid_list, "HDcalloc"); + oid_list = (hid_t *)calloc((size_t)oid_count, sizeof(hid_t)); + CHECK_PTR(oid_list, "calloc"); /* Get the list of all opened objects */ ret_count = H5Fget_obj_ids((hid_t)H5F_OBJ_ALL, H5F_OBJ_ALL, (size_t)oid_count, oid_list); @@ -1310,7 +1310,7 @@ test_get_obj_ids(void) } H5E_END_TRY; - HDfree(oid_list); + free(oid_list); } } @@ -1536,7 +1536,7 @@ test_obj_count_and_id(hid_t fid1, hid_t fid2, hid_t did, hid_t gid1, hid_t gid2, if (oid_count > 0) { hid_t *oid_list; - oid_list = (hid_t *)HDcalloc((size_t)oid_count, sizeof(hid_t)); + oid_list = (hid_t *)calloc((size_t)oid_count, sizeof(hid_t)); if (oid_list != NULL) { int i; @@ -1586,7 +1586,7 @@ test_obj_count_and_id(hid_t fid1, hid_t fid2, hid_t did, hid_t gid1, hid_t gid2, } /* end switch */ } /* end for */ - HDfree(oid_list); + free(oid_list); } /* end if */ } /* end if */ @@ -2852,7 +2852,7 @@ test_file_double_file_dataset_open(hbool_t new_format) CHECK(tid1, FAIL, "H5Tcopy"); /* Second file's dataset read */ - HDmemset(buffer, 0, sizeof(char *) * 5); + memset(buffer, 0, sizeof(char *) * 5); ret = H5Dread(did2, tid2, H5S_ALL, H5S_ALL, H5P_DEFAULT, buffer); CHECK(ret, FAIL, "H5Dread"); ret = H5Treclaim(tid2, sid1, H5P_DEFAULT, buffer); @@ -2867,7 +2867,7 @@ test_file_double_file_dataset_open(hbool_t new_format) CHECK(ret, FAIL, "H5Fclose"); /* First file's dataset read */ - HDmemset(buffer, 0, sizeof(char *) * 5); + memset(buffer, 0, sizeof(char *) * 5); ret = H5Dread(did1, tid1, H5S_ALL, H5S_ALL, H5P_DEFAULT, buffer); CHECK(ret, FAIL, "H5Dread"); ret = H5Treclaim(tid2, sid1, H5P_DEFAULT, buffer); @@ -3245,19 +3245,19 @@ cal_chksum(const char *file, uint32_t *chksum) CHECK(fdes, FAIL, "HDfstat"); /* Allocate space for the file data */ - file_data = HDmalloc((size_t)sb.st_size); - CHECK_PTR(file_data, "HDmalloc"); + file_data = malloc((size_t)sb.st_size); + CHECK_PTR(file_data, "malloc"); 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, "HDmalloc"); + CHECK(bytes_read == sb.st_size, FALSE, "malloc"); /* Calculate checksum */ *chksum = H5_checksum_lookup3(file_data, sizeof(file_data), 0); /* Free memory */ - HDfree(file_data); + free(file_data); } /* Close the file */ @@ -4486,9 +4486,9 @@ set_multi_split(hid_t fapl, hsize_t pagesize, hbool_t split) hbool_t relax; H5FD_mem_t mt; - HDassert(split); + assert(split); - HDmemset(memb_name, 0, sizeof memb_name); + memset(memb_name, 0, sizeof memb_name); /* Get current split settings */ if (H5Pget_fapl_multi(fapl, memb_map, memb_fapl_arr, memb_name, memb_addr, &relax) < 0) @@ -4512,7 +4512,7 @@ set_multi_split(hid_t fapl, hsize_t pagesize, hbool_t split) /* Free memb_name */ for (mt = H5FD_MEM_DEFAULT; mt < H5FD_MEM_NTYPES; mt++) - HDfree(memb_name[mt]); + free(memb_name[mt]); return 0; @@ -4843,7 +4843,7 @@ test_sects_freespace(const char *env_h5_drvr, hbool_t new_format) VERIFY(nsects, FAIL, "H5Fget_free_sections"); /* Retrieve and verify free space info for all the sections */ - HDmemset(all_sect_info, 0, sizeof(all_sect_info)); + memset(all_sect_info, 0, sizeof(all_sect_info)); nsects = H5Fget_free_sections(file, H5FD_MEM_DEFAULT, (size_t)nall, all_sect_info); VERIFY(nsects, nall, "H5Fget_free_sections"); @@ -4857,7 +4857,7 @@ test_sects_freespace(const char *env_h5_drvr, hbool_t new_format) last_size = all_sect_info[nall - 1].size; /* Retrieve and verify free space info for -1 sections */ - HDmemset(sect_info, 0, sizeof(sect_info)); + memset(sect_info, 0, sizeof(sect_info)); nsects = H5Fget_free_sections(file, H5FD_MEM_DEFAULT, (size_t)(nall - 1), sect_info); VERIFY(nsects, nall, "H5Fget_free_sections"); @@ -4872,7 +4872,7 @@ test_sects_freespace(const char *env_h5_drvr, hbool_t new_format) VERIFY(((hsize_t)free_space - last_size), total, "H5Fget_free_sections"); #endif /* Retrieve and verify free-space info for +1 sections */ - HDmemset(sect_info, 0, sizeof(sect_info)); + memset(sect_info, 0, sizeof(sect_info)); nsects = H5Fget_free_sections(file, H5FD_MEM_DEFAULT, (size_t)(nall + 1), sect_info); VERIFY(nsects, nall, "H5Fget_free_sections"); @@ -4889,7 +4889,7 @@ test_sects_freespace(const char *env_h5_drvr, hbool_t new_format) VERIFY(free_space, total, "H5Fget_free_sections"); #endif - HDmemset(meta_sect_info, 0, sizeof(meta_sect_info)); + memset(meta_sect_info, 0, sizeof(meta_sect_info)); if (multi_vfd) { hssize_t ntmp; @@ -4922,7 +4922,7 @@ test_sects_freespace(const char *env_h5_drvr, hbool_t new_format) CHECK(nraw, FAIL, "H5Fget_free_sections"); /* Retrieve and verify free-space sections for raw data */ - HDmemset(raw_sect_info, 0, sizeof(raw_sect_info)); + memset(raw_sect_info, 0, sizeof(raw_sect_info)); nsects = H5Fget_free_sections(file, H5FD_MEM_DRAW, (size_t)nraw, raw_sect_info); VERIFY(nsects, nraw, "H5Fget_free_sections"); @@ -5742,7 +5742,7 @@ test_libver_bounds_copy(void) CHECK_I(ret, "h5_driver_is_default_vfd_compatible"); if (!driver_is_default_compatible) { - HDprintf("-- SKIPPED --\n"); + printf("-- SKIPPED --\n"); return; } diff --git a/test/API/tgenprop.c b/test/API/tgenprop.c index c1ee8af..43b05c1 100644 --- a/test/API/tgenprop.c +++ b/test/API/tgenprop.c @@ -703,8 +703,8 @@ test_genprop_basic_list(void) CHECK_I(ret, "H5Pget"); /* Verify the floating-poing value in this way to avoid compiler warning. */ if (!H5_FLT_ABS_EQUAL(prop2_value, *PROP2_DEF_VALUE)) - HDprintf("*** UNEXPECTED VALUE from %s should be %f, but is %f at line %4d in %s\n", "H5Pget", - (double)*PROP2_DEF_VALUE, (double)prop2_value, (int)__LINE__, __FILE__); + printf("*** UNEXPECTED VALUE from %s should be %f, but is %f at line %4d in %s\n", "H5Pget", + (double)*PROP2_DEF_VALUE, (double)prop2_value, (int)__LINE__, __FILE__); /* Close list */ ret = H5Pclose(lid1); @@ -796,20 +796,20 @@ test_genprop_basic_list_prop(void) CHECK_I(ret, "H5Pget"); /* Verify the floating-poing value in this way to avoid compiler warning. */ if (!H5_FLT_ABS_EQUAL(prop2_value, *PROP2_DEF_VALUE)) - HDprintf("*** UNEXPECTED VALUE from %s should be %f, but is %f at line %4d in %s\n", "H5Pget", - (double)*PROP2_DEF_VALUE, (double)prop2_value, (int)__LINE__, __FILE__); + printf("*** UNEXPECTED VALUE from %s should be %f, but is %f at line %4d in %s\n", "H5Pget", + (double)*PROP2_DEF_VALUE, (double)prop2_value, (int)__LINE__, __FILE__); /* Check values of temporary properties (set with regular values) */ ret = H5Pget(lid1, PROP3_NAME, &prop3_value); CHECK_I(ret, "H5Pget"); - if (HDmemcmp(&prop3_value, PROP3_DEF_VALUE, PROP3_SIZE) != 0) + if (memcmp(&prop3_value, PROP3_DEF_VALUE, PROP3_SIZE) != 0) TestErrPrintf("Property #3 doesn't match!, line=%d\n", __LINE__); ret = H5Pget(lid1, PROP4_NAME, &prop4_value); CHECK_I(ret, "H5Pget"); /* Verify the floating-poing value in this way to avoid compiler warning. */ if (!H5_DBL_ABS_EQUAL(prop4_value, *PROP4_DEF_VALUE)) - HDprintf("*** UNEXPECTED VALUE from %s should be %f, but is %f at line %4d in %s\n", "H5Pget", - *PROP4_DEF_VALUE, prop4_value, (int)__LINE__, __FILE__); + printf("*** UNEXPECTED VALUE from %s should be %f, but is %f at line %4d in %s\n", "H5Pget", + *PROP4_DEF_VALUE, prop4_value, (int)__LINE__, __FILE__); /* Delete permanent property */ ret = H5Premove(lid1, PROP2_NAME); @@ -845,8 +845,8 @@ test_genprop_basic_list_prop(void) CHECK_I(ret, "H5Pget"); /* Verify the floating-poing value in this way to avoid compiler warning. */ if (!H5_DBL_ABS_EQUAL(prop4_value, *PROP4_DEF_VALUE)) - HDprintf("*** UNEXPECTED VALUE from %s should be %f, but is %f at line %4d in %s\n", "H5Pget", - *PROP4_DEF_VALUE, prop4_value, (int)__LINE__, __FILE__); + printf("*** UNEXPECTED VALUE from %s should be %f, but is %f at line %4d in %s\n", "H5Pget", + *PROP4_DEF_VALUE, prop4_value, (int)__LINE__, __FILE__); /* Close list */ ret = H5Pclose(lid1); @@ -1027,8 +1027,8 @@ test_genprop_prop_crt_cb1(const char *name, size_t size, void *def_value) /* Set the information from the creation call */ prop1_cb_info.crt_count++; prop1_cb_info.crt_name = HDstrdup(name); - prop1_cb_info.crt_value = HDmalloc(size); - HDmemcpy(prop1_cb_info.crt_value, def_value, size); + prop1_cb_info.crt_value = malloc(size); + memcpy(prop1_cb_info.crt_value, def_value, size); return (SUCCEED); } @@ -1047,8 +1047,8 @@ test_genprop_prop_set_cb1(hid_t plist_id, const char *name, size_t size, void *v if (prop1_cb_info.set_name == NULL) prop1_cb_info.set_name = HDstrdup(name); if (prop1_cb_info.set_value == NULL) - prop1_cb_info.set_value = HDmalloc(size); - HDmemcpy(prop1_cb_info.set_value, value, size); + prop1_cb_info.set_value = malloc(size); + memcpy(prop1_cb_info.set_value, value, size); return (SUCCEED); } @@ -1067,8 +1067,8 @@ test_genprop_prop_get_cb1(hid_t plist_id, const char *name, size_t size, void *v if (prop1_cb_info.get_name == NULL) prop1_cb_info.get_name = HDstrdup(name); if (prop1_cb_info.get_value == NULL) - prop1_cb_info.get_value = HDmalloc(size); - HDmemcpy(prop1_cb_info.get_value, value, size); + prop1_cb_info.get_value = malloc(size); + memcpy(prop1_cb_info.get_value, value, size); return (SUCCEED); } @@ -1086,8 +1086,8 @@ test_genprop_prop_cop_cb1(const char *name, size_t size, void *value) if (prop1_cb_info.cop_name == NULL) prop1_cb_info.cop_name = HDstrdup(name); if (prop1_cb_info.cop_value == NULL) - prop1_cb_info.cop_value = HDmalloc(size); - HDmemcpy(prop1_cb_info.cop_value, value, size); + prop1_cb_info.cop_value = malloc(size); + memcpy(prop1_cb_info.cop_value, value, size); return (SUCCEED); } @@ -1103,7 +1103,7 @@ test_genprop_prop_cmp_cb1(const void *value1, const void *value2, size_t size) /* Set the information from the comparison call */ prop1_cb_info.cmp_count++; - return (HDmemcmp(value1, value2, size)); + return (memcmp(value1, value2, size)); } /**************************************************************** @@ -1117,7 +1117,7 @@ test_genprop_prop_cmp_cb3(const void *value1, const void *value2, size_t size) /* Set the information from the comparison call */ prop3_cb_info.cmp_count++; - return (HDmemcmp(value1, value2, size)); + return (memcmp(value1, value2, size)); } /**************************************************************** @@ -1133,8 +1133,8 @@ test_genprop_prop_cls_cb1(const char *name, size_t size, void *value) if (prop1_cb_info.cls_name == NULL) prop1_cb_info.cls_name = HDstrdup(name); if (prop1_cb_info.cls_value == NULL) - prop1_cb_info.cls_value = HDmalloc(size); - HDmemcpy(prop1_cb_info.cls_value, value, size); + prop1_cb_info.cls_value = malloc(size); + memcpy(prop1_cb_info.cls_value, value, size); return (SUCCEED); } @@ -1151,8 +1151,8 @@ test_genprop_prop_del_cb2(hid_t plist_id, const char *name, size_t size, void *v prop2_cb_info.del_count++; prop2_cb_info.del_plist_id = plist_id; prop2_cb_info.del_name = HDstrdup(name); - prop2_cb_info.del_value = HDmalloc(size); - HDmemcpy(prop2_cb_info.del_value, value, size); + prop2_cb_info.del_value = malloc(size); + memcpy(prop2_cb_info.del_value, value, size); return (SUCCEED); } @@ -1221,9 +1221,9 @@ test_genprop_list_callback(void) cop_cb_struct.id = (-1); /* Initialize callback information for properties tracked */ - HDmemset(&prop1_cb_info, 0, sizeof(prop_cb_info)); - HDmemset(&prop2_cb_info, 0, sizeof(prop_cb_info)); - HDmemset(&prop3_cb_info, 0, sizeof(prop_cb_info)); + memset(&prop1_cb_info, 0, sizeof(prop_cb_info)); + memset(&prop2_cb_info, 0, sizeof(prop_cb_info)); + memset(&prop3_cb_info, 0, sizeof(prop_cb_info)); /* Create a property list from the class */ lid1 = H5Pcreate(cid1); @@ -1240,7 +1240,7 @@ test_genprop_list_callback(void) VERIFY(prop1_cb_info.crt_count, 1, "H5Pcreate"); if (HDstrcmp(prop1_cb_info.crt_name, PROP1_NAME) != 0) TestErrPrintf("Property #1 name doesn't match!, line=%d\n", __LINE__); - if (HDmemcmp(prop1_cb_info.crt_value, PROP1_DEF_VALUE, PROP1_SIZE) != 0) + if (memcmp(prop1_cb_info.crt_value, PROP1_DEF_VALUE, PROP1_SIZE) != 0) TestErrPrintf("Property #1 value doesn't match!, line=%d\n", __LINE__); /* Check values of permanent properties (set with default values) */ @@ -1253,13 +1253,13 @@ test_genprop_list_callback(void) CHECK_I(ret, "H5Pget"); /* Verify the floating-poing value in this way to avoid compiler warning. */ if (!H5_FLT_ABS_EQUAL(prop2_value, *PROP2_DEF_VALUE)) - HDprintf("*** UNEXPECTED VALUE from %s should be %f, but is %f at line %4d in %s\n", "H5Pget", - (double)*PROP2_DEF_VALUE, (double)prop2_value, (int)__LINE__, __FILE__); + printf("*** UNEXPECTED VALUE from %s should be %f, but is %f at line %4d in %s\n", "H5Pget", + (double)*PROP2_DEF_VALUE, (double)prop2_value, (int)__LINE__, __FILE__); /* Check values of temporary properties (set with regular values) */ ret = H5Pget(lid1, PROP3_NAME, &prop3_value); CHECK_I(ret, "H5Pget"); - if (HDmemcmp(&prop3_value, PROP3_DEF_VALUE, PROP3_SIZE) != 0) + if (memcmp(&prop3_value, PROP3_DEF_VALUE, PROP3_SIZE) != 0) TestErrPrintf("Property #3 doesn't match!, line=%d\n", __LINE__); /* The compare callback should not have been called, as there is no get * callback for this property */ @@ -1268,15 +1268,15 @@ test_genprop_list_callback(void) CHECK_I(ret, "H5Pget"); /* Verify the floating-poing value in this way to avoid compiler warning. */ if (!H5_DBL_ABS_EQUAL(prop4_value, *PROP4_DEF_VALUE)) - HDprintf("*** UNEXPECTED VALUE from %s should be %f, but is %f at line %4d in %s\n", "H5Pget", - *PROP4_DEF_VALUE, prop4_value, (int)__LINE__, __FILE__); + printf("*** UNEXPECTED VALUE from %s should be %f, but is %f at line %4d in %s\n", "H5Pget", + *PROP4_DEF_VALUE, prop4_value, (int)__LINE__, __FILE__); /* Verify get callback information for properties tracked */ VERIFY(prop1_cb_info.get_count, 1, "H5Pget"); VERIFY(prop1_cb_info.get_plist_id, lid1, "H5Pget"); if (HDstrcmp(prop1_cb_info.get_name, PROP1_NAME) != 0) TestErrPrintf("Property #1 name doesn't match!, line=%d\n", __LINE__); - if (HDmemcmp(prop1_cb_info.get_value, PROP1_DEF_VALUE, PROP1_SIZE) != 0) + if (memcmp(prop1_cb_info.get_value, PROP1_DEF_VALUE, PROP1_SIZE) != 0) TestErrPrintf("Property #1 value doesn't match!, line=%d\n", __LINE__); /* Set value of property #1 to different value */ @@ -1288,7 +1288,7 @@ test_genprop_list_callback(void) VERIFY(prop1_cb_info.set_plist_id, lid1, "H5Pset"); if (HDstrcmp(prop1_cb_info.set_name, PROP1_NAME) != 0) TestErrPrintf("Property #1 name doesn't match!, line=%d\n", __LINE__); - if (HDmemcmp(prop1_cb_info.set_value, &prop1_new_value, PROP1_SIZE) != 0) + if (memcmp(prop1_cb_info.set_value, &prop1_new_value, PROP1_SIZE) != 0) TestErrPrintf("Property #1 value doesn't match!, line=%d\n", __LINE__); /* The compare callback should not have been called */ @@ -1311,7 +1311,7 @@ test_genprop_list_callback(void) VERIFY(prop1_cb_info.get_plist_id, lid1, "H5Pget"); if (HDstrcmp(prop1_cb_info.get_name, PROP1_NAME) != 0) TestErrPrintf("Property #1 name doesn't match!, line=%d\n", __LINE__); - if (HDmemcmp(prop1_cb_info.get_value, &prop1_new_value, PROP1_SIZE) != 0) + if (memcmp(prop1_cb_info.get_value, &prop1_new_value, PROP1_SIZE) != 0) TestErrPrintf("Property #1 value doesn't match!, line=%d\n", __LINE__); /* Delete property #2 */ @@ -1323,7 +1323,7 @@ test_genprop_list_callback(void) VERIFY(prop2_cb_info.del_plist_id, lid1, "H5Premove"); if (HDstrcmp(prop2_cb_info.del_name, PROP2_NAME) != 0) TestErrPrintf("Property #2 name doesn't match!, line=%d\n", __LINE__); - if (HDmemcmp(prop2_cb_info.del_value, PROP2_DEF_VALUE, PROP2_SIZE) != 0) + if (memcmp(prop2_cb_info.del_value, PROP2_DEF_VALUE, PROP2_SIZE) != 0) TestErrPrintf("Property #2 value doesn't match!, line=%d\n", __LINE__); /* Copy first list */ @@ -1334,7 +1334,7 @@ test_genprop_list_callback(void) VERIFY(prop1_cb_info.cop_count, 1, "H5Pcopy"); if (HDstrcmp(prop1_cb_info.cop_name, PROP1_NAME) != 0) TestErrPrintf("Property #1 name doesn't match!, line=%d\n", __LINE__); - if (HDmemcmp(prop1_cb_info.cop_value, &prop1_new_value, PROP1_SIZE) != 0) + if (memcmp(prop1_cb_info.cop_value, &prop1_new_value, PROP1_SIZE) != 0) TestErrPrintf("Property #1 value doesn't match!, line=%d\n", __LINE__); /* Verify that the class creation callback occurred */ @@ -1357,7 +1357,7 @@ test_genprop_list_callback(void) VERIFY(prop1_cb_info.cls_count, 1, "H5Pclose"); if (HDstrcmp(prop1_cb_info.cls_name, PROP1_NAME) != 0) TestErrPrintf("Property #1 name doesn't match!, line=%d\n", __LINE__); - if (HDmemcmp(prop1_cb_info.cls_value, &prop1_new_value, PROP1_SIZE) != 0) + if (memcmp(prop1_cb_info.cls_value, &prop1_new_value, PROP1_SIZE) != 0) TestErrPrintf("Property #1 value doesn't match!, line=%d\n", __LINE__); /* Close second list */ @@ -1368,18 +1368,18 @@ test_genprop_list_callback(void) VERIFY(prop1_cb_info.cls_count, 2, "H5Pclose"); /* Free memory allocated for tracking properties */ - HDfree(prop1_cb_info.crt_name); - HDfree(prop1_cb_info.crt_value); - HDfree(prop1_cb_info.get_name); - HDfree(prop1_cb_info.get_value); - HDfree(prop1_cb_info.set_name); - HDfree(prop1_cb_info.set_value); - HDfree(prop1_cb_info.cop_name); - HDfree(prop1_cb_info.cop_value); - HDfree(prop1_cb_info.cls_name); - HDfree(prop1_cb_info.cls_value); - HDfree(prop2_cb_info.del_name); - HDfree(prop2_cb_info.del_value); + free(prop1_cb_info.crt_name); + free(prop1_cb_info.crt_value); + free(prop1_cb_info.get_name); + free(prop1_cb_info.get_value); + free(prop1_cb_info.set_name); + free(prop1_cb_info.set_value); + free(prop1_cb_info.cop_name); + free(prop1_cb_info.cop_value); + free(prop1_cb_info.cls_name); + free(prop1_cb_info.cls_value); + free(prop2_cb_info.del_name); + free(prop2_cb_info.del_value); /* Close class */ ret = H5Pclose_class(cid1); diff --git a/test/API/th5o.c b/test/API/th5o.c index 916f005..eab3281 100644 --- a/test/API/th5o.c +++ b/test/API/th5o.c @@ -962,10 +962,10 @@ test_h5o_link(void) /* Allocate memory buffers */ /* (These are treated as 2-D buffers) */ - wdata = (int *)HDmalloc((size_t)(TEST6_DIM1 * TEST6_DIM2) * sizeof(int)); - CHECK_PTR(wdata, "HDmalloc"); - rdata = (int *)HDmalloc((size_t)(TEST6_DIM1 * TEST6_DIM2) * sizeof(int)); - CHECK_PTR(rdata, "HDmalloc"); + wdata = (int *)malloc((size_t)(TEST6_DIM1 * TEST6_DIM2) * sizeof(int)); + CHECK_PTR(wdata, "malloc"); + rdata = (int *)malloc((size_t)(TEST6_DIM1 * TEST6_DIM2) * sizeof(int)); + CHECK_PTR(rdata, "malloc"); /* Initialize the raw data */ for (i = n = 0; i < (TEST6_DIM1 * TEST6_DIM2); i++) @@ -1088,8 +1088,8 @@ test_h5o_link(void) CHECK(ret, FAIL, "H5Pclose"); /* Release buffers */ - HDfree(wdata); - HDfree(rdata); + free(wdata); + free(rdata); } /* end test_h5o_link() */ #if 0 @@ -1463,8 +1463,8 @@ test_h5o_getinfo_same_file(void) CHECK(gid2, FAIL, "H5Gcreate2"); /* Reset object info */ - HDmemset(&oinfo1, 0, sizeof(oinfo1)); - HDmemset(&oinfo2, 0, sizeof(oinfo2)); + memset(&oinfo1, 0, sizeof(oinfo1)); + memset(&oinfo2, 0, sizeof(oinfo2)); /* Query the object info for each object, through group IDs */ ret = H5Oget_info3(gid1, &oinfo1, H5O_INFO_BASIC); @@ -1475,8 +1475,8 @@ test_h5o_getinfo_same_file(void) VERIFY(oinfo1.fileno, oinfo2.fileno, "file number from H5Oget_info3"); /* Reset object info */ - HDmemset(&oinfo1, 0, sizeof(oinfo1)); - HDmemset(&oinfo2, 0, sizeof(oinfo2)); + memset(&oinfo1, 0, sizeof(oinfo1)); + memset(&oinfo2, 0, sizeof(oinfo2)); /* Query the object info for each object, by name */ ret = H5Oget_info_by_name3(fid1, "group1", &oinfo1, H5O_INFO_BASIC, H5P_DEFAULT); @@ -1507,8 +1507,8 @@ test_h5o_getinfo_same_file(void) CHECK(gid2, FAIL, "H5Gopen2"); /* Reset object info */ - HDmemset(&oinfo1, 0, sizeof(oinfo1)); - HDmemset(&oinfo2, 0, sizeof(oinfo2)); + memset(&oinfo1, 0, sizeof(oinfo1)); + memset(&oinfo2, 0, sizeof(oinfo2)); /* Query the object info for each object, through group IDs */ ret = H5Oget_info3(gid1, &oinfo1, H5O_INFO_BASIC); @@ -1519,8 +1519,8 @@ test_h5o_getinfo_same_file(void) VERIFY(oinfo1.fileno, oinfo2.fileno, "file number from H5Oget_info3"); /* Reset object info */ - HDmemset(&oinfo1, 0, sizeof(oinfo1)); - HDmemset(&oinfo2, 0, sizeof(oinfo2)); + memset(&oinfo1, 0, sizeof(oinfo1)); + memset(&oinfo2, 0, sizeof(oinfo2)); /* Query the object info for each object, by name */ ret = H5Oget_info_by_name3(fid1, "group1", &oinfo1, H5O_INFO_BASIC, H5P_DEFAULT); @@ -1782,8 +1782,8 @@ test_h5o_getinfo_visit(void) CHECK(gid2, FAIL, "H5Gcreate2"); /* Reset object info */ - HDmemset(&oinfo1, 0, sizeof(oinfo1)); - HDmemset(&oinfo2, 0, sizeof(oinfo2)); + memset(&oinfo1, 0, sizeof(oinfo1)); + memset(&oinfo2, 0, sizeof(oinfo2)); /* Query the object info for "group1" via H5Oget_info1 and H5Oget_info2 */ ret = H5Oget_info1(gid1, &oinfo1); @@ -1796,8 +1796,8 @@ test_h5o_getinfo_visit(void) VERIFY(oinfo1.num_attrs, oinfo2.num_attrs, "obj info from H5Oget_info1/2"); /* Reset object info */ - HDmemset(&oinfo1, 0, sizeof(oinfo1)); - HDmemset(&oinfo2, 0, sizeof(oinfo2)); + memset(&oinfo1, 0, sizeof(oinfo1)); + memset(&oinfo2, 0, sizeof(oinfo2)); /* Query the object info for "group2" via H5Oget_info1 and H5Oget_info2 */ ret = H5Oget_info_by_name1(fid, "group2", &oinfo1, H5P_DEFAULT); diff --git a/test/API/th5s.c b/test/API/th5s.c index f09cfeb..e6343f2 100644 --- a/test/API/th5s.c +++ b/test/API/th5s.c @@ -148,7 +148,7 @@ test_h5s_basic(void) rank = H5Sget_simple_extent_dims(sid1, tdims, NULL); CHECK(rank, FAIL, "H5Sget_simple_extent_dims"); - VERIFY(HDmemcmp(tdims, dims1, SPACE1_RANK * sizeof(hsize_t)), 0, "H5Sget_simple_extent_dims"); + VERIFY(memcmp(tdims, dims1, SPACE1_RANK * sizeof(hsize_t)), 0, "H5Sget_simple_extent_dims"); sid2 = H5Screate_simple(SPACE2_RANK, dims2, max2); CHECK(sid2, FAIL, "H5Screate_simple"); @@ -163,16 +163,16 @@ test_h5s_basic(void) rank = H5Sget_simple_extent_dims(sid2, tdims, tmax); CHECK(rank, FAIL, "H5Sget_simple_extent_dims"); - VERIFY(HDmemcmp(tdims, dims2, SPACE2_RANK * sizeof(hsize_t)), 0, "H5Sget_simple_extent_dims"); - VERIFY(HDmemcmp(tmax, max2, SPACE2_RANK * sizeof(hsize_t)), 0, "H5Sget_simple_extent_dims"); + VERIFY(memcmp(tdims, dims2, SPACE2_RANK * sizeof(hsize_t)), 0, "H5Sget_simple_extent_dims"); + VERIFY(memcmp(tmax, max2, SPACE2_RANK * sizeof(hsize_t)), 0, "H5Sget_simple_extent_dims"); /* Change max dims to be equal to the dimensions */ ret = H5Sset_extent_simple(sid1, SPACE1_RANK, dims1, NULL); CHECK(ret, FAIL, "H5Sset_extent_simple"); rank = H5Sget_simple_extent_dims(sid1, tdims, tmax); CHECK(rank, FAIL, "H5Sget_simple_extent_dims"); - VERIFY(HDmemcmp(tdims, dims1, SPACE1_RANK * sizeof(hsize_t)), 0, "H5Sget_simple_extent_dims"); - VERIFY(HDmemcmp(tmax, dims1, SPACE1_RANK * sizeof(hsize_t)), 0, "H5Sget_simple_extent_dims"); + VERIFY(memcmp(tdims, dims1, SPACE1_RANK * sizeof(hsize_t)), 0, "H5Sget_simple_extent_dims"); + VERIFY(memcmp(tmax, dims1, SPACE1_RANK * sizeof(hsize_t)), 0, "H5Sget_simple_extent_dims"); ret = H5Sclose(sid1); CHECK(ret, FAIL, "H5Sclose"); @@ -213,7 +213,7 @@ test_h5s_basic(void) CHECK_I(ret, "H5Fclose"); } else - HDprintf("***cannot open the pre-created H5S_MAX_RANK test file (%s)\n", testfile); + printf("***cannot open the pre-created H5S_MAX_RANK test file (%s)\n", testfile); } #endif /* Verify that incorrect dimensions don't work */ @@ -723,7 +723,7 @@ test_h5s_zero_dim(void) for (j = 0; j < SPACE1_DIM3; j++) { if (rdata[i][j] != 7) { H5_FAILED(); - HDprintf("element [%d][%d] is %d but should have been 7\n", i, j, rdata[i][j]); + printf("element [%d][%d] is %d but should have been 7\n", i, j, rdata[i][j]); } } } @@ -744,7 +744,7 @@ test_h5s_zero_dim(void) for (j = 0; j < SPACE1_DIM3; j++) { if (rdata_short[i][j] != 7) { H5_FAILED(); - HDprintf("element [%d][%d] is %d but should have been 7\n", i, j, rdata_short[i][j]); + printf("element [%d][%d] is %d but should have been 7\n", i, j, rdata_short[i][j]); } } } @@ -821,7 +821,7 @@ test_h5s_zero_dim(void) for (j = 0; j < SPACE1_DIM3; j++) { if (rdata[i][j] != 7) { H5_FAILED(); - HDprintf("element [%d][%d] is %d but should have been 7\n", i, j, rdata[i][j]); + printf("element [%d][%d] is %d but should have been 7\n", i, j, rdata[i][j]); } } @@ -846,8 +846,8 @@ test_h5s_zero_dim(void) for (k = 0; k < SPACE1_DIM3; k++) { if (rdata_real[i][j][k] != wdata_real[i][j][k]) { H5_FAILED(); - HDprintf("element [%d][%d][%d] is %d but should have been %d\n", i, j, k, - rdata_real[i][j][k], wdata_real[i][j][k]); + printf("element [%d][%d][%d] is %d but should have been %d\n", i, j, k, + rdata_real[i][j][k], wdata_real[i][j][k]); } } } @@ -870,7 +870,7 @@ test_h5s_zero_dim(void) for (j = 0; j < SPACE1_DIM3; j++) { if (rdata[i][j] != 7) { H5_FAILED(); - HDprintf("element [%d][%d] is %d but should have been 7\n", i, j, rdata[i][j]); + printf("element [%d][%d] is %d but should have been 7\n", i, j, rdata[i][j]); } } if ((vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) && @@ -919,7 +919,7 @@ test_h5s_zero_dim(void) for (j = 0; j < SPACE1_DIM3; j++) { if (rdata[i][j] != 7) { H5_FAILED(); - HDprintf("element [%d][%d] is %d but should have been 7\n", i, j, rdata[i][j]); + printf("element [%d][%d] is %d but should have been 7\n", i, j, rdata[i][j]); } } @@ -962,7 +962,7 @@ test_h5s_zero_dim(void) for (j = 0; j < SPACE1_DIM3; j++) { if (rdata[i][j] != 7) { H5_FAILED(); - HDprintf("element [%d][%d] is %d but should have been 7\n", i, j, rdata[i][j]); + printf("element [%d][%d] is %d but should have been 7\n", i, j, rdata[i][j]); } } } @@ -993,7 +993,7 @@ test_h5s_zero_dim(void) for (j = 0; j < SPACE1_DIM3; j++) { if (rdata[i][j] != 7) { H5_FAILED(); - HDprintf("element [%d][%d] is %d but should have been 7\n", i, j, rdata[i][j]); + printf("element [%d][%d] is %d but should have been 7\n", i, j, rdata[i][j]); } } } @@ -1014,7 +1014,7 @@ test_h5s_zero_dim(void) for (j = 0; j < SPACE1_DIM3; j++) { if (rdata_short[i][j] != 7) { H5_FAILED(); - HDprintf("element [%d][%d] is %d but should have been 7\n", i, j, rdata_short[i][j]); + printf("element [%d][%d] is %d but should have been 7\n", i, j, rdata_short[i][j]); } } } @@ -1043,7 +1043,7 @@ test_h5s_zero_dim(void) rank = H5Sget_simple_extent_dims(sid_chunk, tdims, NULL); CHECK(rank, FAIL, "H5Sget_simple_extent_dims"); - VERIFY(HDmemcmp(tdims, dims1, SPACE1_RANK * sizeof(hsize_t)), 0, "H5Sget_simple_extent_dims"); + VERIFY(memcmp(tdims, dims1, SPACE1_RANK * sizeof(hsize_t)), 0, "H5Sget_simple_extent_dims"); /* Set it to chunked dataset */ plist_id = H5Pcreate(H5P_DATASET_CREATE); @@ -1074,8 +1074,8 @@ test_h5s_zero_dim(void) for (k = 0; k < SPACE1_DIM3; k++) { if (rdata_real[i][j][k] != wdata_real[i][j][k]) { H5_FAILED(); - HDprintf("element [%d][%d][%d] is %d but should have been %d\n", i, j, k, - rdata_real[i][j][k], wdata_real[i][j][k]); + printf("element [%d][%d][%d] is %d but should have been %d\n", i, j, k, + rdata_real[i][j][k], wdata_real[i][j][k]); } } } @@ -1161,7 +1161,7 @@ test_h5s_zero_dim(void) for (j = 0; j < SPACE1_DIM3; j++) { if (rdata[i][j] != 7) { H5_FAILED(); - HDprintf("element [%d][%d] is %d but should have been 7\n", i, j, rdata[i][j]); + printf("element [%d][%d] is %d but should have been 7\n", i, j, rdata[i][j]); } } } @@ -1198,7 +1198,7 @@ test_h5s_zero_dim(void) for (j = 0; j < SPACE1_DIM3; j++) { if (rdata_short[i][j] != 7) { H5_FAILED(); - HDprintf("element [%d][%d] is %d but should have been 7\n", i, j, rdata_short[i][j]); + printf("element [%d][%d] is %d but should have been 7\n", i, j, rdata_short[i][j]); } } } @@ -1274,8 +1274,8 @@ test_h5s_encode(H5F_libver_t low, H5F_libver_t high) CHECK(ret, FAIL, "H5Sencode2"); if (sbuf_size > 0) { - sbuf = (unsigned char *)HDcalloc((size_t)1, sbuf_size); - CHECK_PTR(sbuf, "HDcalloc"); + sbuf = (unsigned char *)calloc((size_t)1, sbuf_size); + CHECK_PTR(sbuf, "calloc"); } /* Try decoding bogus buffer */ @@ -1307,7 +1307,7 @@ test_h5s_encode(H5F_libver_t low, H5F_libver_t high) /* Retrieve and verify the dataspace dimensions */ rank = H5Sget_simple_extent_dims(decoded_sid1, tdims, NULL); CHECK(rank, FAIL, "H5Sget_simple_extent_dims"); - VERIFY(HDmemcmp(tdims, dims1, SPACE1_RANK * sizeof(hsize_t)), 0, "H5Sget_simple_extent_dims"); + VERIFY(memcmp(tdims, dims1, SPACE1_RANK * sizeof(hsize_t)), 0, "H5Sget_simple_extent_dims"); /* Verify the type of dataspace selection */ sel_type = H5Sget_select_type(decoded_sid1); @@ -1336,8 +1336,8 @@ test_h5s_encode(H5F_libver_t low, H5F_libver_t high) CHECK(ret, FAIL, "H5Sencode"); if (null_size > 0) { - null_sbuf = (unsigned char *)HDcalloc((size_t)1, null_size); - CHECK_PTR(null_sbuf, "HDcalloc"); + null_sbuf = (unsigned char *)calloc((size_t)1, null_size); + CHECK_PTR(null_sbuf, "calloc"); } /* Encode the null dataspace in the buffer */ @@ -1372,8 +1372,8 @@ test_h5s_encode(H5F_libver_t low, H5F_libver_t high) CHECK(ret, FAIL, "H5Sencode"); if (scalar_size > 0) { - scalar_buf = (unsigned char *)HDcalloc((size_t)1, scalar_size); - CHECK_PTR(scalar_buf, "HDcalloc"); + scalar_buf = (unsigned char *)calloc((size_t)1, scalar_size); + CHECK_PTR(scalar_buf, "calloc"); } /* Encode the scalar dataspace in the buffer */ @@ -1411,11 +1411,11 @@ test_h5s_encode(H5F_libver_t low, H5F_libver_t high) /* Release resources */ if (sbuf) - HDfree(sbuf); + free(sbuf); if (null_sbuf) - HDfree(null_sbuf); + free(null_sbuf); if (scalar_buf) - HDfree(scalar_buf); + free(scalar_buf); } /* test_h5s_encode() */ #ifndef H5_NO_DEPRECATED_SYMBOLS @@ -1466,8 +1466,8 @@ test_h5s_encode1(void) CHECK(ret, FAIL, "H5Sencode2"); if (sbuf_size > 0) { - sbuf = (unsigned char *)HDcalloc((size_t)1, sbuf_size); - CHECK_PTR(sbuf, "HDcalloc"); + sbuf = (unsigned char *)calloc((size_t)1, sbuf_size); + CHECK_PTR(sbuf, "calloc"); } /* Try decoding bogus buffer */ @@ -1499,7 +1499,7 @@ test_h5s_encode1(void) /* Retrieve and verify the dataspace dimensions */ rank = H5Sget_simple_extent_dims(decoded_sid1, tdims, NULL); CHECK(rank, FAIL, "H5Sget_simple_extent_dims"); - VERIFY(HDmemcmp(tdims, dims1, SPACE1_RANK * sizeof(hsize_t)), 0, "H5Sget_simple_extent_dims"); + VERIFY(memcmp(tdims, dims1, SPACE1_RANK * sizeof(hsize_t)), 0, "H5Sget_simple_extent_dims"); /* Verify the type of dataspace selection */ sel_type = H5Sget_select_type(decoded_sid1); @@ -1528,8 +1528,8 @@ test_h5s_encode1(void) CHECK(ret, FAIL, "H5Sencode"); if (null_size > 0) { - null_sbuf = (unsigned char *)HDcalloc((size_t)1, null_size); - CHECK_PTR(null_sbuf, "HDcalloc"); + null_sbuf = (unsigned char *)calloc((size_t)1, null_size); + CHECK_PTR(null_sbuf, "calloc"); } /* Encode the null dataspace in the buffer */ @@ -1564,8 +1564,8 @@ test_h5s_encode1(void) CHECK(ret, FAIL, "H5Sencode"); if (scalar_size > 0) { - scalar_buf = (unsigned char *)HDcalloc((size_t)1, scalar_size); - CHECK_PTR(scalar_buf, "HDcalloc"); + scalar_buf = (unsigned char *)calloc((size_t)1, scalar_size); + CHECK_PTR(scalar_buf, "calloc"); } /* Encode the scalar dataspace in the buffer */ @@ -1599,11 +1599,11 @@ test_h5s_encode1(void) /* Release resources */ if (sbuf) - HDfree(sbuf); + free(sbuf); if (null_sbuf) - HDfree(null_sbuf); + free(null_sbuf); if (scalar_buf) - HDfree(scalar_buf); + free(scalar_buf); } /* test_h5s_encode1() */ #endif /* H5_NO_DEPRECATED_SYMBOLS */ @@ -1651,8 +1651,8 @@ test_h5s_check_encoding(hid_t in_fapl, hid_t in_sid, uint32_t expected_version, CHECK(ret, FAIL, "H5Sencode2"); /* Allocate the buffer for encoding */ - buf = (char *)HDmalloc(buf_size); - CHECK_PTR(buf, "HDmalloc"); + buf = (char *)malloc(buf_size); + CHECK_PTR(buf, "malloc"); /* Encode according to the setting in in_fapl */ ret = H5Sencode2(in_sid, buf, &buf_size, in_fapl); @@ -1711,7 +1711,7 @@ test_h5s_check_encoding(hid_t in_fapl, hid_t in_sid, uint32_t expected_version, ret = H5Sclose(d_sid); CHECK(ret, FAIL, "H5Sclose"); if (buf) - HDfree(buf); + free(buf); } return (0); @@ -1790,7 +1790,7 @@ test_h5s_encode_regular_hyper(H5F_libver_t low, H5F_libver_t high) break; default: - HDassert(0); + assert(0); break; } /* end switch */ @@ -1815,7 +1815,7 @@ test_h5s_encode_regular_hyper(H5F_libver_t low, H5F_libver_t high) expected_enc_size = (uint8_t)(expected_version == 3 ? 4 : 8); break; default: - HDassert(0); + assert(0); break; } /* end switch */ @@ -1840,7 +1840,7 @@ test_h5s_encode_regular_hyper(H5F_libver_t low, H5F_libver_t high) expected_enc_size = 8; break; default: - HDassert(0); + assert(0); break; } @@ -1865,7 +1865,7 @@ test_h5s_encode_regular_hyper(H5F_libver_t low, H5F_libver_t high) expected_enc_size = 8; break; default: - HDassert(0); + assert(0); break; } /* end switch */ @@ -1890,7 +1890,7 @@ test_h5s_encode_regular_hyper(H5F_libver_t low, H5F_libver_t high) expected_enc_size = 8; break; default: - HDassert(0); + assert(0); break; } @@ -1984,7 +1984,7 @@ test_h5s_encode_irregular_hyper(H5F_libver_t low, H5F_libver_t high) break; default: - HDassert(0); + assert(0); break; } @@ -2013,7 +2013,7 @@ test_h5s_encode_irregular_hyper(H5F_libver_t low, H5F_libver_t high) break; default: - HDassert(0); + assert(0); break; } @@ -2026,7 +2026,7 @@ test_h5s_encode_irregular_hyper(H5F_libver_t low, H5F_libver_t high) VERIFY(is_regular, FALSE, "H5Sis_regular_hyperslab"); /* Verify the version and encoded size expected for the configuration */ - HDassert(expected_enc_size <= 255); + assert(expected_enc_size <= 255); ret = test_h5s_check_encoding(fapl, sid, expected_version, (uint8_t)expected_enc_size, expected_to_fail); CHECK(ret, FAIL, "test_h5s_check_encoding"); @@ -2177,7 +2177,7 @@ test_h5s_encode_length(void) /* Allocate the buffer */ if (sbuf_size > 0) { - sbuf = (unsigned char *)HDcalloc((size_t)1, sbuf_size); + sbuf = (unsigned char *)calloc((size_t)1, sbuf_size); CHECK_PTR(sbuf, "H5Sencode2"); } @@ -2202,7 +2202,7 @@ test_h5s_encode_length(void) /* Free the buffer */ if (sbuf) - HDfree(sbuf); + free(sbuf); /* Close the original dataspace */ ret = H5Sclose(sid); @@ -2478,11 +2478,11 @@ test_h5s_compound_scalar_read(void) ret = H5Dread(dataset, type, H5S_ALL, H5S_ALL, H5P_DEFAULT, &rdata); CHECK(ret, FAIL, "H5Dread"); - if (HDmemcmp(&space4_data, &rdata, sizeof(struct space4_struct)) != 0) { - HDprintf("scalar data different: space4_data.c1=%c, read_data4.c1=%c\n", space4_data.c1, rdata.c1); - HDprintf("scalar data different: space4_data.u=%u, read_data4.u=%u\n", space4_data.u, rdata.u); - HDprintf("scalar data different: space4_data.f=%f, read_data4.f=%f\n", (double)space4_data.f, - (double)rdata.f); + if (memcmp(&space4_data, &rdata, sizeof(struct space4_struct)) != 0) { + printf("scalar data different: space4_data.c1=%c, read_data4.c1=%c\n", space4_data.c1, rdata.c1); + printf("scalar data different: space4_data.u=%u, read_data4.u=%u\n", space4_data.u, rdata.u); + printf("scalar data different: space4_data.f=%f, read_data4.f=%f\n", (double)space4_data.f, + (double)rdata.f); TestErrPrintf("scalar data different: space4_data.c1=%c, read_data4.c1=%c\n", space4_data.c1, rdata.c2); } /* end if */ @@ -2531,17 +2531,17 @@ test_h5s_chunk(void) int i, j; /* Allocate memory */ - chunk_data_dbl_data = (double *)HDcalloc(CHUNK_DATA_NX * CHUNK_DATA_NY, sizeof(double)); - CHECK_PTR(chunk_data_dbl_data, "HDcalloc"); - chunk_data_dbl = (double **)HDcalloc(CHUNK_DATA_NX, sizeof(chunk_data_dbl_data)); - CHECK_PTR(chunk_data_dbl, "HDcalloc"); + chunk_data_dbl_data = (double *)calloc(CHUNK_DATA_NX * CHUNK_DATA_NY, sizeof(double)); + CHECK_PTR(chunk_data_dbl_data, "calloc"); + chunk_data_dbl = (double **)calloc(CHUNK_DATA_NX, sizeof(chunk_data_dbl_data)); + CHECK_PTR(chunk_data_dbl, "calloc"); for (i = 0; i < CHUNK_DATA_NX; i++) chunk_data_dbl[i] = chunk_data_dbl_data + (i * CHUNK_DATA_NY); - chunk_data_flt_data = (float *)HDcalloc(CHUNK_DATA_NX * CHUNK_DATA_NY, sizeof(float)); - CHECK_PTR(chunk_data_flt_data, "HDcalloc"); - chunk_data_flt = (float **)HDcalloc(CHUNK_DATA_NX, sizeof(chunk_data_flt_data)); - CHECK_PTR(chunk_data_flt, "HDcalloc"); + chunk_data_flt_data = (float *)calloc(CHUNK_DATA_NX * CHUNK_DATA_NY, sizeof(float)); + CHECK_PTR(chunk_data_flt_data, "calloc"); + chunk_data_flt = (float **)calloc(CHUNK_DATA_NX, sizeof(chunk_data_flt_data)); + CHECK_PTR(chunk_data_flt, "calloc"); for (i = 0; i < CHUNK_DATA_NX; i++) chunk_data_flt[i] = chunk_data_flt_data + (i * CHUNK_DATA_NY); @@ -2583,8 +2583,8 @@ test_h5s_chunk(void) CHECK(status, FAIL, "H5Fclose"); /* Reset/initialize the data arrays to read in */ - HDmemset(chunk_data_dbl_data, 0, sizeof(double) * CHUNK_DATA_NX * CHUNK_DATA_NY); - HDmemset(chunk_data_flt_data, 0, sizeof(float) * CHUNK_DATA_NX * CHUNK_DATA_NY); + memset(chunk_data_dbl_data, 0, sizeof(double) * CHUNK_DATA_NX * CHUNK_DATA_NY); + memset(chunk_data_flt_data, 0, sizeof(float) * CHUNK_DATA_NX * CHUNK_DATA_NY); fileID = H5Fopen(DATAFILE, H5F_ACC_RDONLY, H5P_DEFAULT); CHECK(fileID, FAIL, "H5Fopen"); @@ -2611,10 +2611,10 @@ test_h5s_chunk(void) } /* end for */ } /* end for */ - HDfree(chunk_data_dbl); - HDfree(chunk_data_dbl_data); - HDfree(chunk_data_flt); - HDfree(chunk_data_flt_data); + free(chunk_data_dbl); + free(chunk_data_dbl_data); + free(chunk_data_flt); + free(chunk_data_flt_data); } /* test_h5s_chunk() */ /**************************************************************** diff --git a/test/API/tid.c b/test/API/tid.c index 2dd8851..b353a8a 100644 --- a/test/API/tid.c +++ b/test/API/tid.c @@ -34,7 +34,7 @@ static herr_t free_wrapper(void *p, void H5_ATTR_UNUSED **_ctx) { - HDfree(p); + free(p); return SUCCEED; } @@ -98,12 +98,12 @@ basic_id_test(void) * Once the ID has been registered, testObj will be freed when * its ID type is destroyed. */ - testObj = HDmalloc(7 * sizeof(int)); + testObj = malloc(7 * sizeof(int)); arrayID = H5Iregister(myType, testObj); CHECK(arrayID, H5I_INVALID_HID, "H5Iregister"); if (arrayID == H5I_INVALID_HID) { - HDfree(testObj); + free(testObj); goto out; } @@ -192,12 +192,12 @@ basic_id_test(void) * freed when the previous type was destroyed. Allocate new * memory for it. */ - testObj = HDmalloc(7 * sizeof(int)); + testObj = malloc(7 * sizeof(int)); arrayID = H5Iregister(myType, testObj); CHECK(arrayID, H5I_INVALID_HID, "H5Iregister"); if (arrayID == H5I_INVALID_HID) { - HDfree(testObj); + free(testObj); goto out; } @@ -272,7 +272,7 @@ id_predefined_test(void) void *testPtr; herr_t testErr; - testObj = HDmalloc(sizeof(int)); + testObj = malloc(sizeof(int)); /* * Attempt to perform public functions on various library types @@ -363,14 +363,14 @@ id_predefined_test(void) /* testObj was never registered as an atom, so it will not be * automatically freed. */ - HDfree(testObj); + free(testObj); return 0; out: if (typeID != H5I_INVALID_HID) H5Tclose(typeID); if (testObj != NULL) - HDfree(testObj); + free(testObj); return -1; } @@ -720,8 +720,8 @@ test_remove_clear_type(void) /* Create an array to hold the objects in the master list */ list_size = RCT_MAX_NOBJS * sizeof(rct_obj_t); - obj_list.objects = HDmalloc(list_size); - CHECK_PTR(obj_list.objects, "HDcalloc"); + obj_list.objects = malloc(list_size); + CHECK_PTR(obj_list.objects, "calloc"); if (NULL == obj_list.objects) goto error; @@ -740,7 +740,7 @@ test_remove_clear_type(void) * Build object list * *********************/ - HDmemset(obj_list.objects, 0, list_size); + memset(obj_list.objects, 0, list_size); /* The number of objects used is a random number between the min and max */ obj_list.count = obj_list.remaining = @@ -866,7 +866,7 @@ test_remove_clear_type(void) goto error; /* Free the object array */ - HDfree(obj_list.objects); + free(obj_list.objects); return 0; @@ -878,7 +878,7 @@ error: } H5E_END_TRY - HDfree(obj_list.objects); + free(obj_list.objects); return -1; } /* end test_remove_clear_type() */ @@ -901,7 +901,7 @@ free_actual_object(void *_p, void H5_ATTR_UNUSED **_ctx) if (7 != *p) return FAIL; - HDfree(p); + free(p); return SUCCEED; } @@ -934,7 +934,7 @@ realize_future_cb(void *_future_obj, hid_t *actual_id) } else { /* Create a new object (the 'actual object') of the correct type */ - if (NULL == (actual_obj = HDmalloc(sizeof(int)))) + if (NULL == (actual_obj = malloc(sizeof(int)))) return FAIL; *actual_obj = 7; @@ -955,7 +955,7 @@ discard_future_cb(void *future_obj) if (NULL == future_obj) return FAIL; - HDfree(future_obj); + free(future_obj); return SUCCEED; } @@ -970,7 +970,7 @@ realize_future_generate_cb(void *_future_obj, hid_t *actual_id) if (NULL != future_obj) return FAIL; /* Create a new object (the 'actual object') of the correct type */ - if (NULL == (actual_obj = HDmalloc(sizeof(int)))) + if (NULL == (actual_obj = malloc(sizeof(int)))) return FAIL; *actual_obj = 7; @@ -1054,7 +1054,7 @@ test_future_ids(void) /* Test base use-case: create a future object and destroy type without * realizing the future object. */ - future_obj = HDmalloc(sizeof(future_obj_t)); + future_obj = malloc(sizeof(future_obj_t)); future_obj->obj_type = obj_type; future_id = H5Iregister_future(obj_type, future_obj, realize_future_cb, discard_future_cb); CHECK(future_id, H5I_INVALID_HID, "H5Iregister_future"); @@ -1074,7 +1074,7 @@ test_future_ids(void) goto error; /* Test base use-case: create a future object and realize the actual object. */ - future_obj = HDmalloc(sizeof(future_obj_t)); + future_obj = malloc(sizeof(future_obj_t)); future_obj->obj_type = obj_type; future_id = H5Iregister_future(obj_type, future_obj, realize_future_cb, discard_future_cb); CHECK(future_id, H5I_INVALID_HID, "H5Iregister_future"); @@ -1160,7 +1160,7 @@ test_future_ids(void) /* Test base use-case: create a future object for a pre-defined type */ /* (DATASPACE) */ - future_obj = HDmalloc(sizeof(future_obj_t)); + future_obj = malloc(sizeof(future_obj_t)); future_obj->obj_type = H5I_DATASPACE; future_id = H5Iregister_future(H5I_DATASPACE, future_obj, realize_future_cb, discard_future_cb); CHECK(future_id, H5I_INVALID_HID, "H5Iregister_future"); @@ -1178,7 +1178,7 @@ test_future_ids(void) goto error; /* Test base use-case: create a future object for a pre-defined type */ - future_obj = HDmalloc(sizeof(future_obj_t)); + future_obj = malloc(sizeof(future_obj_t)); future_obj->obj_type = H5I_DATASPACE; future_id = H5Iregister_future(H5I_DATASPACE, future_obj, realize_future_cb, discard_future_cb); CHECK(future_id, H5I_INVALID_HID, "H5Iregister_future"); @@ -1201,7 +1201,7 @@ test_future_ids(void) goto error; /* Test base use-case: create a future object for a pre-defined type */ - future_obj = HDmalloc(sizeof(future_obj_t)); + future_obj = malloc(sizeof(future_obj_t)); future_obj->obj_type = H5I_DATASPACE; future_id = H5Iregister_future(H5I_DATASPACE, future_obj, realize_future_cb, discard_future_cb); CHECK(future_id, H5I_INVALID_HID, "H5Iregister_future"); @@ -1232,7 +1232,7 @@ test_future_ids(void) /* Test base use-case: create a future object for a pre-defined type */ /* (DATATYPE) */ - future_obj = HDmalloc(sizeof(future_obj_t)); + future_obj = malloc(sizeof(future_obj_t)); future_obj->obj_type = H5I_DATATYPE; future_id = H5Iregister_future(H5I_DATATYPE, future_obj, realize_future_cb, discard_future_cb); CHECK(future_id, H5I_INVALID_HID, "H5Iregister_future"); @@ -1250,7 +1250,7 @@ test_future_ids(void) goto error; /* Test base use-case: create a future object for a pre-defined type */ - future_obj = HDmalloc(sizeof(future_obj_t)); + future_obj = malloc(sizeof(future_obj_t)); future_obj->obj_type = H5I_DATATYPE; future_id = H5Iregister_future(H5I_DATATYPE, future_obj, realize_future_cb, discard_future_cb); CHECK(future_id, H5I_INVALID_HID, "H5Iregister_future"); @@ -1273,7 +1273,7 @@ test_future_ids(void) goto error; /* Test base use-case: create a future object for a pre-defined type */ - future_obj = HDmalloc(sizeof(future_obj_t)); + future_obj = malloc(sizeof(future_obj_t)); future_obj->obj_type = H5I_DATATYPE; future_id = H5Iregister_future(H5I_DATATYPE, future_obj, realize_future_cb, discard_future_cb); CHECK(future_id, H5I_INVALID_HID, "H5Iregister_future"); @@ -1304,7 +1304,7 @@ test_future_ids(void) /* Test base use-case: create a future object for a pre-defined type */ /* (PROPERTY LIST) */ - future_obj = HDmalloc(sizeof(future_obj_t)); + future_obj = malloc(sizeof(future_obj_t)); future_obj->obj_type = H5I_GENPROP_LST; future_id = H5Iregister_future(H5I_GENPROP_LST, future_obj, realize_future_cb, discard_future_cb); CHECK(future_id, H5I_INVALID_HID, "H5Iregister_future"); @@ -1322,7 +1322,7 @@ test_future_ids(void) goto error; /* Test base use-case: create a future object for a pre-defined type */ - future_obj = HDmalloc(sizeof(future_obj_t)); + future_obj = malloc(sizeof(future_obj_t)); future_obj->obj_type = H5I_GENPROP_LST; future_id = H5Iregister_future(H5I_GENPROP_LST, future_obj, realize_future_cb, discard_future_cb); CHECK(future_id, H5I_INVALID_HID, "H5Iregister_future"); @@ -1345,7 +1345,7 @@ test_future_ids(void) goto error; /* Test base use-case: create a future object for a pre-defined type */ - future_obj = HDmalloc(sizeof(future_obj_t)); + future_obj = malloc(sizeof(future_obj_t)); future_obj->obj_type = H5I_GENPROP_LST; future_id = H5Iregister_future(H5I_GENPROP_LST, future_obj, realize_future_cb, discard_future_cb); CHECK(future_id, H5I_INVALID_HID, "H5Iregister_future"); diff --git a/test/API/titerate.c b/test/API/titerate.c index 6d86130..8ccbe27 100644 --- a/test/API/titerate.c +++ b/test/API/titerate.c @@ -92,8 +92,8 @@ liter_cb(hid_t H5_ATTR_UNUSED group, const char *name, const H5L_info2_t H5_ATTR if (!(vol_cap_flags_g & H5VL_CAP_FLAG_ITERATE)) { SKIPPED(); - HDprintf(" API functions for iterate aren't " - "supported with this connector\n"); + printf(" API functions for iterate aren't " + "supported with this connector\n"); return 1; } @@ -115,7 +115,7 @@ liter_cb(hid_t H5_ATTR_UNUSED group, const char *name, const H5L_info2_t H5_ATTR return (count2 > 10 ? 1 : 0); default: - HDprintf("invalid iteration command"); + printf("invalid iteration command"); return (-1); } /* end switch */ } /* end liter_cb() */ @@ -381,7 +381,7 @@ test_iter_group(hid_t fapl, hbool_t new_format) /* Free the dataset names */ for (i = 0; i < (NDATASETS + 2); i++) - HDfree(lnames[i]); + free(lnames[i]); } } /* test_iter_group() */ @@ -415,7 +415,7 @@ aiter_cb(hid_t H5_ATTR_UNUSED group, const char *name, const H5A_info_t H5_ATTR_ return (count2 > 10 ? 1 : 0); default: - HDprintf("invalid iteration command"); + printf("invalid iteration command"); return (-1); } /* end switch */ } /* end aiter_cb() */ @@ -444,7 +444,7 @@ test_iter_attr(hid_t fapl, hbool_t new_format) if ((vol_cap_flags_g & H5VL_CAP_FLAG_ITERATE) && (vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) && (vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) && (vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC)) { - HDmemset(&info, 0, sizeof(iter_info)); + memset(&info, 0, sizeof(iter_info)); /* Create the test file with the datasets */ file = H5Fcreate(DATAFILE, H5F_ACC_TRUNC, H5P_DEFAULT, fapl); @@ -590,7 +590,7 @@ test_iter_attr(hid_t fapl, hbool_t new_format) /* Free the attribute names */ for (i = 0; i < NATTR; i++) - HDfree(anames[i]); + free(anames[i]); } } /* test_iter_attr() */ @@ -619,8 +619,8 @@ liter_cb2(hid_t loc_id, const char *name, const H5L_info2_t H5_ATTR_UNUSED *link if (!(vol_cap_flags_g & H5VL_CAP_FLAG_ITERATE) || !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC)) { SKIPPED(); - HDprintf(" API functions for iterate and basic links aren't " - "supported with this connector\n"); + printf(" API functions for iterate and basic links aren't " + "supported with this connector\n"); return 1; } @@ -672,8 +672,8 @@ test_iter_group_large(hid_t fapl) } s1_t; /* Allocate & initialize array */ - names = (iter_info *)HDcalloc(sizeof(iter_info), (ITER_NGROUPS + 2)); - CHECK_PTR(names, "HDcalloc"); + names = (iter_info *)calloc(sizeof(iter_info), (ITER_NGROUPS + 2)); + CHECK_PTR(names, "calloc"); /* Output message about test being performed */ MESSAGE(5, ("Testing Large Group Iteration Functionality\n")); @@ -768,7 +768,7 @@ test_iter_group_large(hid_t fapl) CHECK(ret, FAIL, "H5Fclose"); /* Release memory */ - HDfree(names); + free(names); } } /* test_iterate_group_large() */ @@ -921,8 +921,8 @@ test_grp_memb_funcs(hid_t fapl) /* Free the dataset names */ for (i = 0; i < (NDATASETS + 2); i++) { - HDfree(dnames[i]); - HDfree(obj_names[i]); + free(dnames[i]); + free(obj_names[i]); } /* end for */ } /* test_grp_memb_funcs() */ @@ -1068,7 +1068,7 @@ test_corrupted_attnamelen(void) CHECK(ret, FAIL, "h5_driver_is_default_vfd_compatible"); if (!driver_is_default_compatible) { - HDprintf("-- SKIPPED --\n"); + printf("-- SKIPPED --\n"); return; } diff --git a/test/API/tmisc.c b/test/API/tmisc.c index 723c3d2..4094b48 100644 --- a/test/API/tmisc.c +++ b/test/API/tmisc.c @@ -496,8 +496,8 @@ test_misc2_write_attribute(void) char *string_att1 = HDstrdup("string attribute in file one"); char *string_att2 = HDstrdup("string attribute in file two"); - HDmemset(&data, 0, sizeof(data)); - HDmemset(&data_check, 0, sizeof(data_check)); + memset(&data, 0, sizeof(data)); + memset(&data_check, 0, sizeof(data_check)); type = misc2_create_type(); @@ -568,8 +568,8 @@ test_misc2_write_attribute(void) ret = H5Fclose(file2); CHECK(ret, FAIL, "H5Fclose"); - HDfree(string_att1); - HDfree(string_att2); + free(string_att1); + free(string_att2); } static void @@ -782,7 +782,7 @@ create_struct3(void) misc5_struct3_hndl *str3hndl; /* New 'struct3' created */ herr_t ret; /* For error checking */ - str3hndl = (misc5_struct3_hndl *)HDmalloc(sizeof(misc5_struct3_hndl)); + str3hndl = (misc5_struct3_hndl *)malloc(sizeof(misc5_struct3_hndl)); CHECK_PTR(str3hndl, "malloc"); str3hndl->st3h_base = H5Tcreate(H5T_COMPOUND, sizeof(misc5_struct3)); @@ -808,7 +808,7 @@ delete_struct3(misc5_struct3_hndl *str3hndl) ret = H5Tclose(str3hndl->st3h_base); CHECK(ret, FAIL, "H5Tclose"); - HDfree(str3hndl); + free(str3hndl); } static void @@ -825,8 +825,8 @@ create_struct2(void) misc5_struct2_hndl *str2hndl; /* New 'struct2' created */ herr_t ret; /* For error checking */ - str2hndl = (misc5_struct2_hndl *)HDmalloc(sizeof(misc5_struct2_hndl)); - CHECK_PTR(str2hndl, "HDmalloc"); + str2hndl = (misc5_struct2_hndl *)malloc(sizeof(misc5_struct2_hndl)); + CHECK_PTR(str2hndl, "malloc"); str2hndl->st2h_base = H5Tcreate(H5T_COMPOUND, sizeof(misc5_struct2)); CHECK(str2hndl->st2h_base, FAIL, "H5Tcreate"); @@ -860,7 +860,7 @@ delete_struct2(misc5_struct2_hndl *str2hndl) H5Tclose(str2hndl->st2h_base); CHECK(ret, FAIL, "H5Tclose"); - HDfree(str2hndl); + free(str2hndl); } static void @@ -871,8 +871,8 @@ set_struct2(misc5_struct2 *buf) buf->st2_el1 = MISC5_DBGELVAL2; buf->st2_el2.len = MISC5_DBGNELM3; - buf->st2_el2.p = HDmalloc((buf->st2_el2.len) * sizeof(misc5_struct3)); - CHECK_PTR(buf->st2_el2.p, "HDmalloc"); + buf->st2_el2.p = malloc((buf->st2_el2.len) * sizeof(misc5_struct3)); + CHECK_PTR(buf->st2_el2.p, "malloc"); for (i = 0; i < (buf->st2_el2.len); i++) set_struct3(&(((misc5_struct3 *)(buf->st2_el2.p))[i])); @@ -881,7 +881,7 @@ set_struct2(misc5_struct2 *buf) static void clear_struct2(misc5_struct2 *buf) { - HDfree(buf->st2_el2.p); + free(buf->st2_el2.p); } /*********************** struct1 ***********************/ @@ -892,8 +892,8 @@ create_struct1(void) misc5_struct1_hndl *str1hndl; /* New 'struct1' created */ herr_t ret; /* For error checking */ - str1hndl = (misc5_struct1_hndl *)HDmalloc(sizeof(misc5_struct1_hndl)); - CHECK_PTR(str1hndl, "HDmalloc"); + str1hndl = (misc5_struct1_hndl *)malloc(sizeof(misc5_struct1_hndl)); + CHECK_PTR(str1hndl, "malloc"); str1hndl->st1h_base = H5Tcreate(H5T_COMPOUND, sizeof(misc5_struct1)); CHECK(str1hndl->st1h_base, FAIL, "H5Tcreate"); @@ -927,7 +927,7 @@ delete_struct1(misc5_struct1_hndl *str1hndl) ret = H5Tclose(str1hndl->st1h_base); CHECK(ret, FAIL, "H5Tclose"); - HDfree(str1hndl); + free(str1hndl); } static void @@ -938,8 +938,8 @@ set_struct1(misc5_struct1 *buf) buf->st1_el1 = MISC5_DBGELVAL1; buf->st1_el2.len = MISC5_DBGNELM2; - buf->st1_el2.p = HDmalloc((buf->st1_el2.len) * sizeof(misc5_struct2)); - CHECK_PTR(buf->st1_el2.p, "HDmalloc"); + buf->st1_el2.p = malloc((buf->st1_el2.len) * sizeof(misc5_struct2)); + CHECK_PTR(buf->st1_el2.p, "malloc"); for (i = 0; i < (buf->st1_el2.len); i++) set_struct2(&(((misc5_struct2 *)(buf->st1_el2.p))[i])); @@ -952,7 +952,7 @@ clear_struct1(misc5_struct1 *buf) for (i = 0; i < buf->st1_el2.len; i++) clear_struct2(&(((misc5_struct2 *)(buf->st1_el2.p))[i])); - HDfree(buf->st1_el2.p); + free(buf->st1_el2.p); } static void @@ -989,8 +989,8 @@ test_misc5(void) /* Create the variable-length buffer */ buf.len = MISC5_DBGNELM1; - buf.p = HDmalloc((buf.len) * sizeof(misc5_struct1)); - CHECK_PTR(buf.p, "HDmalloc"); + buf.p = malloc((buf.len) * sizeof(misc5_struct1)); + CHECK_PTR(buf.p, "malloc"); /* Create the top-level VL information */ for (i = 0; i < MISC5_DBGNELM1; i++) @@ -1005,7 +1005,7 @@ test_misc5(void) clear_struct1(&(((misc5_struct1 *)(buf.p))[j])); /* Free the variable-length buffer */ - HDfree(buf.p); + free(buf.p); /* Close dataset */ ret = H5Dclose(dataset_id); @@ -1044,16 +1044,16 @@ test_misc5(void) /* Verify the correct information was read in */ for (i = 0; i < (buf.len); i++) { - /* HDprintf("[%d]=%d\n",i, ((misc5_struct1 *)(buf.p))[i].st1_el1); */ + /* printf("[%d]=%d\n",i, ((misc5_struct1 *)(buf.p))[i].st1_el1); */ VERIFY(((misc5_struct1 *)(buf.p))[i].st1_el1, MISC5_DBGELVAL1, "H5Dread"); for (j = 0; j < (((misc5_struct1 *)(buf.p))[i].st1_el2.len); j++) { - /* HDprintf(" [%d]=%d\n",j, ((misc5_struct2 *)(((misc5_struct1 *) + /* printf(" [%d]=%d\n",j, ((misc5_struct2 *)(((misc5_struct1 *) * (buf.p))[i].st1_el2.p))[j].st2_el1); */ VERIFY(((misc5_struct2 *)(((misc5_struct1 *)(buf.p))[i].st1_el2.p))[j].st2_el1, MISC5_DBGELVAL2, "H5Dread"); for (k = 0; k < (((misc5_struct2 *)(((misc5_struct1 *)(buf.p))[i].st1_el2.p))[j].st2_el2.len); k++) { - /* HDprintf(" [%d]=%d\n",k, ((misc5_struct3 *)(((misc5_struct2 *) (((misc5_struct1 + /* printf(" [%d]=%d\n",k, ((misc5_struct3 *)(((misc5_struct2 *) (((misc5_struct1 * *)(buf.p))[i]. st1_el2.p))[j].st2_el2.p))[k].st3_el1); */ VERIFY(((misc5_struct3 *)(((misc5_struct2 *)(((misc5_struct1 *)(buf.p))[i].st1_el2.p))[j] .st2_el2.p))[k] @@ -1323,11 +1323,11 @@ test_misc8(void) MESSAGE(5, ("Testing dataset storage sizes\n")); /* Allocate space for the data to write & read */ - wdata = (int *)HDmalloc(sizeof(int) * MISC8_DIM0 * MISC8_DIM1); - CHECK_PTR(wdata, "HDmalloc"); + wdata = (int *)malloc(sizeof(int) * MISC8_DIM0 * MISC8_DIM1); + CHECK_PTR(wdata, "malloc"); #ifdef VERIFY_DATA - rdata = (int *)HDmalloc(sizeof(int) * MISC8_DIM0 * MISC8_DIM1); - CHECK_PTR(rdata, "HDmalloc"); + rdata = (int *)malloc(sizeof(int) * MISC8_DIM0 * MISC8_DIM1); + CHECK_PTR(rdata, "malloc"); #endif /* VERIFY_DATA */ /* Initialize values */ @@ -1794,9 +1794,9 @@ test_misc8(void) CHECK(ret, FAIL, "H5Fclose"); /* Free the read & write buffers */ - HDfree(wdata); + free(wdata); #ifdef VERIFY_DATA - HDfree(rdata); + free(rdata); #endif /* VERIFY_DATA */ } /* end test_misc8() */ #endif @@ -1863,7 +1863,7 @@ test_misc10(void) CHECK(ret, FAIL, "h5_driver_is_default_vfd_compatible"); if (!driver_is_default_compatible) { - HDprintf("-- SKIPPED --\n"); + printf("-- SKIPPED --\n"); return; } @@ -2264,8 +2264,8 @@ misc13_verify_dataset(hid_t loc_id, const char *name, const unsigned *data) herr_t ret; /* Generic return value */ /* Create a data buffer for the dataset read */ - read_data = (unsigned *)HDcalloc(MISC13_DIM1, sizeof(unsigned)); - CHECK_PTR(read_data, "HDcalloc"); + read_data = (unsigned *)calloc(MISC13_DIM1, sizeof(unsigned)); + CHECK_PTR(read_data, "calloc"); /* Open the contiguous dataset in the root group */ dsid = H5Dopen2(loc_id, name, H5P_DEFAULT); @@ -2284,7 +2284,7 @@ misc13_verify_dataset(hid_t loc_id, const char *name, const unsigned *data) CHECK(ret, FAIL, "H5Dclose"); /* Free the dataset read buffer */ - HDfree(read_data); + free(read_data); } /* end misc13_verify_dataset() */ @@ -2390,27 +2390,27 @@ misc13_insert_user_block(const char *old_name, const char *new_name, const char int ret; /* Generic status value */ /* Allocate space for the user block */ - user_block = HDcalloc(size, (size_t)1); - CHECK_PTR(user_block, "HDcalloc"); + user_block = calloc(size, (size_t)1); + CHECK_PTR(user_block, "calloc"); /* Copy in the user block data */ - HDmemcpy(user_block, str, HDstrlen(str)); + memcpy(user_block, str, HDstrlen(str)); /* Open the new file */ - new_fp = HDfopen(new_name, "wb"); - CHECK_PTR(new_fp, "HDfopen"); + new_fp = fopen(new_name, "wb"); + CHECK_PTR(new_fp, "fopen"); /* Write the user block to the new file */ written = HDfwrite(user_block, (size_t)1, size, new_fp); VERIFY(written, size, "HDfwrite"); /* Open the old file */ - old_fp = HDfopen(old_name, "rb"); - CHECK_PTR(old_fp, "HDfopen"); + old_fp = fopen(old_name, "rb"); + CHECK_PTR(old_fp, "fopen"); /* Allocate space for the copy buffer */ - copy_buf = HDmalloc((size_t)MISC13_COPY_BUF_SIZE); - CHECK_PTR(copy_buf, "HDmalloc"); + copy_buf = malloc((size_t)MISC13_COPY_BUF_SIZE); + CHECK_PTR(copy_buf, "malloc"); /* Copy data from the old file to the new file */ while ((read_in = HDfread(copy_buf, (size_t)1, (size_t)MISC13_COPY_BUF_SIZE, old_fp)) > 0) { @@ -2428,10 +2428,10 @@ misc13_insert_user_block(const char *old_name, const char *new_name, const char VERIFY(ret, 0, "HDfclose"); /* Free the copy buffer */ - HDfree(copy_buf); + free(copy_buf); /* Free the user block */ - HDfree(user_block); + free(user_block); } /* end misc13_insert_user_block() */ @@ -2559,8 +2559,8 @@ test_misc13(void) hbool_t check_for_new_dataset; /* Whether to check for the post-userblock-creation dataset */ /* Create a data buffer for the datasets */ - data = (unsigned *)HDcalloc(MISC13_DIM1, sizeof(unsigned)); - CHECK_PTR(data, "HDcalloc"); + data = (unsigned *)calloc(MISC13_DIM1, sizeof(unsigned)); + CHECK_PTR(data, "calloc"); /* Initialize data to write */ misc13_init_data(data); @@ -2590,7 +2590,7 @@ test_misc13(void) misc13_verify_file(MISC13_FILE_2, data, userblock_size, check_for_new_dataset); /* Free the dataset buffer */ - HDfree(data); + free(data); } /* end test_misc13() */ #endif @@ -2888,15 +2888,15 @@ test_misc16(void) hsize_t dims[] = {MISC16_SPACE_DIM}; int i; - HDmemset(wdata, 0, sizeof(wdata)); - HDmemset(rdata, 0, sizeof(rdata)); + memset(wdata, 0, sizeof(wdata)); + memset(rdata, 0, sizeof(rdata)); /* Initialize the data */ /* (Note that these are supposed to stress the code, so are a little weird) */ - HDmemcpy(wdata[0], "1234567", MISC16_STR_SIZE); - HDmemcpy(wdata[1], "1234567\0", MISC16_STR_SIZE); - HDmemcpy(wdata[2], "12345678", MISC16_STR_SIZE); - HDmemcpy(wdata[3], "\0\0\0\0\0\0\0\0", MISC16_STR_SIZE); + memcpy(wdata[0], "1234567", MISC16_STR_SIZE); + memcpy(wdata[1], "1234567\0", MISC16_STR_SIZE); + memcpy(wdata[2], "12345678", MISC16_STR_SIZE); + memcpy(wdata[3], "\0\0\0\0\0\0\0\0", MISC16_STR_SIZE); /* Create the file */ file = H5Fcreate(MISC16_FILE, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT); @@ -2979,15 +2979,15 @@ test_misc17(void) hsize_t dims[] = {MISC17_SPACE_DIM1, MISC17_SPACE_DIM2}; int i; - HDmemset(wdata, 0, sizeof(wdata)); - HDmemset(rdata, 0, sizeof(rdata)); + memset(wdata, 0, sizeof(wdata)); + memset(rdata, 0, sizeof(rdata)); /* Initialize the data */ /* (Note that these are supposed to stress the code, so are a little weird) */ - HDmemcpy(wdata[0], "1234567", MISC17_SPACE_DIM2); - HDmemcpy(wdata[1], "1234567\0", MISC17_SPACE_DIM2); - HDmemcpy(wdata[2], "12345678", MISC17_SPACE_DIM2); - HDmemcpy(wdata[3], "\0\0\0\0\0\0\0\0", MISC17_SPACE_DIM2); + memcpy(wdata[0], "1234567", MISC17_SPACE_DIM2); + memcpy(wdata[1], "1234567\0", MISC17_SPACE_DIM2); + memcpy(wdata[2], "12345678", MISC17_SPACE_DIM2); + memcpy(wdata[3], "\0\0\0\0\0\0\0\0", MISC17_SPACE_DIM2); /* Create the file */ file = H5Fcreate(MISC17_FILE, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT); @@ -3718,7 +3718,7 @@ test_misc19(void) H5E_END_TRY; VERIFY(ret, FAIL, "H5FDunregister"); - HDfree(vfd_cls); + free(vfd_cls); /* Check H5I operations on virtual object connectors */ @@ -3758,7 +3758,7 @@ test_misc19(void) H5E_END_TRY; VERIFY(ret, FAIL, "H5VLunregister_connector"); - HDfree(vol_cls); + free(vol_cls); #endif } /* end test_misc19() */ @@ -3792,7 +3792,7 @@ test_misc20(void) CHECK(ret, FAIL, "h5_driver_is_default_vfd_compatible"); if (!driver_is_default_compatible) { - HDprintf("-- SKIPPED --\n"); + printf("-- SKIPPED --\n"); return; } @@ -3968,8 +3968,8 @@ test_misc21(void) MESSAGE(5, ("Testing late allocation time w/chunks & filters\n")); /* Allocate space for the buffer */ - buf = (char *)HDcalloc(MISC21_SPACE_DIM0 * MISC21_SPACE_DIM1, 1); - CHECK(buf, NULL, "HDcalloc"); + buf = (char *)calloc(MISC21_SPACE_DIM0 * MISC21_SPACE_DIM1, 1); + CHECK(buf, NULL, "calloc"); /* Create the file */ fid = H5Fcreate(MISC21_FILE, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT); @@ -4009,7 +4009,7 @@ test_misc21(void) ret = H5Fclose(fid); CHECK(ret, FAIL, "H5Fclose"); - HDfree(buf); + free(buf); } /* end test_misc21() */ /**************************************************************** @@ -4053,8 +4053,8 @@ test_misc22(void) MESSAGE(5, ("Testing datatypes with SZIP filter\n")); /* Allocate space for the buffer */ - buf = (char *)HDcalloc(MISC22_SPACE_DIM0 * MISC22_SPACE_DIM1, 8); - CHECK(buf, NULL, "HDcalloc"); + buf = (char *)calloc(MISC22_SPACE_DIM0 * MISC22_SPACE_DIM1, 8); + CHECK(buf, NULL, "calloc"); /* Create the file */ fid = H5Fcreate(MISC22_FILE, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT); @@ -4160,7 +4160,7 @@ test_misc22(void) ret = H5Fclose(fid); CHECK(ret, FAIL, "H5Fclose"); - HDfree(buf); + free(buf); } /* end test_misc22() */ #endif /* H5_HAVE_FILTER_SZIP */ @@ -5099,7 +5099,7 @@ test_misc25b(void) CHECK(ret, FAIL, "h5_driver_is_default_vfd_compatible"); if (!driver_is_default_compatible) { - HDprintf("-- SKIPPED --\n"); + printf("-- SKIPPED --\n"); return; } @@ -5362,7 +5362,7 @@ test_misc27(void) CHECK(ret, FAIL, "h5_driver_is_default_vfd_compatible"); if (!driver_is_default_compatible) { - HDprintf("-- SKIPPED --\n"); + printf("-- SKIPPED --\n"); return; } @@ -5590,7 +5590,7 @@ test_misc29(void) CHECK(ret, FAIL, "h5_driver_is_default_vfd_compatible"); if (!driver_is_default_compatible) { - HDprintf("-- SKIPPED --\n"); + printf("-- SKIPPED --\n"); return; } @@ -5889,7 +5889,7 @@ test_misc33(void) CHECK(ret, FAIL, "h5_driver_is_default_vfd_compatible"); if (!driver_is_default_compatible) { - HDprintf("-- SKIPPED --\n"); + printf("-- SKIPPED --\n"); return; } @@ -6192,7 +6192,7 @@ test_misc37(void) CHECK(ret, FAIL, "h5_driver_is_default_vfd_compatible"); if (!driver_is_default_compatible) { - HDprintf("-- SKIPPED --\n"); + printf("-- SKIPPED --\n"); return; } diff --git a/test/API/trefer.c b/test/API/trefer.c index c09b586..2312c3f 100644 --- a/test/API/trefer.c +++ b/test/API/trefer.c @@ -112,10 +112,10 @@ test_reference_params(void) MESSAGE(5, ("Testing Reference Parameters\n")); /* Allocate write & read buffers */ - wbuf = (H5R_ref_t *)HDcalloc(sizeof(H5R_ref_t), SPACE1_DIM1); - rbuf = (H5R_ref_t *)HDcalloc(sizeof(H5R_ref_t), SPACE1_DIM1); - tbuf = (H5R_ref_t *)HDcalloc(sizeof(H5R_ref_t), SPACE1_DIM1); - obuf = HDcalloc(sizeof(unsigned), SPACE1_DIM1); + wbuf = (H5R_ref_t *)calloc(sizeof(H5R_ref_t), SPACE1_DIM1); + rbuf = (H5R_ref_t *)calloc(sizeof(H5R_ref_t), SPACE1_DIM1); + tbuf = (H5R_ref_t *)calloc(sizeof(H5R_ref_t), SPACE1_DIM1); + obuf = calloc(sizeof(unsigned), SPACE1_DIM1); for (i = 0; i < SPACE1_DIM1; i++) obuf[i] = i * 3; @@ -411,10 +411,10 @@ test_reference_params(void) CHECK(ret, FAIL, "H5Fclose"); /* Free memory buffers */ - HDfree(wbuf); - HDfree(rbuf); - HDfree(tbuf); - HDfree(obuf); + free(wbuf); + free(rbuf); + free(tbuf); + free(obuf); } /* test_reference_params() */ /**************************************************************** @@ -445,10 +445,10 @@ test_reference_obj(void) MESSAGE(5, ("Testing Object Reference Functions\n")); /* Allocate write & read buffers */ - wbuf = HDcalloc(sizeof(H5R_ref_t), SPACE1_DIM1); - rbuf = HDcalloc(sizeof(H5R_ref_t), SPACE1_DIM1); - ibuf = HDcalloc(sizeof(unsigned), SPACE1_DIM1); - obuf = HDcalloc(sizeof(unsigned), SPACE1_DIM1); + wbuf = calloc(sizeof(H5R_ref_t), SPACE1_DIM1); + rbuf = calloc(sizeof(H5R_ref_t), SPACE1_DIM1); + ibuf = calloc(sizeof(unsigned), SPACE1_DIM1); + obuf = calloc(sizeof(unsigned), SPACE1_DIM1); for (i = 0; i < SPACE1_DIM1; i++) obuf[i] = i * 3; @@ -645,10 +645,10 @@ test_reference_obj(void) } /* Free memory buffers */ - HDfree(wbuf); - HDfree(rbuf); - HDfree(ibuf); - HDfree(obuf); + free(wbuf); + free(rbuf); + free(ibuf); + free(obuf); } /* test_reference_obj() */ /**************************************************************** @@ -682,9 +682,9 @@ test_reference_vlen_obj(void) MESSAGE(5, ("Testing Object Reference Functions within VLEN type\n")); /* Allocate write & read buffers */ - wbuf = HDcalloc(sizeof(H5R_ref_t), SPACE1_DIM1); - ibuf = HDcalloc(sizeof(unsigned), SPACE1_DIM1); - obuf = HDcalloc(sizeof(unsigned), SPACE1_DIM1); + wbuf = calloc(sizeof(H5R_ref_t), SPACE1_DIM1); + ibuf = calloc(sizeof(unsigned), SPACE1_DIM1); + obuf = calloc(sizeof(unsigned), SPACE1_DIM1); for (i = 0; i < SPACE1_DIM1; i++) obuf[i] = i * 3; @@ -911,10 +911,10 @@ test_reference_vlen_obj(void) } /* Free memory buffers */ - HDfree(wbuf); - HDfree(rbuf); - HDfree(ibuf); - HDfree(obuf); + free(wbuf); + free(rbuf); + free(ibuf); + free(obuf); } /* test_reference_vlen_obj() */ /**************************************************************** @@ -946,8 +946,8 @@ test_reference_cmpnd_obj(void) MESSAGE(5, ("Testing Object Reference Functions within compound type\n")); /* Allocate write & read buffers */ - ibuf = HDcalloc(sizeof(unsigned), SPACE1_DIM1); - obuf = HDcalloc(sizeof(unsigned), SPACE1_DIM1); + ibuf = calloc(sizeof(unsigned), SPACE1_DIM1); + obuf = calloc(sizeof(unsigned), SPACE1_DIM1); for (i = 0; i < SPACE1_DIM1; i++) obuf[i] = i * 3; @@ -1047,7 +1047,7 @@ test_reference_cmpnd_obj(void) CHECK(dataset, H5I_INVALID_HID, "H5Dcreate2"); /* Reset buffer for writing */ - HDmemset(&cmpnd_wbuf, 0, sizeof(cmpnd_wbuf)); + memset(&cmpnd_wbuf, 0, sizeof(cmpnd_wbuf)); /* Create reference to dataset */ ret = H5Rcreate_object(fid1, "/Group1/Dataset1", H5P_DEFAULT, &cmpnd_wbuf.ref0); @@ -1202,8 +1202,8 @@ test_reference_cmpnd_obj(void) CHECK(ret, FAIL, "H5Rdestroy"); /* Free memory buffers */ - HDfree(ibuf); - HDfree(obuf); + free(ibuf); + free(obuf); } /* test_reference_cmpnd_obj() */ /**************************************************************** @@ -1255,10 +1255,10 @@ test_reference_region(H5F_libver_t libver_low, H5F_libver_t libver_high) MESSAGE(5, ("Testing Dataset Region Reference Functions\n")); /* Allocate write & read buffers */ - wbuf = HDcalloc(sizeof(H5R_ref_t), SPACE1_DIM1); - rbuf = HDcalloc(sizeof(H5R_ref_t), SPACE1_DIM1); - dwbuf = (uint8_t *)HDcalloc(sizeof(uint8_t), (size_t)(SPACE2_DIM1 * SPACE2_DIM2)); - drbuf = (uint8_t *)HDcalloc(sizeof(uint8_t), (size_t)(SPACE2_DIM1 * SPACE2_DIM2)); + wbuf = calloc(sizeof(H5R_ref_t), SPACE1_DIM1); + rbuf = calloc(sizeof(H5R_ref_t), SPACE1_DIM1); + dwbuf = (uint8_t *)calloc(sizeof(uint8_t), (size_t)(SPACE2_DIM1 * SPACE2_DIM2)); + drbuf = (uint8_t *)calloc(sizeof(uint8_t), (size_t)(SPACE2_DIM1 * SPACE2_DIM2)); for (tu8 = dwbuf, i = 0; i < (SPACE2_DIM1 * SPACE2_DIM2); i++) *tu8++ = (uint8_t)(i * 3); @@ -1529,7 +1529,7 @@ test_reference_region(H5F_libver_t libver_low, H5F_libver_t libver_high) VERIFY(ret, 1, "H5Sget_select_hyper_nblocks"); /* allocate space for the hyperslab blocks */ - coords = (hsize_t *)HDmalloc((size_t)ret * SPACE2_RANK * sizeof(hsize_t) * 2); + coords = (hsize_t *)malloc((size_t)ret * SPACE2_RANK * sizeof(hsize_t) * 2); ret = H5Sget_select_hyper_blocklist(sid2, (hsize_t)0, (hsize_t)ret, coords); CHECK(ret, FAIL, "H5Sget_select_hyper_blocklist"); @@ -1537,7 +1537,7 @@ test_reference_region(H5F_libver_t libver_low, H5F_libver_t libver_high) VERIFY(coords[1], 2, "Hyperslab Coordinates"); VERIFY(coords[2], 7, "Hyperslab Coordinates"); VERIFY(coords[3], 7, "Hyperslab Coordinates"); - HDfree(coords); + free(coords); ret = H5Sget_select_bounds(sid2, low, high); CHECK(ret, FAIL, "H5Sget_select_bounds"); VERIFY(low[0], 2, "Selection Bounds"); @@ -1560,7 +1560,7 @@ test_reference_region(H5F_libver_t libver_low, H5F_libver_t libver_high) VERIFY(ret, SPACE2_DIM2, "H5Sget_select_elem_npoints"); /* allocate space for the element points */ - coords = (hsize_t *)HDmalloc((size_t)ret * SPACE2_RANK * sizeof(hsize_t)); + coords = (hsize_t *)malloc((size_t)ret * SPACE2_RANK * sizeof(hsize_t)); ret = H5Sget_select_elem_pointlist(sid2, (hsize_t)0, (hsize_t)ret, coords); CHECK(ret, FAIL, "H5Sget_select_elem_pointlist"); @@ -1584,7 +1584,7 @@ test_reference_region(H5F_libver_t libver_low, H5F_libver_t libver_high) VERIFY(coords[17], coord1[8][1], "Element Coordinates"); VERIFY(coords[18], coord1[9][0], "Element Coordinates"); VERIFY(coords[19], coord1[9][1], "Element Coordinates"); - HDfree(coords); + free(coords); ret = H5Sget_select_bounds(sid2, low, high); CHECK(ret, FAIL, "H5Sget_select_bounds"); VERIFY(low[0], 0, "Selection Bounds"); @@ -1661,10 +1661,10 @@ test_reference_region(H5F_libver_t libver_low, H5F_libver_t libver_high) } /* Free memory buffers */ - HDfree(wbuf); - HDfree(rbuf); - HDfree(dwbuf); - HDfree(drbuf); + free(wbuf); + free(rbuf); + free(dwbuf); + free(drbuf); } /* test_reference_region() */ @@ -1711,10 +1711,10 @@ test_reference_region_1D(H5F_libver_t libver_low, H5F_libver_t libver_high) MESSAGE(5, ("Testing 1-D Dataset Region Reference Functions\n")); /* Allocate write & read buffers */ - wbuf = HDcalloc(sizeof(H5R_ref_t), (size_t)SPACE1_DIM1); - rbuf = HDcalloc(sizeof(H5R_ref_t), (size_t)SPACE1_DIM1); - dwbuf = (uint8_t *)HDcalloc(sizeof(uint8_t), (size_t)SPACE3_DIM1); - drbuf = (uint8_t *)HDcalloc(sizeof(uint8_t), (size_t)SPACE3_DIM1); + wbuf = calloc(sizeof(H5R_ref_t), (size_t)SPACE1_DIM1); + rbuf = calloc(sizeof(H5R_ref_t), (size_t)SPACE1_DIM1); + dwbuf = (uint8_t *)calloc(sizeof(uint8_t), (size_t)SPACE3_DIM1); + drbuf = (uint8_t *)calloc(sizeof(uint8_t), (size_t)SPACE3_DIM1); for (tu8 = dwbuf, i = 0; i < SPACE3_DIM1; i++) *tu8++ = (uint8_t)(i * 3); @@ -1889,7 +1889,7 @@ test_reference_region_1D(H5F_libver_t libver_low, H5F_libver_t libver_high) VERIFY(ret, 15, "H5Sget_select_hyper_nblocks"); /* allocate space for the hyperslab blocks */ - coords = (hsize_t *)HDmalloc((size_t)ret * SPACE3_RANK * sizeof(hsize_t) * 2); + coords = (hsize_t *)malloc((size_t)ret * SPACE3_RANK * sizeof(hsize_t) * 2); ret = H5Sget_select_hyper_blocklist(sid3, (hsize_t)0, (hsize_t)ret, coords); CHECK(ret, FAIL, "H5Sget_select_hyper_blocklist"); @@ -1923,7 +1923,7 @@ test_reference_region_1D(H5F_libver_t libver_low, H5F_libver_t libver_high) VERIFY(coords[27], 68, "Hyperslab Coordinates"); VERIFY(coords[28], 72, "Hyperslab Coordinates"); VERIFY(coords[29], 73, "Hyperslab Coordinates"); - HDfree(coords); + free(coords); ret = H5Sget_select_bounds(sid3, low, high); CHECK(ret, FAIL, "H5Sget_select_bounds"); VERIFY(low[0], 2, "Selection Bounds"); @@ -1944,7 +1944,7 @@ test_reference_region_1D(H5F_libver_t libver_low, H5F_libver_t libver_high) VERIFY(ret, 10, "H5Sget_select_elem_npoints"); /* allocate space for the element points */ - coords = (hsize_t *)HDmalloc((size_t)ret * SPACE3_RANK * sizeof(hsize_t)); + coords = (hsize_t *)malloc((size_t)ret * SPACE3_RANK * sizeof(hsize_t)); ret = H5Sget_select_elem_pointlist(sid3, (hsize_t)0, (hsize_t)ret, coords); CHECK(ret, FAIL, "H5Sget_select_elem_pointlist"); @@ -1958,7 +1958,7 @@ test_reference_region_1D(H5F_libver_t libver_low, H5F_libver_t libver_high) VERIFY(coords[7], coord1[7][0], "Element Coordinates"); VERIFY(coords[8], coord1[8][0], "Element Coordinates"); VERIFY(coords[9], coord1[9][0], "Element Coordinates"); - HDfree(coords); + free(coords); ret = H5Sget_select_bounds(sid3, low, high); CHECK(ret, FAIL, "H5Sget_select_bounds"); VERIFY(low[0], 3, "Selection Bounds"); @@ -2002,10 +2002,10 @@ test_reference_region_1D(H5F_libver_t libver_low, H5F_libver_t libver_high) } /* Free memory buffers */ - HDfree(wbuf); - HDfree(rbuf); - HDfree(dwbuf); - HDfree(drbuf); + free(wbuf); + free(rbuf); + free(dwbuf); + free(drbuf); } /* test_reference_region_1D() */ @@ -2861,10 +2861,10 @@ test_reference_compat_conv(void) MESSAGE(5, ("Testing Deprecated Object Reference Functions\n")); /* Allocate write & read buffers */ - wbuf_obj = (hobj_ref_t *)HDcalloc(sizeof(hobj_ref_t), SPACE1_DIM1); - rbuf_obj = HDcalloc(sizeof(H5R_ref_t), SPACE1_DIM1); - wbuf_reg = HDcalloc(sizeof(hdset_reg_ref_t), SPACE1_DIM1); - rbuf_reg = HDcalloc(sizeof(H5R_ref_t), SPACE1_DIM1); + wbuf_obj = (hobj_ref_t *)calloc(sizeof(hobj_ref_t), SPACE1_DIM1); + rbuf_obj = calloc(sizeof(H5R_ref_t), SPACE1_DIM1); + wbuf_reg = calloc(sizeof(hdset_reg_ref_t), SPACE1_DIM1); + rbuf_reg = calloc(sizeof(H5R_ref_t), SPACE1_DIM1); /* Create file */ fid1 = H5Fcreate(FILE_REF_COMPAT, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT); @@ -3131,10 +3131,10 @@ test_reference_compat_conv(void) } /* Free memory buffers */ - HDfree(wbuf_obj); - HDfree(rbuf_obj); - HDfree(wbuf_reg); - HDfree(rbuf_reg); + free(wbuf_obj); + free(rbuf_obj); + free(wbuf_reg); + free(rbuf_reg); } /* test_reference_compat() */ #endif @@ -3174,17 +3174,17 @@ test_reference_perf(void) MESSAGE(5, ("Testing Object Reference Performance\n")); /* Allocate write & read buffers */ - wbuf = HDcalloc(sizeof(H5R_ref_t), SPACE1_DIM1); - obuf = HDcalloc(sizeof(unsigned), SPACE1_DIM1); - ibuf = HDcalloc(sizeof(unsigned), SPACE1_DIM1); - wbuf_deprec = (hobj_ref_t *)HDcalloc(sizeof(hobj_ref_t), SPACE1_DIM1); - rbuf = (H5R_ref_t *)HDcalloc(sizeof(H5R_ref_t), SPACE1_DIM1); - rbuf_deprec = (hobj_ref_t *)HDcalloc(sizeof(hobj_ref_t), SPACE1_DIM1); - tbuf = (H5R_ref_t *)HDcalloc(sizeof(H5R_ref_t), SPACE1_DIM1); - wbuf_reg = (H5R_ref_t *)HDcalloc(sizeof(H5R_ref_t), SPACE1_DIM1); - rbuf_reg = (H5R_ref_t *)HDcalloc(sizeof(H5R_ref_t), SPACE1_DIM1); - wbuf_reg_deprec = (hdset_reg_ref_t *)HDcalloc(sizeof(hdset_reg_ref_t), SPACE1_DIM1); - rbuf_reg_deprec = (hdset_reg_ref_t *)HDcalloc(sizeof(hdset_reg_ref_t), SPACE1_DIM1); + wbuf = calloc(sizeof(H5R_ref_t), SPACE1_DIM1); + obuf = calloc(sizeof(unsigned), SPACE1_DIM1); + ibuf = calloc(sizeof(unsigned), SPACE1_DIM1); + wbuf_deprec = (hobj_ref_t *)calloc(sizeof(hobj_ref_t), SPACE1_DIM1); + rbuf = (H5R_ref_t *)calloc(sizeof(H5R_ref_t), SPACE1_DIM1); + rbuf_deprec = (hobj_ref_t *)calloc(sizeof(hobj_ref_t), SPACE1_DIM1); + tbuf = (H5R_ref_t *)calloc(sizeof(H5R_ref_t), SPACE1_DIM1); + wbuf_reg = (H5R_ref_t *)calloc(sizeof(H5R_ref_t), SPACE1_DIM1); + rbuf_reg = (H5R_ref_t *)calloc(sizeof(H5R_ref_t), SPACE1_DIM1); + wbuf_reg_deprec = (hdset_reg_ref_t *)calloc(sizeof(hdset_reg_ref_t), SPACE1_DIM1); + rbuf_reg_deprec = (hdset_reg_ref_t *)calloc(sizeof(hdset_reg_ref_t), SPACE1_DIM1); for (i = 0; i < SPACE1_DIM1; i++) obuf[i] = i * 3; @@ -3266,7 +3266,7 @@ test_reference_perf(void) CHECK(ret, FAIL, "H5Rdestroy"); } if (VERBOSE_MED) - HDprintf("--- Object reference create time: %lfs\n", t / MAX_ITER_CREATE); + printf("--- Object reference create time: %lfs\n", t / MAX_ITER_CREATE); /* Create reference to dataset */ ret = H5Rcreate_object(fid1, "/Group1/Dataset1", H5P_DEFAULT, &wbuf[0]); @@ -3285,7 +3285,7 @@ test_reference_perf(void) t += t2 - t1; } if (VERBOSE_MED) - HDprintf("--- Object reference write time: %lfs\n", t / MAX_ITER_WRITE); + printf("--- Object reference write time: %lfs\n", t / MAX_ITER_WRITE); /* Close Dataset */ ret = H5Dclose(dataset); @@ -3304,7 +3304,7 @@ test_reference_perf(void) t += t2 - t1; } if (VERBOSE_MED) - HDprintf("--- Deprecated object reference create time: %lfs\n", t / MAX_ITER_CREATE); + printf("--- Deprecated object reference create time: %lfs\n", t / MAX_ITER_CREATE); /* Create reference to dataset */ ret = H5Rcreate(&wbuf_deprec[0], fid1, "/Group1/Dataset1", H5R_OBJECT1, H5I_INVALID_HID); @@ -3320,7 +3320,7 @@ test_reference_perf(void) t += t2 - t1; } if (VERBOSE_MED) - HDprintf("--- Deprecated object reference write time: %lfs\n", t / MAX_ITER_WRITE); + printf("--- Deprecated object reference write time: %lfs\n", t / MAX_ITER_WRITE); /* Close Dataset */ ret = H5Dclose(dataset); @@ -3342,7 +3342,7 @@ test_reference_perf(void) CHECK(ret, FAIL, "H5Rdestroy"); } if (VERBOSE_MED) - HDprintf("--- Region reference create time: %lfs\n", t / MAX_ITER_CREATE); + printf("--- Region reference create time: %lfs\n", t / MAX_ITER_CREATE); /* Store first dataset region */ ret = H5Rcreate_region(fid1, "/Group1/Dataset1", sid1, H5P_DEFAULT, &wbuf_reg[0]); @@ -3358,7 +3358,7 @@ test_reference_perf(void) t += t2 - t1; } if (VERBOSE_MED) - HDprintf("--- Region reference write time: %lfs\n", t / MAX_ITER_WRITE); + printf("--- Region reference write time: %lfs\n", t / MAX_ITER_WRITE); /* Close Dataset */ ret = H5Dclose(dataset); @@ -3378,7 +3378,7 @@ test_reference_perf(void) t += t2 - t1; } if (VERBOSE_MED) - HDprintf("--- Deprecated region reference create time: %lfs\n", t / MAX_ITER_CREATE); + printf("--- Deprecated region reference create time: %lfs\n", t / MAX_ITER_CREATE); t = 0; for (i = 0; i < MAX_ITER_WRITE; i++) { @@ -3390,7 +3390,7 @@ test_reference_perf(void) t += t2 - t1; } if (VERBOSE_MED) - HDprintf("--- Deprecated region reference write time: %lfs\n", t / MAX_ITER_WRITE); + printf("--- Deprecated region reference write time: %lfs\n", t / MAX_ITER_WRITE); /* Close Dataset */ ret = H5Dclose(dataset); @@ -3424,7 +3424,7 @@ test_reference_perf(void) CHECK(ret, FAIL, "H5Rdestroy"); } if (VERBOSE_MED) - HDprintf("--- Object reference read time: %lfs\n", t / MAX_ITER_READ); + printf("--- Object reference read time: %lfs\n", t / MAX_ITER_READ); /* Read selection from disk */ ret = H5Dread(dataset, H5T_STD_REF, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf); @@ -3470,7 +3470,7 @@ test_reference_perf(void) t += t2 - t1; } if (VERBOSE_MED) - HDprintf("--- Deprecated object reference read time: %lfs\n", t / MAX_ITER_READ); + printf("--- Deprecated object reference read time: %lfs\n", t / MAX_ITER_READ); /* Close Dataset */ ret = H5Dclose(dataset); @@ -3492,7 +3492,7 @@ test_reference_perf(void) CHECK(ret, FAIL, "H5Rdestroy"); } if (VERBOSE_MED) - HDprintf("--- Region reference read time: %lfs\n", t / MAX_ITER_READ); + printf("--- Region reference read time: %lfs\n", t / MAX_ITER_READ); /* Read selection from disk */ ret = H5Dread(dataset, H5T_STD_REF, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf_reg); @@ -3516,7 +3516,7 @@ test_reference_perf(void) t += t2 - t1; } if (VERBOSE_MED) - HDprintf("--- Deprecated region reference read time: %lfs\n", t / MAX_ITER_READ); + printf("--- Deprecated region reference read time: %lfs\n", t / MAX_ITER_READ); /* Close Dataset */ ret = H5Dclose(dataset); @@ -3543,17 +3543,17 @@ test_reference_perf(void) } /* Free memory buffers */ - HDfree(wbuf); - HDfree(rbuf); - HDfree(wbuf_reg); - HDfree(rbuf_reg); - HDfree(wbuf_deprec); - HDfree(rbuf_deprec); - HDfree(wbuf_reg_deprec); - HDfree(rbuf_reg_deprec); - HDfree(tbuf); - HDfree(ibuf); - HDfree(obuf); + free(wbuf); + free(rbuf); + free(wbuf_reg); + free(rbuf_reg); + free(wbuf_deprec); + free(rbuf_deprec); + free(wbuf_reg_deprec); + free(rbuf_reg_deprec); + free(tbuf); + free(ibuf); + free(obuf); } /* test_reference_perf() */ /**************************************************************** diff --git a/test/API/tselect.c b/test/API/tselect.c index a2f377d..1b742e5 100644 --- a/test/API/tselect.c +++ b/test/API/tselect.c @@ -248,10 +248,10 @@ test_select_hyper(hid_t xfer_plist) MESSAGE(5, ("Testing Hyperslab Selection Functions\n")); /* Allocate write & read buffers */ - wbuf = (uint8_t *)HDmalloc(sizeof(uint8_t) * SPACE2_DIM1 * SPACE2_DIM2); - CHECK_PTR(wbuf, "HDmalloc"); - rbuf = (uint8_t *)HDcalloc(sizeof(uint8_t), (size_t)(SPACE3_DIM1 * SPACE3_DIM2)); - CHECK_PTR(rbuf, "HDcalloc"); + wbuf = (uint8_t *)malloc(sizeof(uint8_t) * SPACE2_DIM1 * SPACE2_DIM2); + CHECK_PTR(wbuf, "malloc"); + rbuf = (uint8_t *)calloc(sizeof(uint8_t), (size_t)(SPACE3_DIM1 * SPACE3_DIM2)); + CHECK_PTR(rbuf, "calloc"); /* Initialize write buffer */ for (i = 0, tbuf = wbuf; i < SPACE2_DIM1; i++) @@ -435,8 +435,8 @@ test_select_hyper(hid_t xfer_plist) CHECK(ret, FAIL, "H5Fclose"); /* Free memory buffers */ - HDfree(wbuf); - HDfree(rbuf); + free(wbuf); + free(rbuf); } /* test_select_hyper() */ struct pnt_iter { @@ -502,10 +502,10 @@ test_select_point(hid_t xfer_plist) MESSAGE(5, ("Testing Element Selection Functions\n")); /* Allocate write & read buffers */ - wbuf = (uint8_t *)HDmalloc(sizeof(uint8_t) * SPACE2_DIM1 * SPACE2_DIM2); - CHECK_PTR(wbuf, "HDmalloc"); - rbuf = (uint8_t *)HDcalloc(sizeof(uint8_t), (size_t)(SPACE3_DIM1 * SPACE3_DIM2)); - CHECK_PTR(rbuf, "HDcalloc"); + wbuf = (uint8_t *)malloc(sizeof(uint8_t) * SPACE2_DIM1 * SPACE2_DIM2); + CHECK_PTR(wbuf, "malloc"); + rbuf = (uint8_t *)calloc(sizeof(uint8_t), (size_t)(SPACE3_DIM1 * SPACE3_DIM2)); + CHECK_PTR(rbuf, "calloc"); /* Initialize write buffer */ for (i = 0, tbuf = wbuf; i < SPACE2_DIM1; i++) @@ -649,7 +649,7 @@ test_select_point(hid_t xfer_plist) /* Save points for later iteration */ /* (these are in the second half of the buffer, because we are prepending */ /* the next list of points to the beginning of the point selection list) */ - HDmemcpy(((char *)pi.coord) + sizeof(coord2), coord2, sizeof(coord2)); + memcpy(((char *)pi.coord) + sizeof(coord2), coord2, sizeof(coord2)); ret = (int)H5Sget_select_npoints(sid2); VERIFY(ret, 10, "H5Sget_select_npoints"); @@ -689,7 +689,7 @@ test_select_point(hid_t xfer_plist) VERIFY(ret, 20, "H5Sget_select_npoints"); /* Save points for later iteration */ - HDmemcpy(pi.coord, coord2, sizeof(coord2)); + memcpy(pi.coord, coord2, sizeof(coord2)); /* Create a dataset */ dataset = H5Dcreate2(fid1, SPACE1_NAME, H5T_NATIVE_UCHAR, sid1, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); @@ -802,8 +802,8 @@ test_select_point(hid_t xfer_plist) CHECK(ret, FAIL, "H5Fclose"); /* Free memory buffers */ - HDfree(wbuf); - HDfree(rbuf); + free(wbuf); + free(rbuf); } /* test_select_point() */ /**************************************************************** @@ -864,10 +864,10 @@ test_select_all(hid_t xfer_plist) MESSAGE(5, ("Testing 'All' Selection Functions\n")); /* Allocate write & read buffers */ - wbuf = (uint8_t *)HDmalloc(sizeof(uint8_t) * SPACE4_DIM1 * SPACE4_DIM2 * SPACE4_DIM3); - CHECK_PTR(wbuf, "HDmalloc"); - rbuf = (uint8_t *)HDcalloc(sizeof(uint8_t), (size_t)(SPACE4_DIM1 * SPACE4_DIM2 * SPACE4_DIM3)); - CHECK_PTR(rbuf, "HDcalloc"); + wbuf = (uint8_t *)malloc(sizeof(uint8_t) * SPACE4_DIM1 * SPACE4_DIM2 * SPACE4_DIM3); + CHECK_PTR(wbuf, "malloc"); + rbuf = (uint8_t *)calloc(sizeof(uint8_t), (size_t)(SPACE4_DIM1 * SPACE4_DIM2 * SPACE4_DIM3)); + CHECK_PTR(rbuf, "calloc"); /* Initialize write buffer */ for (i = 0, tbuf = wbuf; i < SPACE4_DIM1; i++) @@ -917,8 +917,8 @@ test_select_all(hid_t xfer_plist) CHECK(ret, FAIL, "H5Fclose"); /* Free memory buffers */ - HDfree(wbuf); - HDfree(rbuf); + free(wbuf); + free(rbuf); } /* test_select_all() */ /**************************************************************** @@ -951,10 +951,10 @@ test_select_all_hyper(hid_t xfer_plist) MESSAGE(5, ("Testing 'All' Selection Functions\n")); /* Allocate write & read buffers */ - wbuf = (uint8_t *)HDmalloc(sizeof(uint8_t) * SPACE2_DIM1 * SPACE2_DIM2); - CHECK_PTR(wbuf, "HDmalloc"); - rbuf = (uint8_t *)HDcalloc(sizeof(uint8_t), (size_t)(SPACE3_DIM1 * SPACE3_DIM2)); - CHECK_PTR(rbuf, "HDcalloc"); + wbuf = (uint8_t *)malloc(sizeof(uint8_t) * SPACE2_DIM1 * SPACE2_DIM2); + CHECK_PTR(wbuf, "malloc"); + rbuf = (uint8_t *)calloc(sizeof(uint8_t), (size_t)(SPACE3_DIM1 * SPACE3_DIM2)); + CHECK_PTR(rbuf, "calloc"); /* Initialize write buffer */ for (i = 0, tbuf = wbuf; i < SPACE2_DIM1; i++) @@ -1069,8 +1069,8 @@ test_select_all_hyper(hid_t xfer_plist) CHECK(ret, FAIL, "H5Fclose"); /* Free memory buffers */ - HDfree(wbuf); - HDfree(rbuf); + free(wbuf); + free(rbuf); } /* test_select_all_hyper() */ /**************************************************************** @@ -1105,10 +1105,10 @@ test_select_combo(void) MESSAGE(5, ("Testing Combination of Hyperslab & Element Selection Functions\n")); /* Allocate write & read buffers */ - wbuf = (uint8_t *)HDmalloc(sizeof(uint8_t) * SPACE2_DIM1 * SPACE2_DIM2); - CHECK_PTR(wbuf, "HDmalloc"); - rbuf = (uint8_t *)HDcalloc(sizeof(uint8_t), (size_t)(SPACE3_DIM1 * SPACE3_DIM2)); - CHECK_PTR(rbuf, "HDcalloc"); + wbuf = (uint8_t *)malloc(sizeof(uint8_t) * SPACE2_DIM1 * SPACE2_DIM2); + CHECK_PTR(wbuf, "malloc"); + rbuf = (uint8_t *)calloc(sizeof(uint8_t), (size_t)(SPACE3_DIM1 * SPACE3_DIM2)); + CHECK_PTR(rbuf, "calloc"); /* Initialize write buffer */ for (i = 0, tbuf = wbuf; i < SPACE2_DIM1; i++) @@ -1230,8 +1230,8 @@ test_select_combo(void) CHECK(ret, FAIL, "H5Fclose"); /* Free memory buffers */ - HDfree(wbuf); - HDfree(rbuf); + free(wbuf); + free(rbuf); } /* test_select_combo() */ static int @@ -1300,10 +1300,10 @@ test_select_hyper_stride(hid_t xfer_plist) MESSAGE(5, ("Testing Hyperslabs with Strides Functionality\n")); /* Allocate write & read buffers */ - wbuf = (uint16_t *)HDmalloc(sizeof(uint16_t) * SPACE2_DIM1 * SPACE2_DIM2); - CHECK_PTR(wbuf, "HDmalloc"); - rbuf = (uint16_t *)HDcalloc(sizeof(uint16_t), (size_t)(SPACE3_DIM1 * SPACE3_DIM2)); - CHECK_PTR(rbuf, "HDcalloc"); + wbuf = (uint16_t *)malloc(sizeof(uint16_t) * SPACE2_DIM1 * SPACE2_DIM2); + CHECK_PTR(wbuf, "malloc"); + rbuf = (uint16_t *)calloc(sizeof(uint16_t), (size_t)(SPACE3_DIM1 * SPACE3_DIM2)); + CHECK_PTR(rbuf, "calloc"); /* Initialize write buffer */ for (i = 0, tbuf = wbuf; i < SPACE2_DIM1; i++) @@ -1390,10 +1390,10 @@ test_select_hyper_stride(hid_t xfer_plist) tbuf = wbuf + loc1[i]; tbuf2 = rbuf + loc2[i]; if (*tbuf != *tbuf2) { - HDprintf("%d: hyperslab values don't match!, loc1[%d]=%d, loc2[%d]=%d\n", __LINE__, i, - (int)loc1[i], i, (int)loc2[i]); - HDprintf("wbuf=%p, tbuf=%p, rbuf=%p, tbuf2=%p\n", (void *)wbuf, (void *)tbuf, (void *)rbuf, - (void *)tbuf2); + printf("%d: hyperslab values don't match!, loc1[%d]=%d, loc2[%d]=%d\n", __LINE__, i, (int)loc1[i], + i, (int)loc2[i]); + printf("wbuf=%p, tbuf=%p, rbuf=%p, tbuf2=%p\n", (void *)wbuf, (void *)tbuf, (void *)rbuf, + (void *)tbuf2); TestErrPrintf("*tbuf=%u, *tbuf2=%u\n", (unsigned)*tbuf, (unsigned)*tbuf2); } /* end if */ } /* end for */ @@ -1415,8 +1415,8 @@ test_select_hyper_stride(hid_t xfer_plist) CHECK(ret, FAIL, "H5Fclose"); /* Free memory buffers */ - HDfree(wbuf); - HDfree(rbuf); + free(wbuf); + free(rbuf); } /* test_select_hyper_stride() */ /**************************************************************** @@ -1446,10 +1446,10 @@ test_select_hyper_contig(hid_t dset_type, hid_t xfer_plist) MESSAGE(5, ("Testing Contiguous Hyperslabs Functionality\n")); /* Allocate write & read buffers */ - wbuf = (uint16_t *)HDmalloc(sizeof(uint16_t) * SPACE2_DIM1 * SPACE2_DIM2); - CHECK_PTR(wbuf, "HDmalloc"); - rbuf = (uint16_t *)HDcalloc(sizeof(uint16_t), (size_t)(SPACE2_DIM1 * SPACE2_DIM2)); - CHECK_PTR(rbuf, "HDcalloc"); + wbuf = (uint16_t *)malloc(sizeof(uint16_t) * SPACE2_DIM1 * SPACE2_DIM2); + CHECK_PTR(wbuf, "malloc"); + rbuf = (uint16_t *)calloc(sizeof(uint16_t), (size_t)(SPACE2_DIM1 * SPACE2_DIM2)); + CHECK_PTR(rbuf, "calloc"); /* Initialize write buffer */ for (i = 0, tbuf = wbuf; i < SPACE2_DIM1; i++) @@ -1537,7 +1537,7 @@ test_select_hyper_contig(hid_t dset_type, hid_t xfer_plist) CHECK(ret, FAIL, "H5Dread"); /* Compare data read with data written out */ - if (HDmemcmp(rbuf, wbuf, sizeof(uint16_t) * 30 * 12) != 0) + if (memcmp(rbuf, wbuf, sizeof(uint16_t) * 30 * 12) != 0) TestErrPrintf("hyperslab values don't match! Line=%d\n", __LINE__); /* Close memory dataspace */ @@ -1557,8 +1557,8 @@ test_select_hyper_contig(hid_t dset_type, hid_t xfer_plist) CHECK(ret, FAIL, "H5Fclose"); /* Free memory buffers */ - HDfree(wbuf); - HDfree(rbuf); + free(wbuf); + free(rbuf); } /* test_select_hyper_contig() */ /**************************************************************** @@ -1586,11 +1586,11 @@ test_select_hyper_contig2(hid_t dset_type, hid_t xfer_plist) MESSAGE(5, ("Testing More Contiguous Hyperslabs Functionality\n")); /* Allocate write & read buffers */ - wbuf = (uint16_t *)HDmalloc(sizeof(uint16_t) * SPACE8_DIM1 * SPACE8_DIM2 * SPACE8_DIM3 * SPACE8_DIM4); - CHECK_PTR(wbuf, "HDmalloc"); - rbuf = (uint16_t *)HDcalloc(sizeof(uint16_t), - (size_t)(SPACE8_DIM1 * SPACE8_DIM2 * SPACE8_DIM3 * SPACE8_DIM4)); - CHECK_PTR(rbuf, "HDcalloc"); + wbuf = (uint16_t *)malloc(sizeof(uint16_t) * SPACE8_DIM1 * SPACE8_DIM2 * SPACE8_DIM3 * SPACE8_DIM4); + CHECK_PTR(wbuf, "malloc"); + rbuf = + (uint16_t *)calloc(sizeof(uint16_t), (size_t)(SPACE8_DIM1 * SPACE8_DIM2 * SPACE8_DIM3 * SPACE8_DIM4)); + CHECK_PTR(rbuf, "calloc"); /* Initialize write buffer */ for (i = 0, tbuf = wbuf; i < SPACE8_DIM1; i++) @@ -1680,7 +1680,7 @@ test_select_hyper_contig2(hid_t dset_type, hid_t xfer_plist) CHECK(ret, FAIL, "H5Dread"); /* Compare data read with data written out */ - if (HDmemcmp(rbuf, wbuf, sizeof(uint16_t) * 2 * SPACE8_DIM3 * SPACE8_DIM2 * SPACE8_DIM1) != 0) + if (memcmp(rbuf, wbuf, sizeof(uint16_t) * 2 * SPACE8_DIM3 * SPACE8_DIM2 * SPACE8_DIM1) != 0) TestErrPrintf("Error: hyperslab values don't match!\n"); /* Close memory dataspace */ @@ -1700,8 +1700,8 @@ test_select_hyper_contig2(hid_t dset_type, hid_t xfer_plist) CHECK(ret, FAIL, "H5Fclose"); /* Free memory buffers */ - HDfree(wbuf); - HDfree(rbuf); + free(wbuf); + free(rbuf); } /* test_select_hyper_contig2() */ /**************************************************************** @@ -1732,11 +1732,11 @@ test_select_hyper_contig3(hid_t dset_type, hid_t xfer_plist) MESSAGE(5, ("Testing Yet More Contiguous Hyperslabs Functionality\n")); /* Allocate write & read buffers */ - wbuf = (uint16_t *)HDmalloc(sizeof(uint16_t) * SPACE8_DIM1 * SPACE8_DIM2 * SPACE8_DIM3 * SPACE8_DIM4); - CHECK_PTR(wbuf, "HDmalloc"); - rbuf = (uint16_t *)HDcalloc(sizeof(uint16_t), - (size_t)(SPACE8_DIM1 * SPACE8_DIM2 * SPACE8_DIM3 * SPACE8_DIM4)); - CHECK_PTR(rbuf, "HDcalloc"); + wbuf = (uint16_t *)malloc(sizeof(uint16_t) * SPACE8_DIM1 * SPACE8_DIM2 * SPACE8_DIM3 * SPACE8_DIM4); + CHECK_PTR(wbuf, "malloc"); + rbuf = + (uint16_t *)calloc(sizeof(uint16_t), (size_t)(SPACE8_DIM1 * SPACE8_DIM2 * SPACE8_DIM3 * SPACE8_DIM4)); + CHECK_PTR(rbuf, "calloc"); /* Initialize write buffer */ for (i = 0, tbuf = wbuf; i < SPACE8_DIM4; i++) @@ -1835,14 +1835,14 @@ test_select_hyper_contig3(hid_t dset_type, hid_t xfer_plist) (k >= start[2] && k < (start[2] + count[2])) && (l >= start[3] && l < (start[3] + count[3]))) { if (*tbuf != *tbuf2) { - HDprintf("Error: hyperslab values don't match!\n"); + printf("Error: hyperslab values don't match!\n"); TestErrPrintf("Line: %d, i=%u, j=%u, k=%u, l=%u, *tbuf=%u,*tbuf2=%u\n", __LINE__, i, j, k, l, (unsigned)*tbuf, (unsigned)*tbuf2); } /* end if */ } /* end if */ else { if (*tbuf2 != 0) { - HDprintf("Error: invalid data in read buffer!\n"); + printf("Error: invalid data in read buffer!\n"); TestErrPrintf("Line: %d, i=%u, j=%u, k=%u, l=%u, *tbuf=%u,*tbuf2=%u\n", __LINE__, i, j, k, l, (unsigned)*tbuf, (unsigned)*tbuf2); } /* end if */ @@ -1865,8 +1865,8 @@ test_select_hyper_contig3(hid_t dset_type, hid_t xfer_plist) CHECK(ret, FAIL, "H5Fclose"); /* Free memory buffers */ - HDfree(wbuf); - HDfree(rbuf); + free(wbuf); + free(rbuf); } /* test_select_hyper_contig3() */ #if 0 @@ -1886,8 +1886,8 @@ verify_select_hyper_contig_dr__run_test(const uint16_t *cube_buf, size_t cube_si size_t s; /* Local index variable */ hbool_t mis_match; /* Flag to indicate mismatch in expected value */ - HDassert(cube_buf); - HDassert(cube_size > 0); + assert(cube_buf); + assert(cube_size > 0); expected_value = 0; mis_match = FALSE; @@ -1904,7 +1904,7 @@ verify_select_hyper_contig_dr__run_test(const uint16_t *cube_buf, size_t cube_si m = 0; do { /* Sanity check */ - HDassert(s < cube_size); + assert(s < cube_size); /* Check for correct value */ if (*cube_ptr != expected_value) @@ -1980,12 +1980,12 @@ test_select_hyper_contig_dr__run_test(int test_num, const uint16_t *cube_buf, co MESSAGE(7, ("\tranks = %u/%u, edge_size = %u, chunk_edge_size = %u.\n", small_rank, large_rank, edge_size, chunk_edge_size)); - HDassert(edge_size >= 6); - HDassert(edge_size >= chunk_edge_size); - HDassert((chunk_edge_size == 0) || (chunk_edge_size >= 3)); - HDassert(small_rank > 0); - HDassert(small_rank < large_rank); - HDassert(large_rank <= SS_DR_MAX_RANK); + assert(edge_size >= 6); + assert(edge_size >= chunk_edge_size); + assert((chunk_edge_size == 0) || (chunk_edge_size >= 3)); + assert(small_rank > 0); + assert(small_rank < large_rank); + assert(large_rank <= SS_DR_MAX_RANK); /* Compute cube sizes */ small_cube_size = large_cube_size = (size_t)1; @@ -1996,7 +1996,7 @@ test_select_hyper_contig_dr__run_test(int test_num, const uint16_t *cube_buf, co large_cube_size *= (size_t)edge_size; } /* end for */ - HDassert(large_cube_size < (size_t)UINT_MAX); + assert(large_cube_size < (size_t)UINT_MAX); /* set up the start, stride, count, and block pointers */ start_ptr = &(start[SS_DR_MAX_RANK - large_rank]); @@ -2005,10 +2005,10 @@ test_select_hyper_contig_dr__run_test(int test_num, const uint16_t *cube_buf, co block_ptr = &(block[SS_DR_MAX_RANK - large_rank]); /* Allocate buffers */ - small_cube_buf_1 = (uint16_t *)HDcalloc(sizeof(uint16_t), small_cube_size); - CHECK_PTR(small_cube_buf_1, "HDcalloc"); - large_cube_buf_1 = (uint16_t *)HDcalloc(sizeof(uint16_t), large_cube_size); - CHECK_PTR(large_cube_buf_1, "HDcalloc"); + small_cube_buf_1 = (uint16_t *)calloc(sizeof(uint16_t), small_cube_size); + CHECK_PTR(small_cube_buf_1, "calloc"); + large_cube_buf_1 = (uint16_t *)calloc(sizeof(uint16_t), large_cube_size); + CHECK_PTR(large_cube_buf_1, "calloc"); /* Create a dataset transfer property list */ fapl = H5Pcreate(H5P_FILE_ACCESS); @@ -2199,7 +2199,7 @@ test_select_hyper_contig_dr__run_test(int test_num, const uint16_t *cube_buf, co */ /* zero out the in-memory large cube */ - HDmemset(large_cube_buf_1, 0, large_cube_size * sizeof(uint16_t)); + memset(large_cube_buf_1, 0, large_cube_size * sizeof(uint16_t)); u = 0; do { @@ -2242,8 +2242,8 @@ test_select_hyper_contig_dr__run_test(int test_num, const uint16_t *cube_buf, co (x * edge_size); stop_index = start_index + small_cube_size - 1; - HDassert(start_index < stop_index); - HDassert(stop_index <= large_cube_size); + assert(start_index < stop_index); + assert(stop_index <= large_cube_size); mis_match = FALSE; ptr_1 = large_cube_buf_1; @@ -2268,7 +2268,7 @@ test_select_hyper_contig_dr__run_test(int test_num, const uint16_t *cube_buf, co TestErrPrintf("large cube read from small cube has bad data! Line=%u\n", __LINE__); /* Zero out the buffer for the next pass */ - HDmemset(large_cube_buf_1 + start_index, 0, small_cube_size * sizeof(uint16_t)); + memset(large_cube_buf_1 + start_index, 0, small_cube_size * sizeof(uint16_t)); x++; } while ((large_rank >= 2) && (small_rank <= 1) && (x < edge_size)); @@ -2436,8 +2436,8 @@ test_select_hyper_contig_dr__run_test(int test_num, const uint16_t *cube_buf, co (x * edge_size); stop_index = start_index + small_cube_size - 1; - HDassert(start_index < stop_index); - HDassert(stop_index <= large_cube_size); + assert(start_index < stop_index); + assert(stop_index <= large_cube_size); mis_match = FALSE; ptr_1 = large_cube_buf_1; @@ -2493,8 +2493,8 @@ test_select_hyper_contig_dr__run_test(int test_num, const uint16_t *cube_buf, co CHECK(ret, FAIL, "H5Fclose"); /* Free memory buffers */ - HDfree(small_cube_buf_1); - HDfree(large_cube_buf_1); + free(small_cube_buf_1); + free(large_cube_buf_1); } /* test_select_hyper_contig_dr__run_test() */ #endif @@ -2533,8 +2533,8 @@ test_select_hyper_contig_dr(hid_t dset_type, hid_t xfer_plist) max_cube_size *= (size_t)edge_size; /* Allocate cube buffer for writing values */ - cube_buf = (uint16_t *)HDmalloc(sizeof(uint16_t) * max_cube_size); - CHECK_PTR(cube_buf, "HDmalloc"); + cube_buf = (uint16_t *)malloc(sizeof(uint16_t) * max_cube_size); + CHECK_PTR(cube_buf, "malloc"); /* Initialize the cube buffer */ cube_ptr = cube_buf; @@ -2542,8 +2542,8 @@ test_select_hyper_contig_dr(hid_t dset_type, hid_t xfer_plist) *cube_ptr++ = (uint16_t)s; /* Allocate cube buffer for zeroing values on disk */ - zero_buf = (uint16_t *)HDcalloc(sizeof(uint16_t), max_cube_size); - CHECK_PTR(zero_buf, "HDcalloc"); + zero_buf = (uint16_t *)calloc(sizeof(uint16_t), max_cube_size); + CHECK_PTR(zero_buf, "calloc"); for (large_rank = 1; large_rank <= max_rank; large_rank++) { for (small_rank = 1; small_rank < large_rank; small_rank++) { @@ -2559,8 +2559,8 @@ test_select_hyper_contig_dr(hid_t dset_type, hid_t xfer_plist) } /* for loop on small rank */ } /* for loop on large rank */ - HDfree(cube_buf); - HDfree(zero_buf); + free(cube_buf); + free(zero_buf); } /* test_select_hyper_contig_dr() */ #endif @@ -2603,16 +2603,16 @@ test_select_hyper_checker_board_dr__select_checker_board(hid_t tgt_n_cube_sid, u unsigned u; /* Local index variables */ herr_t ret; /* Generic return value */ - HDassert(edge_size >= 6); - HDassert(0 < checker_edge_size); - HDassert(checker_edge_size <= edge_size); - HDassert(0 < sel_rank); - HDassert(sel_rank <= tgt_n_cube_rank); - HDassert(tgt_n_cube_rank <= SS_DR_MAX_RANK); + assert(edge_size >= 6); + assert(0 < checker_edge_size); + assert(checker_edge_size <= edge_size); + assert(0 < sel_rank); + assert(sel_rank <= tgt_n_cube_rank); + assert(tgt_n_cube_rank <= SS_DR_MAX_RANK); sel_offset = SS_DR_MAX_RANK - sel_rank; n_cube_offset = SS_DR_MAX_RANK - tgt_n_cube_rank; - HDassert(n_cube_offset <= sel_offset); + assert(n_cube_offset <= sel_offset); /* First, compute the base count (which assumes start == 0 * for the associated offset) and offset_count (which @@ -2827,13 +2827,13 @@ test_select_hyper_checker_board_dr__verify_data(uint16_t *buf_ptr, unsigned rank unsigned v, w, x, y, z; /* to track position in checker */ const unsigned test_max_rank = 5; /* code changes needed if this is increased */ - HDassert(buf_ptr != NULL); - HDassert(0 < rank); - HDassert(rank <= test_max_rank); - HDassert(edge_size >= 6); - HDassert(0 < checker_edge_size); - HDassert(checker_edge_size <= edge_size); - HDassert(test_max_rank <= SS_DR_MAX_RANK); + assert(buf_ptr != NULL); + assert(0 < rank); + assert(rank <= test_max_rank); + assert(edge_size >= 6); + assert(0 < checker_edge_size); + assert(checker_edge_size <= edge_size); + assert(test_max_rank <= SS_DR_MAX_RANK); val_ptr = buf_ptr; expected_value = first_expected_val; @@ -2966,15 +2966,15 @@ test_select_hyper_checker_board_dr__run_test(int test_num, const uint16_t *cube_ MESSAGE(7, ("\tranks = %d/%d, edge_size = %d, checker_edge_size = %d, chunk_edge_size = %d.\n", small_rank, large_rank, edge_size, checker_edge_size, chunk_edge_size)); - HDassert(edge_size >= 6); - HDassert(checker_edge_size > 0); - HDassert(checker_edge_size <= edge_size); - HDassert(edge_size >= chunk_edge_size); - HDassert((chunk_edge_size == 0) || (chunk_edge_size >= 3)); - HDassert(small_rank > 0); - HDassert(small_rank < large_rank); - HDassert(large_rank <= test_max_rank); - HDassert(test_max_rank <= SS_DR_MAX_RANK); + assert(edge_size >= 6); + assert(checker_edge_size > 0); + assert(checker_edge_size <= edge_size); + assert(edge_size >= chunk_edge_size); + assert((chunk_edge_size == 0) || (chunk_edge_size >= 3)); + assert(small_rank > 0); + assert(small_rank < large_rank); + assert(large_rank <= test_max_rank); + assert(test_max_rank <= SS_DR_MAX_RANK); /* Compute cube sizes */ small_cube_size = large_cube_size = (size_t)1; @@ -2984,22 +2984,22 @@ test_select_hyper_checker_board_dr__run_test(int test_num, const uint16_t *cube_ large_cube_size *= (size_t)edge_size; } /* end for */ - HDassert(large_cube_size < (size_t)(UINT_MAX)); + assert(large_cube_size < (size_t)(UINT_MAX)); small_rank_offset = test_max_rank - small_rank; - HDassert(small_rank_offset >= 1); + assert(small_rank_offset >= 1); /* also, at present, we use 16 bit values in this test -- * hence the following assertion. Delete it if we convert * to 32 bit values. */ - HDassert(large_cube_size < (size_t)(64 * 1024)); + assert(large_cube_size < (size_t)(64 * 1024)); /* Allocate & initialize buffers */ - small_cube_buf_1 = (uint16_t *)HDcalloc(sizeof(uint16_t), small_cube_size); - CHECK_PTR(small_cube_buf_1, "HDcalloc"); - large_cube_buf_1 = (uint16_t *)HDcalloc(sizeof(uint16_t), large_cube_size); - CHECK_PTR(large_cube_buf_1, "HDcalloc"); + small_cube_buf_1 = (uint16_t *)calloc(sizeof(uint16_t), small_cube_size); + CHECK_PTR(small_cube_buf_1, "calloc"); + large_cube_buf_1 = (uint16_t *)calloc(sizeof(uint16_t), large_cube_size); + CHECK_PTR(large_cube_buf_1, "calloc"); /* Create a dataset transfer property list */ fapl = H5Pcreate(H5P_FILE_ACCESS); @@ -3160,11 +3160,11 @@ test_select_hyper_checker_board_dr__run_test(int test_num, const uint16_t *cube_ * need for another inner loop. */ - HDassert((sel_start[0] == 0) || (0 < small_rank_offset)); - HDassert((sel_start[1] == 0) || (1 < small_rank_offset)); - HDassert((sel_start[2] == 0) || (2 < small_rank_offset)); - HDassert((sel_start[3] == 0) || (3 < small_rank_offset)); - HDassert((sel_start[4] == 0) || (4 < small_rank_offset)); + assert((sel_start[0] == 0) || (0 < small_rank_offset)); + assert((sel_start[1] == 0) || (1 < small_rank_offset)); + assert((sel_start[2] == 0) || (2 < small_rank_offset)); + assert((sel_start[3] == 0) || (3 < small_rank_offset)); + assert((sel_start[4] == 0) || (4 < small_rank_offset)); test_select_hyper_checker_board_dr__select_checker_board( file_large_cube_sid, large_rank, edge_size, checker_edge_size, small_rank, sel_start); @@ -3176,7 +3176,7 @@ test_select_hyper_checker_board_dr__run_test(int test_num, const uint16_t *cube_ VERIFY(check, TRUE, "H5Sselect_shape_same"); /* zero the buffer that we will be using for reading */ - HDmemset(small_cube_buf_1, 0, sizeof(*small_cube_buf_1) * small_cube_size); + memset(small_cube_buf_1, 0, sizeof(*small_cube_buf_1) * small_cube_size); /* Read selection from disk */ ret = H5Dread(large_cube_dataset, H5T_NATIVE_UINT16, mem_small_cube_sid, @@ -3240,11 +3240,11 @@ test_select_hyper_checker_board_dr__run_test(int test_num, const uint16_t *cube_ * need for another inner loop. */ - HDassert((sel_start[0] == 0) || (0 < small_rank_offset)); - HDassert((sel_start[1] == 0) || (1 < small_rank_offset)); - HDassert((sel_start[2] == 0) || (2 < small_rank_offset)); - HDassert((sel_start[3] == 0) || (3 < small_rank_offset)); - HDassert((sel_start[4] == 0) || (4 < small_rank_offset)); + assert((sel_start[0] == 0) || (0 < small_rank_offset)); + assert((sel_start[1] == 0) || (1 < small_rank_offset)); + assert((sel_start[2] == 0) || (2 < small_rank_offset)); + assert((sel_start[3] == 0) || (3 < small_rank_offset)); + assert((sel_start[4] == 0) || (4 < small_rank_offset)); test_select_hyper_checker_board_dr__select_checker_board( mem_large_cube_sid, large_rank, edge_size, checker_edge_size, small_rank, sel_start); @@ -3256,7 +3256,7 @@ test_select_hyper_checker_board_dr__run_test(int test_num, const uint16_t *cube_ VERIFY(check, TRUE, "H5Sselect_shape_same"); /* zero out the in memory large cube */ - HDmemset(large_cube_buf_1, 0, sizeof(*large_cube_buf_1) * large_cube_size); + memset(large_cube_buf_1, 0, sizeof(*large_cube_buf_1) * large_cube_size); /* Read selection from disk */ ret = H5Dread(small_cube_dataset, H5T_NATIVE_UINT16, mem_large_cube_sid, @@ -3274,8 +3274,8 @@ test_select_hyper_checker_board_dr__run_test(int test_num, const uint16_t *cube_ (x * edge_size); stop_index = start_index + small_cube_size - 1; - HDassert(start_index < stop_index); - HDassert(stop_index <= large_cube_size); + assert(start_index < stop_index); + assert(stop_index <= large_cube_size); /* verify that the large cube contains only zeros before the slice */ for (s = 0; s < start_index; s++) { @@ -3283,7 +3283,7 @@ test_select_hyper_checker_board_dr__run_test(int test_num, const uint16_t *cube_ data_ok = FALSE; ptr_1++; } /* end for */ - HDassert(s == start_index); + 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); @@ -3291,7 +3291,7 @@ test_select_hyper_checker_board_dr__run_test(int test_num, const uint16_t *cube_ ptr_1 += small_cube_size; s += small_cube_size; - HDassert(s == stop_index + 1); + assert(s == stop_index + 1); /* verify that the large cube contains only zeros after the slice */ for (s = stop_index + 1; s < large_cube_size; s++) { @@ -3360,11 +3360,11 @@ test_select_hyper_checker_board_dr__run_test(int test_num, const uint16_t *cube_ * need for another inner loop. */ - HDassert((sel_start[0] == 0) || (0 < small_rank_offset)); - HDassert((sel_start[1] == 0) || (1 < small_rank_offset)); - HDassert((sel_start[2] == 0) || (2 < small_rank_offset)); - HDassert((sel_start[3] == 0) || (3 < small_rank_offset)); - HDassert((sel_start[4] == 0) || (4 < small_rank_offset)); + assert((sel_start[0] == 0) || (0 < small_rank_offset)); + assert((sel_start[1] == 0) || (1 < small_rank_offset)); + assert((sel_start[2] == 0) || (2 < small_rank_offset)); + assert((sel_start[3] == 0) || (3 < small_rank_offset)); + assert((sel_start[4] == 0) || (4 < small_rank_offset)); test_select_hyper_checker_board_dr__select_checker_board( mem_large_cube_sid, large_rank, edge_size, checker_edge_size, small_rank, sel_start); @@ -3383,7 +3383,7 @@ test_select_hyper_checker_board_dr__run_test(int test_num, const uint16_t *cube_ CHECK(ret, FAIL, "H5Dwrite"); /* zero the buffer that we will be using for reading */ - HDmemset(small_cube_buf_1, 0, sizeof(*small_cube_buf_1) * small_cube_size); + memset(small_cube_buf_1, 0, sizeof(*small_cube_buf_1) * small_cube_size); /* read the on disk small cube into memory */ ret = H5Dread(small_cube_dataset, H5T_NATIVE_UINT16, full_small_cube_sid, @@ -3455,11 +3455,11 @@ test_select_hyper_checker_board_dr__run_test(int test_num, const uint16_t *cube_ * need for another inner loop. */ - HDassert((sel_start[0] == 0) || (0 < small_rank_offset)); - HDassert((sel_start[1] == 0) || (1 < small_rank_offset)); - HDassert((sel_start[2] == 0) || (2 < small_rank_offset)); - HDassert((sel_start[3] == 0) || (3 < small_rank_offset)); - HDassert((sel_start[4] == 0) || (4 < small_rank_offset)); + assert((sel_start[0] == 0) || (0 < small_rank_offset)); + assert((sel_start[1] == 0) || (1 < small_rank_offset)); + assert((sel_start[2] == 0) || (2 < small_rank_offset)); + assert((sel_start[3] == 0) || (3 < small_rank_offset)); + assert((sel_start[4] == 0) || (4 < small_rank_offset)); test_select_hyper_checker_board_dr__select_checker_board( file_large_cube_sid, large_rank, edge_size, checker_edge_size, small_rank, sel_start); @@ -3479,7 +3479,7 @@ test_select_hyper_checker_board_dr__run_test(int test_num, const uint16_t *cube_ CHECK(ret, FAIL, "H5Dwrite"); /* zero out the in memory large cube */ - HDmemset(large_cube_buf_1, 0, sizeof(*large_cube_buf_1) * large_cube_size); + memset(large_cube_buf_1, 0, sizeof(*large_cube_buf_1) * large_cube_size); /* read the on disk large cube into memory */ ret = H5Dread(large_cube_dataset, H5T_NATIVE_UINT16, full_large_cube_sid, @@ -3498,8 +3498,8 @@ test_select_hyper_checker_board_dr__run_test(int test_num, const uint16_t *cube_ (x * edge_size); stop_index = start_index + small_cube_size - 1; - HDassert(start_index < stop_index); - HDassert(stop_index <= large_cube_size); + assert(start_index < stop_index); + assert(stop_index <= large_cube_size); /* verify that the large cube contains only zeros before the slice */ for (s = 0; s < start_index; s++) { @@ -3507,7 +3507,7 @@ test_select_hyper_checker_board_dr__run_test(int test_num, const uint16_t *cube_ data_ok = FALSE; ptr_1++; } /* end for */ - HDassert(s == start_index); + assert(s == start_index); /* verify that the slice contains the expected data */ data_ok &= test_select_hyper_checker_board_dr__verify_data( @@ -3516,7 +3516,7 @@ test_select_hyper_checker_board_dr__run_test(int test_num, const uint16_t *cube_ ptr_1 += small_cube_size; s += small_cube_size; - HDassert(s == stop_index + 1); + assert(s == stop_index + 1); /* verify that the large cube contains only zeros after the slice */ for (s = stop_index + 1; s < large_cube_size; s++) { @@ -3571,8 +3571,8 @@ test_select_hyper_checker_board_dr__run_test(int test_num, const uint16_t *cube_ CHECK(ret, FAIL, "H5Fclose"); /* Free memory buffers */ - HDfree(small_cube_buf_1); - HDfree(large_cube_buf_1); + free(small_cube_buf_1); + free(large_cube_buf_1); } /* test_select_hyper_checker_board_dr__run_test() */ #endif @@ -3615,8 +3615,8 @@ test_select_hyper_checker_board_dr(hid_t dset_type, hid_t xfer_plist) max_cube_size *= (size_t)(edge_size + 1); /* Allocate cube buffer for writing values */ - cube_buf = (uint16_t *)HDmalloc(sizeof(uint16_t) * max_cube_size); - CHECK_PTR(cube_buf, "HDmalloc"); + cube_buf = (uint16_t *)malloc(sizeof(uint16_t) * max_cube_size); + CHECK_PTR(cube_buf, "malloc"); /* Initialize the cube buffer */ cube_ptr = cube_buf; @@ -3624,8 +3624,8 @@ test_select_hyper_checker_board_dr(hid_t dset_type, hid_t xfer_plist) *cube_ptr++ = (uint16_t)s; /* Allocate cube buffer for zeroing values on disk */ - zero_buf = (uint16_t *)HDcalloc(sizeof(uint16_t), max_cube_size); - CHECK_PTR(zero_buf, "HDcalloc"); + zero_buf = (uint16_t *)calloc(sizeof(uint16_t), max_cube_size); + CHECK_PTR(zero_buf, "calloc"); for (large_rank = 1; large_rank <= max_rank; large_rank++) { for (small_rank = 1; small_rank < large_rank; small_rank++) { @@ -3653,8 +3653,8 @@ test_select_hyper_checker_board_dr(hid_t dset_type, hid_t xfer_plist) } /* for loop on small rank */ } /* for loop on large rank */ - HDfree(cube_buf); - HDfree(zero_buf); + free(cube_buf); + free(zero_buf); } /* test_select_hyper_checker_board_dr() */ #endif @@ -3688,12 +3688,12 @@ test_select_hyper_copy(void) MESSAGE(5, ("Testing Hyperslabs with Strides Functionality\n")); /* Allocate write & read buffers */ - wbuf = (uint16_t *)HDmalloc(sizeof(uint16_t) * SPACE2_DIM1 * SPACE2_DIM2); - CHECK_PTR(wbuf, "HDmalloc"); - rbuf = (uint16_t *)HDcalloc(sizeof(uint16_t), (size_t)(SPACE3_DIM1 * SPACE3_DIM2)); - CHECK_PTR(rbuf, "HDcalloc"); - rbuf2 = (uint16_t *)HDcalloc(sizeof(uint16_t), (size_t)(SPACE3_DIM1 * SPACE3_DIM2)); - CHECK_PTR(rbuf2, "HDcalloc"); + wbuf = (uint16_t *)malloc(sizeof(uint16_t) * SPACE2_DIM1 * SPACE2_DIM2); + CHECK_PTR(wbuf, "malloc"); + rbuf = (uint16_t *)calloc(sizeof(uint16_t), (size_t)(SPACE3_DIM1 * SPACE3_DIM2)); + CHECK_PTR(rbuf, "calloc"); + rbuf2 = (uint16_t *)calloc(sizeof(uint16_t), (size_t)(SPACE3_DIM1 * SPACE3_DIM2)); + CHECK_PTR(rbuf2, "calloc"); /* Initialize write buffer */ for (i = 0, tbuf = wbuf; i < SPACE2_DIM1; i++) @@ -3797,7 +3797,7 @@ test_select_hyper_copy(void) CHECK(ret, FAIL, "H5Dread"); /* Compare data read with data written out */ - if (HDmemcmp(rbuf, rbuf2, sizeof(uint16_t) * SPACE3_DIM1 * SPACE3_DIM2) != 0) + if (memcmp(rbuf, rbuf2, sizeof(uint16_t) * SPACE3_DIM1 * SPACE3_DIM2) != 0) TestErrPrintf("hyperslab values don't match! Line=%d\n", __LINE__); /* Close memory dataspace */ @@ -3825,9 +3825,9 @@ test_select_hyper_copy(void) CHECK(ret, FAIL, "H5Fclose"); /* Free memory buffers */ - HDfree(wbuf); - HDfree(rbuf); - HDfree(rbuf2); + free(wbuf); + free(rbuf); + free(rbuf2); } /* test_select_hyper_copy() */ /**************************************************************** @@ -3859,12 +3859,12 @@ test_select_point_copy(void) MESSAGE(5, ("Testing Hyperslabs with Strides Functionality\n")); /* Allocate write & read buffers */ - wbuf = (uint16_t *)HDmalloc(sizeof(uint16_t) * SPACE2_DIM1 * SPACE2_DIM2); - CHECK_PTR(wbuf, "HDmalloc"); - rbuf = (uint16_t *)HDcalloc(sizeof(uint16_t), (size_t)(SPACE3_DIM1 * SPACE3_DIM2)); - CHECK_PTR(rbuf, "HDcalloc"); - rbuf2 = (uint16_t *)HDcalloc(sizeof(uint16_t), (size_t)(SPACE3_DIM1 * SPACE3_DIM2)); - CHECK_PTR(rbuf2, "HDcalloc"); + wbuf = (uint16_t *)malloc(sizeof(uint16_t) * SPACE2_DIM1 * SPACE2_DIM2); + CHECK_PTR(wbuf, "malloc"); + rbuf = (uint16_t *)calloc(sizeof(uint16_t), (size_t)(SPACE3_DIM1 * SPACE3_DIM2)); + CHECK_PTR(rbuf, "calloc"); + rbuf2 = (uint16_t *)calloc(sizeof(uint16_t), (size_t)(SPACE3_DIM1 * SPACE3_DIM2)); + CHECK_PTR(rbuf2, "calloc"); /* Initialize write buffer */ for (i = 0, tbuf = wbuf; i < SPACE2_DIM1; i++) @@ -4010,7 +4010,7 @@ test_select_point_copy(void) CHECK(ret, FAIL, "H5Dread"); /* Compare data read with data written out */ - if (HDmemcmp(rbuf, rbuf2, sizeof(uint16_t) * SPACE3_DIM1 * SPACE3_DIM2) != 0) + if (memcmp(rbuf, rbuf2, sizeof(uint16_t) * SPACE3_DIM1 * SPACE3_DIM2) != 0) TestErrPrintf("point values don't match!\n"); /* Close memory dataspace */ @@ -4038,9 +4038,9 @@ test_select_point_copy(void) CHECK(ret, FAIL, "H5Fclose"); /* Free memory buffers */ - HDfree(wbuf); - HDfree(rbuf); - HDfree(rbuf2); + free(wbuf); + free(rbuf); + free(rbuf2); } /* test_select_point_copy() */ /**************************************************************** @@ -4077,10 +4077,10 @@ test_select_hyper_offset(void) MESSAGE(5, ("Testing Hyperslab Selection Functions with Offsets\n")); /* Allocate write & read buffers */ - wbuf = (uint8_t *)HDmalloc(sizeof(uint8_t) * SPACE2_DIM1 * SPACE2_DIM2); - CHECK_PTR(wbuf, "HDmalloc"); - rbuf = (uint8_t *)HDcalloc(sizeof(uint8_t), (size_t)(SPACE3_DIM1 * SPACE3_DIM2)); - CHECK_PTR(rbuf, "HDcalloc"); + wbuf = (uint8_t *)malloc(sizeof(uint8_t) * SPACE2_DIM1 * SPACE2_DIM2); + CHECK_PTR(wbuf, "malloc"); + rbuf = (uint8_t *)calloc(sizeof(uint8_t), (size_t)(SPACE3_DIM1 * SPACE3_DIM2)); + CHECK_PTR(rbuf, "calloc"); /* Initialize write buffer */ for (i = 0, tbuf = wbuf; i < SPACE2_DIM1; i++) @@ -4226,8 +4226,8 @@ test_select_hyper_offset(void) CHECK(ret, FAIL, "H5Fclose"); /* Free memory buffers */ - HDfree(wbuf); - HDfree(rbuf); + free(wbuf); + free(rbuf); } /* test_select_hyper_offset() */ /**************************************************************** @@ -4259,10 +4259,10 @@ test_select_hyper_offset2(void) MESSAGE(5, ("Testing More Hyperslab Selection Functions with Offsets\n")); /* Allocate write & read buffers */ - wbuf = (uint8_t *)HDmalloc(sizeof(uint8_t) * SPACE7_DIM1 * SPACE7_DIM2); - CHECK_PTR(wbuf, "HDmalloc"); - rbuf = (uint8_t *)HDcalloc(sizeof(uint8_t), (size_t)(SPACE7_DIM1 * SPACE7_DIM2)); - CHECK_PTR(rbuf, "HDcalloc"); + wbuf = (uint8_t *)malloc(sizeof(uint8_t) * SPACE7_DIM1 * SPACE7_DIM2); + CHECK_PTR(wbuf, "malloc"); + rbuf = (uint8_t *)calloc(sizeof(uint8_t), (size_t)(SPACE7_DIM1 * SPACE7_DIM2)); + CHECK_PTR(rbuf, "calloc"); /* Initialize write buffer */ for (i = 0, tbuf = wbuf; i < SPACE7_DIM1; i++) @@ -4353,8 +4353,8 @@ test_select_hyper_offset2(void) CHECK(ret, FAIL, "H5Fclose"); /* Free memory buffers */ - HDfree(wbuf); - HDfree(rbuf); + free(wbuf); + free(rbuf); } /* test_select_hyper_offset2() */ /**************************************************************** @@ -4389,10 +4389,10 @@ test_select_point_offset(void) MESSAGE(5, ("Testing Element Selection Functions\n")); /* Allocate write & read buffers */ - wbuf = (uint8_t *)HDmalloc(sizeof(uint8_t) * SPACE2_DIM1 * SPACE2_DIM2); - CHECK_PTR(wbuf, "HDmalloc"); - rbuf = (uint8_t *)HDcalloc(sizeof(uint8_t), (size_t)(SPACE3_DIM1 * SPACE3_DIM2)); - CHECK_PTR(rbuf, "HDcalloc"); + wbuf = (uint8_t *)malloc(sizeof(uint8_t) * SPACE2_DIM1 * SPACE2_DIM2); + CHECK_PTR(wbuf, "malloc"); + rbuf = (uint8_t *)calloc(sizeof(uint8_t), (size_t)(SPACE3_DIM1 * SPACE3_DIM2)); + CHECK_PTR(rbuf, "calloc"); /* Initialize write buffer */ for (i = 0, tbuf = wbuf; i < SPACE2_DIM1; i++) @@ -4573,8 +4573,8 @@ test_select_point_offset(void) CHECK(ret, FAIL, "H5Fclose"); /* Free memory buffers */ - HDfree(wbuf); - HDfree(rbuf); + free(wbuf); + free(rbuf); } /* test_select_point_offset() */ /**************************************************************** @@ -4616,10 +4616,10 @@ test_select_hyper_union(void) MESSAGE(5, ("Testing Hyperslab Selection Functions with unions of hyperslabs\n")); /* Allocate write & read buffers */ - wbuf = (uint8_t *)HDmalloc(sizeof(uint8_t) * SPACE2_DIM1 * SPACE2_DIM2); - CHECK_PTR(wbuf, "HDmalloc"); - rbuf = (uint8_t *)HDcalloc(sizeof(uint8_t), (size_t)(SPACE3_DIM1 * SPACE3_DIM2)); - CHECK_PTR(rbuf, "HDcalloc"); + wbuf = (uint8_t *)malloc(sizeof(uint8_t) * SPACE2_DIM1 * SPACE2_DIM2); + CHECK_PTR(wbuf, "malloc"); + rbuf = (uint8_t *)calloc(sizeof(uint8_t), (size_t)(SPACE3_DIM1 * SPACE3_DIM2)); + CHECK_PTR(rbuf, "calloc"); /* Initialize write buffer */ for (i = 0, tbuf = wbuf; i < SPACE2_DIM1; i++) @@ -5199,8 +5199,8 @@ test_select_hyper_union(void) CHECK(ret, FAIL, "H5Fclose"); /* Free memory buffers */ - HDfree(wbuf); - HDfree(rbuf); + free(wbuf); + free(rbuf); } /* test_select_hyper_union() */ /**************************************************************** @@ -5271,7 +5271,7 @@ test_select_hyper_union_stagger(void) CHECK(error, FAIL, "H5Fclose"); /* Initialize input buffer */ - HDmemset(data_out, 0, 7 * 7 * sizeof(int)); + memset(data_out, 0, 7 * 7 * sizeof(int)); /* Open file */ file_id = H5Fopen(FILENAME, H5F_ACC_RDONLY, H5P_DEFAULT); @@ -5316,10 +5316,10 @@ test_select_hyper_union_stagger(void) /* Verify input data */ for (i = 0; i < 8; i++) { if (data[input_loc[i][0]][input_loc[i][1]] != data_out[output_loc[i][0]][output_loc[i][1]]) { - HDprintf("input data #%d is wrong!\n", i); - HDprintf("input_loc=[%d][%d]\n", input_loc[i][0], input_loc[i][1]); - HDprintf("output_loc=[%d][%d]\n", output_loc[i][0], output_loc[i][1]); - HDprintf("data=%d\n", data[input_loc[i][0]][input_loc[i][1]]); + printf("input data #%d is wrong!\n", i); + printf("input_loc=[%d][%d]\n", input_loc[i][0], input_loc[i][1]); + printf("output_loc=[%d][%d]\n", output_loc[i][0], output_loc[i][1]); + printf("data=%d\n", data[input_loc[i][0]][input_loc[i][1]]); TestErrPrintf("data_out=%d\n", data_out[output_loc[i][0]][output_loc[i][1]]); } /* end if */ } /* end for */ @@ -5394,10 +5394,10 @@ test_select_hyper_union_3d(void) MESSAGE(5, ("Testing Hyperslab Selection Functions with unions of 3-D hyperslabs\n")); /* Allocate write & read buffers */ - wbuf = (uint8_t *)HDmalloc(sizeof(uint8_t) * SPACE4_DIM1 * SPACE4_DIM2 * SPACE4_DIM3); - CHECK_PTR(wbuf, "HDmalloc"); - rbuf = (uint8_t *)HDcalloc(sizeof(uint8_t), SPACE3_DIM1 * SPACE3_DIM2); - CHECK_PTR(rbuf, "HDcalloc"); + wbuf = (uint8_t *)malloc(sizeof(uint8_t) * SPACE4_DIM1 * SPACE4_DIM2 * SPACE4_DIM3); + CHECK_PTR(wbuf, "malloc"); + rbuf = (uint8_t *)calloc(sizeof(uint8_t), SPACE3_DIM1 * SPACE3_DIM2); + CHECK_PTR(rbuf, "calloc"); /* Initialize write buffer */ for (i = 0, tbuf = wbuf; i < SPACE4_DIM1; i++) @@ -5538,8 +5538,8 @@ test_select_hyper_union_3d(void) CHECK(ret, FAIL, "H5Fclose"); /* Free memory buffers */ - HDfree(wbuf); - HDfree(rbuf); + free(wbuf); + free(rbuf); } /* test_select_hyper_union_3d() */ /**************************************************************** @@ -5569,7 +5569,7 @@ test_select_hyper_valid_combination(void) /* Output message about test being performed */ MESSAGE(6, ("Testing Selection Combination Validity\n")); - HDassert(SPACE9_DIM2 >= POINT1_NPOINTS); + assert(SPACE9_DIM2 >= POINT1_NPOINTS); /* Create dataspace for single point selection */ single_pt_sid = H5Screate_simple(SPACE9_RANK, dims2D, NULL); @@ -5718,10 +5718,10 @@ test_select_hyper_and_2d(void) MESSAGE(5, ("Testing Hyperslab Selection Functions with intersection of 2-D hyperslabs\n")); /* Allocate write & read buffers */ - wbuf = (uint8_t *)HDmalloc(sizeof(uint8_t) * SPACE2_DIM1 * SPACE2_DIM2); - CHECK_PTR(wbuf, "HDmalloc"); - rbuf = (uint8_t *)HDcalloc(sizeof(uint8_t), (size_t)(SPACE2_DIM1 * SPACE2_DIM2)); - CHECK_PTR(rbuf, "HDcalloc"); + wbuf = (uint8_t *)malloc(sizeof(uint8_t) * SPACE2_DIM1 * SPACE2_DIM2); + CHECK_PTR(wbuf, "malloc"); + rbuf = (uint8_t *)calloc(sizeof(uint8_t), (size_t)(SPACE2_DIM1 * SPACE2_DIM2)); + CHECK_PTR(rbuf, "calloc"); /* Initialize write buffer */ for (i = 0, tbuf = wbuf; i < SPACE2_DIM1; i++) @@ -5795,14 +5795,14 @@ test_select_hyper_and_2d(void) for (j = 0; j < SPACE2_DIM2; j++, tbuf++) { if ((i >= 5 && i <= 9) && (j >= 5 && j <= 9)) { if (*tbuf != *tbuf2) - HDprintf("%d: hyperslab values don't match!, i=%d, j=%d, *tbuf=%d, *tbuf2=%d\n", __LINE__, - i, j, (int)*tbuf, (int)*tbuf2); + printf("%d: hyperslab values don't match!, i=%d, j=%d, *tbuf=%d, *tbuf2=%d\n", __LINE__, + i, j, (int)*tbuf, (int)*tbuf2); tbuf2++; } /* end if */ else { if (*tbuf != 0) - HDprintf("%d: hyperslab element has wrong value!, i=%d, j=%d, *tbuf=%d\n", __LINE__, i, j, - (int)*tbuf); + printf("%d: hyperslab element has wrong value!, i=%d, j=%d, *tbuf=%d\n", __LINE__, i, j, + (int)*tbuf); } /* end else */ } /* end for */ @@ -5823,8 +5823,8 @@ test_select_hyper_and_2d(void) CHECK(ret, FAIL, "H5Fclose"); /* Free memory buffers */ - HDfree(wbuf); - HDfree(rbuf); + free(wbuf); + free(rbuf); } /* test_select_hyper_and_2d() */ /**************************************************************** @@ -5857,10 +5857,10 @@ test_select_hyper_xor_2d(void) MESSAGE(5, ("Testing Hyperslab Selection Functions with XOR of 2-D hyperslabs\n")); /* Allocate write & read buffers */ - wbuf = (uint8_t *)HDmalloc(sizeof(uint8_t) * SPACE2_DIM1 * SPACE2_DIM2); - CHECK_PTR(wbuf, "HDmalloc"); - rbuf = (uint8_t *)HDcalloc(sizeof(uint8_t), (size_t)(SPACE2_DIM1 * SPACE2_DIM2)); - CHECK_PTR(rbuf, "HDcalloc"); + wbuf = (uint8_t *)malloc(sizeof(uint8_t) * SPACE2_DIM1 * SPACE2_DIM2); + CHECK_PTR(wbuf, "malloc"); + rbuf = (uint8_t *)calloc(sizeof(uint8_t), (size_t)(SPACE2_DIM1 * SPACE2_DIM2)); + CHECK_PTR(rbuf, "calloc"); /* Initialize write buffer */ for (i = 0, tbuf = wbuf; i < SPACE2_DIM1; i++) @@ -5936,14 +5936,14 @@ test_select_hyper_xor_2d(void) ((i >= 5 && i <= 9) && ((j >= 0 && j <= 4) || (j >= 10 && j <= 14))) || ((i >= 10 && i <= 14) && (j >= 5 && j <= 14))) { if (*tbuf != *tbuf2) - HDprintf("%d: hyperslab values don't match!, i=%d, j=%d, *tbuf=%d, *tbuf2=%d\n", __LINE__, - i, j, (int)*tbuf, (int)*tbuf2); + printf("%d: hyperslab values don't match!, i=%d, j=%d, *tbuf=%d, *tbuf2=%d\n", __LINE__, + i, j, (int)*tbuf, (int)*tbuf2); tbuf2++; } /* end if */ else { if (*tbuf != 0) - HDprintf("%d: hyperslab element has wrong value!, i=%d, j=%d, *tbuf=%d\n", __LINE__, i, j, - (int)*tbuf); + printf("%d: hyperslab element has wrong value!, i=%d, j=%d, *tbuf=%d\n", __LINE__, i, j, + (int)*tbuf); } /* end else */ } /* end for */ @@ -5964,8 +5964,8 @@ test_select_hyper_xor_2d(void) CHECK(ret, FAIL, "H5Fclose"); /* Free memory buffers */ - HDfree(wbuf); - HDfree(rbuf); + free(wbuf); + free(rbuf); } /* test_select_hyper_xor_2d() */ /**************************************************************** @@ -5998,10 +5998,10 @@ test_select_hyper_notb_2d(void) MESSAGE(5, ("Testing Hyperslab Selection Functions with NOTB of 2-D hyperslabs\n")); /* Allocate write & read buffers */ - wbuf = (uint8_t *)HDmalloc(sizeof(uint8_t) * SPACE2_DIM1 * SPACE2_DIM2); - CHECK_PTR(wbuf, "HDmalloc"); - rbuf = (uint8_t *)HDcalloc(sizeof(uint8_t), (size_t)(SPACE2_DIM1 * SPACE2_DIM2)); - CHECK_PTR(rbuf, "HDcalloc"); + wbuf = (uint8_t *)malloc(sizeof(uint8_t) * SPACE2_DIM1 * SPACE2_DIM2); + CHECK_PTR(wbuf, "malloc"); + rbuf = (uint8_t *)calloc(sizeof(uint8_t), (size_t)(SPACE2_DIM1 * SPACE2_DIM2)); + CHECK_PTR(rbuf, "calloc"); /* Initialize write buffer */ for (i = 0, tbuf = wbuf; i < SPACE2_DIM1; i++) @@ -6075,14 +6075,14 @@ test_select_hyper_notb_2d(void) for (j = 0; j < SPACE2_DIM2; j++, tbuf++) { if (((i >= 0 && i <= 4) && (j >= 0 && j <= 9)) || ((i >= 5 && i <= 9) && (j >= 0 && j <= 4))) { if (*tbuf != *tbuf2) - HDprintf("%d: hyperslab values don't match!, i=%d, j=%d, *tbuf=%d, *tbuf2=%d\n", __LINE__, - i, j, (int)*tbuf, (int)*tbuf2); + printf("%d: hyperslab values don't match!, i=%d, j=%d, *tbuf=%d, *tbuf2=%d\n", __LINE__, + i, j, (int)*tbuf, (int)*tbuf2); tbuf2++; } /* end if */ else { if (*tbuf != 0) - HDprintf("%d: hyperslab element has wrong value!, i=%d, j=%d, *tbuf=%d\n", __LINE__, i, j, - (int)*tbuf); + printf("%d: hyperslab element has wrong value!, i=%d, j=%d, *tbuf=%d\n", __LINE__, i, j, + (int)*tbuf); } /* end else */ } /* end for */ @@ -6103,8 +6103,8 @@ test_select_hyper_notb_2d(void) CHECK(ret, FAIL, "H5Fclose"); /* Free memory buffers */ - HDfree(wbuf); - HDfree(rbuf); + free(wbuf); + free(rbuf); } /* test_select_hyper_notb_2d() */ /**************************************************************** @@ -6137,10 +6137,10 @@ test_select_hyper_nota_2d(void) MESSAGE(5, ("Testing Hyperslab Selection Functions with NOTA of 2-D hyperslabs\n")); /* Allocate write & read buffers */ - wbuf = (uint8_t *)HDmalloc(sizeof(uint8_t) * SPACE2_DIM1 * SPACE2_DIM2); - CHECK_PTR(wbuf, "HDmalloc"); - rbuf = (uint8_t *)HDcalloc(sizeof(uint8_t), (size_t)(SPACE2_DIM1 * SPACE2_DIM2)); - CHECK_PTR(rbuf, "HDcalloc"); + wbuf = (uint8_t *)malloc(sizeof(uint8_t) * SPACE2_DIM1 * SPACE2_DIM2); + CHECK_PTR(wbuf, "malloc"); + rbuf = (uint8_t *)calloc(sizeof(uint8_t), (size_t)(SPACE2_DIM1 * SPACE2_DIM2)); + CHECK_PTR(rbuf, "calloc"); /* Initialize write buffer */ for (i = 0, tbuf = wbuf; i < SPACE2_DIM1; i++) @@ -6243,8 +6243,8 @@ test_select_hyper_nota_2d(void) CHECK(ret, FAIL, "H5Fclose"); /* Free memory buffers */ - HDfree(wbuf); - HDfree(rbuf); + free(wbuf); + free(rbuf); } /* test_select_hyper_nota_2d() */ /**************************************************************** @@ -6262,14 +6262,14 @@ test_select_hyper_iter2(void *_elem, hid_t H5_ATTR_UNUSED type_id, unsigned ndim if (*tbuf != **tbuf2) { TestErrPrintf("Error in hyperslab iteration!\n"); - HDprintf("location: { "); + printf("location: { "); for (u = 0; u < ndim; u++) { - HDprintf("%2d", (int)point[u]); + printf("%2d", (int)point[u]); if (u < (ndim - 1)) - HDprintf(", "); + printf(", "); } /* end for */ - HDprintf("}\n"); - HDprintf("*tbuf=%d, **tbuf2=%d\n", *tbuf, **tbuf2); + printf("}\n"); + printf("*tbuf=%d, **tbuf2=%d\n", *tbuf, **tbuf2); return (-1); } /* end if */ else { @@ -6308,11 +6308,11 @@ test_select_hyper_union_random_5d(hid_t read_plist) MESSAGE(5, ("Testing Hyperslab Selection Functions with random unions of 5-D hyperslabs\n")); /* Allocate write & read buffers */ - wbuf = (int *)HDmalloc(sizeof(int) * SPACE5_DIM1 * SPACE5_DIM2 * SPACE5_DIM3 * SPACE5_DIM4 * SPACE5_DIM5); - CHECK_PTR(wbuf, "HDmalloc"); - rbuf = (int *)HDcalloc(sizeof(int), - (size_t)(SPACE5_DIM1 * SPACE5_DIM2 * SPACE5_DIM3 * SPACE5_DIM4 * SPACE5_DIM5)); - CHECK_PTR(rbuf, "HDcalloc"); + wbuf = (int *)malloc(sizeof(int) * SPACE5_DIM1 * SPACE5_DIM2 * SPACE5_DIM3 * SPACE5_DIM4 * SPACE5_DIM5); + CHECK_PTR(wbuf, "malloc"); + rbuf = (int *)calloc(sizeof(int), + (size_t)(SPACE5_DIM1 * SPACE5_DIM2 * SPACE5_DIM3 * SPACE5_DIM4 * SPACE5_DIM5)); + CHECK_PTR(rbuf, "calloc"); /* Initialize write buffer */ for (i = 0, tbuf = wbuf; i < SPACE5_DIM1; i++) @@ -6401,7 +6401,7 @@ test_select_hyper_union_random_5d(hid_t read_plist) } /* end if */ /* Set the read buffer back to all zeroes */ - HDmemset(rbuf, 0, (size_t)SPACE6_DIM1); + memset(rbuf, 0, (size_t)SPACE6_DIM1); } /* end for */ /* Close memory dataspace */ @@ -6421,8 +6421,8 @@ test_select_hyper_union_random_5d(hid_t read_plist) CHECK(ret, FAIL, "H5Fclose"); /* Free memory buffers */ - HDfree(wbuf); - HDfree(rbuf); + free(wbuf); + free(rbuf); } /* test_select_hyper_union_random_5d() */ /**************************************************************** @@ -6463,10 +6463,10 @@ test_select_hyper_chunk(hid_t fapl_plist, hid_t xfer_plist) MESSAGE(5, ("Testing Hyperslab I/O on Large Chunks\n")); /* Allocate the transfer buffers */ - data = (short *)HDmalloc(sizeof(short) * X * Y * Z); - CHECK_PTR(data, "HDmalloc"); - data_out = (short *)HDcalloc((size_t)(NX * NY * NZ), sizeof(short)); - CHECK_PTR(data_out, "HDcalloc"); + data = (short *)malloc(sizeof(short) * X * Y * Z); + CHECK_PTR(data, "malloc"); + data_out = (short *)calloc((size_t)(NX * NY * NZ), sizeof(short)); + CHECK_PTR(data_out, "calloc"); /* * Data buffer initialization. @@ -6647,8 +6647,8 @@ test_select_hyper_chunk(hid_t fapl_plist, hid_t xfer_plist) CHECK(status, FAIL, "H5Sclose"); status = H5Fclose(file); CHECK(status, FAIL, "H5Fclose"); - HDfree(data); - HDfree(data_out); + free(data); + free(data_out); } /* test_select_hyper_chunk() */ /**************************************************************** @@ -6689,10 +6689,10 @@ test_select_point_chunk(void) MESSAGE(5, ("Testing Point Selections on Chunked Datasets\n")); /* Allocate the transfer buffers */ - data = (unsigned *)HDmalloc(sizeof(unsigned) * SPACE7_DIM1 * SPACE7_DIM2); - CHECK_PTR(data, "HDmalloc"); - data_out = (unsigned *)HDcalloc((size_t)(SPACE7_DIM1 * SPACE7_DIM2), sizeof(unsigned)); - CHECK_PTR(data_out, "HDcalloc"); + data = (unsigned *)malloc(sizeof(unsigned) * SPACE7_DIM1 * SPACE7_DIM2); + CHECK_PTR(data, "malloc"); + data_out = (unsigned *)calloc((size_t)(SPACE7_DIM1 * SPACE7_DIM2), sizeof(unsigned)); + CHECK_PTR(data_out, "calloc"); /* * Data buffer initialization. @@ -6845,8 +6845,8 @@ test_select_point_chunk(void) ret = H5Fclose(file); CHECK(ret, FAIL, "H5Fclose"); - HDfree(data); - HDfree(data_out); + free(data); + free(data_out); } /* test_select_point_chunk() */ /**************************************************************** @@ -7133,7 +7133,7 @@ test_select_combine(void) VERIFY(nblocks, 1, "H5Sget_select_hyper_nblocks"); /* Retrieve the block defined */ - HDmemset(blocks, -1, sizeof(blocks)); /* Reset block list */ + memset(blocks, -1, sizeof(blocks)); /* Reset block list */ error = H5Sget_select_hyper_blocklist(space1, (hsize_t)0, (hsize_t)nblocks, (hsize_t *)blocks); CHECK(error, FAIL, "H5Sget_select_hyper_blocklist"); @@ -7168,7 +7168,7 @@ test_select_combine(void) VERIFY(nblocks, 2, "H5Sget_select_hyper_nblocks"); /* Retrieve the block defined */ - HDmemset(blocks, -1, sizeof(blocks)); /* Reset block list */ + memset(blocks, -1, sizeof(blocks)); /* Reset block list */ error = H5Sget_select_hyper_blocklist(space1, (hsize_t)0, (hsize_t)nblocks, (hsize_t *)blocks); CHECK(error, FAIL, "H5Sget_select_hyper_blocklist"); @@ -7207,7 +7207,7 @@ test_select_combine(void) VERIFY(nblocks, 2, "H5Sget_select_hyper_nblocks"); /* Retrieve the block defined */ - HDmemset(blocks, -1, sizeof(blocks)); /* Reset block list */ + memset(blocks, -1, sizeof(blocks)); /* Reset block list */ error = H5Sget_select_hyper_blocklist(space1, (hsize_t)0, (hsize_t)nblocks, (hsize_t *)blocks); CHECK(error, FAIL, "H5Sget_select_hyper_blocklist"); @@ -7266,7 +7266,7 @@ test_select_combine(void) VERIFY(nblocks, 1, "H5Sget_select_hyper_nblocks"); /* Retrieve the block defined */ - HDmemset(blocks, -1, sizeof(blocks)); /* Reset block list */ + memset(blocks, -1, sizeof(blocks)); /* Reset block list */ error = H5Sget_select_hyper_blocklist(space1, (hsize_t)0, (hsize_t)nblocks, (hsize_t *)blocks); CHECK(error, FAIL, "H5Sget_select_hyper_blocklist"); @@ -7321,7 +7321,7 @@ test_select_combine(void) VERIFY(nblocks, 1, "H5Sget_select_hyper_nblocks"); /* Retrieve the block defined */ - HDmemset(blocks, -1, sizeof(blocks)); /* Reset block list */ + memset(blocks, -1, sizeof(blocks)); /* Reset block list */ error = H5Sget_select_hyper_blocklist(space1, (hsize_t)0, (hsize_t)nblocks, (hsize_t *)blocks); CHECK(error, FAIL, "H5Sget_select_hyper_blocklist"); @@ -7376,7 +7376,7 @@ test_select_combine(void) VERIFY(nblocks, 1, "H5Sget_select_hyper_nblocks"); /* Retrieve the block defined */ - HDmemset(blocks, -1, sizeof(blocks)); /* Reset block list */ + memset(blocks, -1, sizeof(blocks)); /* Reset block list */ error = H5Sget_select_hyper_blocklist(space1, (hsize_t)0, (hsize_t)nblocks, (hsize_t *)blocks); CHECK(error, FAIL, "H5Sget_select_hyper_blocklist"); @@ -7468,8 +7468,8 @@ test_select_fill_all(void) MESSAGE(5, ("Testing Filling 'all' Selections\n")); /* Allocate memory buffer */ - wbuf = (unsigned *)HDmalloc(sizeof(unsigned) * SPACE7_DIM1 * SPACE7_DIM2); - CHECK_PTR(wbuf, "HDmalloc"); + wbuf = (unsigned *)malloc(sizeof(unsigned) * SPACE7_DIM1 * SPACE7_DIM2); + CHECK_PTR(wbuf, "malloc"); /* Initialize memory buffer */ for (u = 0, tbuf = wbuf; u < SPACE7_DIM1; u++) @@ -7516,7 +7516,7 @@ test_select_fill_all(void) CHECK(ret, FAIL, "H5Sclose"); /* Free memory buffers */ - HDfree(wbuf); + free(wbuf); } /* test_select_fill_all() */ /**************************************************************** @@ -7544,8 +7544,8 @@ test_select_fill_point(hssize_t *offset) MESSAGE(5, ("Testing Filling 'point' Selections\n")); /* Allocate memory buffer */ - wbuf = (unsigned *)HDmalloc(sizeof(unsigned) * SPACE7_DIM1 * SPACE7_DIM2); - CHECK_PTR(wbuf, "HDmalloc"); + wbuf = (unsigned *)malloc(sizeof(unsigned) * SPACE7_DIM1 * SPACE7_DIM2); + CHECK_PTR(wbuf, "malloc"); /* Initialize memory buffer */ for (u = 0, tbuf = wbuf; u < SPACE7_DIM1; u++) @@ -7561,14 +7561,14 @@ test_select_fill_point(hssize_t *offset) CHECK(ret, FAIL, "H5Sselect_elements"); if (offset != NULL) { - HDmemcpy(real_offset, offset, SPACE7_RANK * sizeof(hssize_t)); + memcpy(real_offset, offset, SPACE7_RANK * sizeof(hssize_t)); /* Set offset, if provided */ ret = H5Soffset_simple(sid1, real_offset); CHECK(ret, FAIL, "H5Soffset_simple"); } /* end if */ else - HDmemset(real_offset, 0, SPACE7_RANK * sizeof(hssize_t)); + memset(real_offset, 0, SPACE7_RANK * sizeof(hssize_t)); /* Set fill value */ fill_value = SPACE7_FILL; @@ -7614,7 +7614,7 @@ test_select_fill_point(hssize_t *offset) CHECK(ret, FAIL, "H5Sclose"); /* Free memory buffers */ - HDfree(wbuf); + free(wbuf); } /* test_select_fill_point() */ /**************************************************************** @@ -7644,8 +7644,8 @@ test_select_fill_hyper_simple(hssize_t *offset) MESSAGE(5, ("Testing Filling Simple 'hyperslab' Selections\n")); /* Allocate memory buffer */ - wbuf = (unsigned *)HDmalloc(sizeof(unsigned) * SPACE7_DIM1 * SPACE7_DIM2); - CHECK_PTR(wbuf, "HDmalloc"); + wbuf = (unsigned *)malloc(sizeof(unsigned) * SPACE7_DIM1 * SPACE7_DIM2); + CHECK_PTR(wbuf, "malloc"); /* Initialize memory buffer */ for (u = 0, tbuf = wbuf; u < SPACE7_DIM1; u++) @@ -7665,14 +7665,14 @@ test_select_fill_hyper_simple(hssize_t *offset) CHECK(ret, FAIL, "H5Sselect_hyperslab"); if (offset != NULL) { - HDmemcpy(real_offset, offset, SPACE7_RANK * sizeof(hssize_t)); + memcpy(real_offset, offset, SPACE7_RANK * sizeof(hssize_t)); /* Set offset, if provided */ ret = H5Soffset_simple(sid1, real_offset); CHECK(ret, FAIL, "H5Soffset_simple"); } /* end if */ else - HDmemset(real_offset, 0, SPACE7_RANK * sizeof(hssize_t)); + memset(real_offset, 0, SPACE7_RANK * sizeof(hssize_t)); /* Set fill value */ fill_value = SPACE7_FILL; @@ -7720,7 +7720,7 @@ test_select_fill_hyper_simple(hssize_t *offset) CHECK(ret, FAIL, "H5Sclose"); /* Free memory buffers */ - HDfree(wbuf); + free(wbuf); } /* test_select_fill_hyper_simple() */ /**************************************************************** @@ -7755,8 +7755,8 @@ test_select_fill_hyper_regular(hssize_t *offset) MESSAGE(5, ("Testing Filling Regular 'hyperslab' Selections\n")); /* Allocate memory buffer */ - wbuf = (unsigned *)HDmalloc(sizeof(unsigned) * SPACE7_DIM1 * SPACE7_DIM2); - CHECK_PTR(wbuf, "HDmalloc"); + wbuf = (unsigned *)malloc(sizeof(unsigned) * SPACE7_DIM1 * SPACE7_DIM2); + CHECK_PTR(wbuf, "malloc"); /* Initialize memory buffer */ for (u = 0, tbuf = wbuf; u < SPACE7_DIM1; u++) @@ -7780,14 +7780,14 @@ test_select_fill_hyper_regular(hssize_t *offset) CHECK(ret, FAIL, "H5Sselect_hyperslab"); if (offset != NULL) { - HDmemcpy(real_offset, offset, SPACE7_RANK * sizeof(hssize_t)); + memcpy(real_offset, offset, SPACE7_RANK * sizeof(hssize_t)); /* Set offset, if provided */ ret = H5Soffset_simple(sid1, real_offset); CHECK(ret, FAIL, "H5Soffset_simple"); } /* end if */ else - HDmemset(real_offset, 0, SPACE7_RANK * sizeof(hssize_t)); + memset(real_offset, 0, SPACE7_RANK * sizeof(hssize_t)); /* Set fill value */ fill_value = SPACE7_FILL; @@ -7833,7 +7833,7 @@ test_select_fill_hyper_regular(hssize_t *offset) CHECK(ret, FAIL, "H5Sclose"); /* Free memory buffers */ - HDfree(wbuf); + free(wbuf); } /* test_select_fill_hyper_regular() */ /**************************************************************** @@ -7875,8 +7875,8 @@ test_select_fill_hyper_irregular(hssize_t *offset) MESSAGE(5, ("Testing Filling Irregular 'hyperslab' Selections\n")); /* Allocate memory buffer */ - wbuf = (unsigned *)HDmalloc(sizeof(unsigned) * SPACE7_DIM1 * SPACE7_DIM2); - CHECK_PTR(wbuf, "HDmalloc"); + wbuf = (unsigned *)malloc(sizeof(unsigned) * SPACE7_DIM1 * SPACE7_DIM2); + CHECK_PTR(wbuf, "malloc"); /* Initialize memory buffer */ for (u = 0, tbuf = wbuf; u < SPACE7_DIM1; u++) @@ -7904,14 +7904,14 @@ test_select_fill_hyper_irregular(hssize_t *offset) CHECK(ret, FAIL, "H5Sselect_hyperslab"); if (offset != NULL) { - HDmemcpy(real_offset, offset, SPACE7_RANK * sizeof(hssize_t)); + memcpy(real_offset, offset, SPACE7_RANK * sizeof(hssize_t)); /* Set offset, if provided */ ret = H5Soffset_simple(sid1, real_offset); CHECK(ret, FAIL, "H5Soffset_simple"); } /* end if */ else - HDmemset(real_offset, 0, SPACE7_RANK * sizeof(hssize_t)); + memset(real_offset, 0, SPACE7_RANK * sizeof(hssize_t)); /* Set fill value */ fill_value = SPACE7_FILL; @@ -7957,7 +7957,7 @@ test_select_fill_hyper_irregular(hssize_t *offset) CHECK(ret, FAIL, "H5Sclose"); /* Free memory buffers */ - HDfree(wbuf); + free(wbuf); } /* test_select_fill_hyper_irregular() */ /**************************************************************** @@ -7984,10 +7984,10 @@ test_select_none(void) MESSAGE(5, ("Testing I/O on 0-sized Selections\n")); /* Allocate write & read buffers */ - wbuf = (uint8_t *)HDmalloc(sizeof(uint8_t) * SPACE7_DIM1 * SPACE7_DIM2); - CHECK_PTR(wbuf, "HDmalloc"); - rbuf = (uint8_t *)HDcalloc(sizeof(uint8_t), SPACE7_DIM1 * SPACE7_DIM2); - CHECK_PTR(rbuf, "HDcalloc"); + wbuf = (uint8_t *)malloc(sizeof(uint8_t) * SPACE7_DIM1 * SPACE7_DIM2); + CHECK_PTR(wbuf, "malloc"); + rbuf = (uint8_t *)calloc(sizeof(uint8_t), SPACE7_DIM1 * SPACE7_DIM2); + CHECK_PTR(rbuf, "calloc"); /* Initialize write buffer */ for (i = 0, tbuf = wbuf; i < SPACE7_DIM1; i++) @@ -8054,8 +8054,8 @@ test_select_none(void) CHECK(ret, FAIL, "H5Fclose"); /* Free memory buffers */ - HDfree(wbuf); - HDfree(rbuf); + free(wbuf); + free(rbuf); } /* test_select_none() */ /**************************************************************** @@ -8087,10 +8087,10 @@ test_scalar_select(void) MESSAGE(5, ("Testing I/O on Selections in Scalar Dataspaces\n")); /* Allocate write & read buffers */ - wbuf_uint8 = (uint8_t *)HDmalloc(sizeof(uint8_t) * SPACE7_DIM1 * SPACE7_DIM2); - CHECK_PTR(wbuf_uint8, "HDmalloc"); - wbuf_ushort = (unsigned short *)HDmalloc(sizeof(unsigned short) * SPACE7_DIM1 * SPACE7_DIM2); - CHECK_PTR(wbuf_ushort, "HDmalloc"); + wbuf_uint8 = (uint8_t *)malloc(sizeof(uint8_t) * SPACE7_DIM1 * SPACE7_DIM2); + CHECK_PTR(wbuf_uint8, "malloc"); + wbuf_ushort = (unsigned short *)malloc(sizeof(unsigned short) * SPACE7_DIM1 * SPACE7_DIM2); + CHECK_PTR(wbuf_ushort, "malloc"); /* Initialize write buffers */ for (i = 0, tbuf_uint8 = wbuf_uint8, tbuf_ushort = wbuf_ushort; i < SPACE7_DIM1; i++) @@ -8213,8 +8213,8 @@ test_scalar_select(void) CHECK(ret, FAIL, "H5Fclose"); /* Free memory buffers */ - HDfree(wbuf_uint8); - HDfree(wbuf_ushort); + free(wbuf_uint8); + free(wbuf_ushort); } /* test_scalar_select() */ /**************************************************************** @@ -8459,7 +8459,7 @@ test_shape_same(void) /* Output message about test being performed */ MESSAGE(6, ("Testing Same Shape Comparisons\n")); - HDassert(SPACE9_DIM2 >= POINT1_NPOINTS); + assert(SPACE9_DIM2 >= POINT1_NPOINTS); /* Create dataspace for "all" selection */ all_sid = H5Screate_simple(SPACE9_RANK, dims, NULL); @@ -10912,13 +10912,13 @@ test_shape_same_dr__full_space_vs_slice(int test_num, int small_rank, int large_ htri_t check; /* Shape comparison return value */ herr_t ret; /* Generic return value */ - HDassert(0 < small_rank); - HDassert(small_rank <= large_rank); - HDassert(large_rank <= SS_DR_MAX_RANK); - HDassert(0 <= offset); - HDassert(offset < large_rank); - HDassert(edge_size > 0); - HDassert(edge_size <= 1000); + assert(0 < small_rank); + assert(small_rank <= large_rank); + assert(large_rank <= SS_DR_MAX_RANK); + assert(0 <= offset); + assert(offset < large_rank); + assert(edge_size > 0); + assert(edge_size <= 1000); HDsnprintf(test_desc_0, sizeof(test_desc_0), "\tn-cube slice through m-cube (n <= m) test %d.\n", test_num); @@ -10970,7 +10970,7 @@ test_shape_same_dr__full_space_vs_slice(int test_num, int small_rank, int large_ */ i = SS_DR_MAX_RANK - large_rank; - HDassert(i >= 0); + assert(i >= 0); start_ptr = &(start[i]); stride_ptr = &(stride[i]); @@ -11164,21 +11164,21 @@ test_shape_same_dr__checkerboard(int test_num, int small_rank, int large_rank, i htri_t check; /* Shape comparison return value */ herr_t ret; /* Generic return value */ - HDassert(0 < small_rank); - HDassert(small_rank <= large_rank); - HDassert(large_rank <= SS_DR_MAX_RANK); - HDassert(0 < checker_size); - HDassert(checker_size <= edge_size); - HDassert(edge_size <= 1000); - HDassert(0 <= offset); - HDassert(offset < (int)edge_size); + assert(0 < small_rank); + assert(small_rank <= large_rank); + assert(large_rank <= SS_DR_MAX_RANK); + assert(0 < checker_size); + assert(checker_size <= edge_size); + assert(edge_size <= 1000); + assert(0 <= offset); + assert(offset < (int)edge_size); for (i = SS_DR_MAX_RANK - large_rank; i < SS_DR_MAX_RANK; i++) if (dim_selected[i] == TRUE) dims_selected++; - HDassert(dims_selected >= 0); - HDassert(dims_selected <= large_rank); + assert(dims_selected >= 0); + assert(dims_selected <= large_rank); HDsnprintf(test_desc_0, sizeof(test_desc_0), "\tcheckerboard n-cube slice through m-cube (n <= m) test %d.\n", test_num); @@ -11367,7 +11367,7 @@ test_shape_same_dr__checkerboard(int test_num, int small_rank, int large_rank, i */ i = SS_DR_MAX_RANK - large_rank; - HDassert(i >= 0); + assert(i >= 0); start_ptr = &(start[i]); stride_ptr = &(stride[i]); @@ -11708,22 +11708,22 @@ test_shape_same_dr__irregular(int test_num, int small_rank, int large_rank, int htri_t check; /* Shape comparison return value */ herr_t ret; /* Generic return value */ - HDassert(0 < small_rank); - HDassert(small_rank <= large_rank); - HDassert(large_rank <= SS_DR_MAX_RANK); - HDassert(9 <= edge_size); - HDassert(edge_size <= 1000); - HDassert(0 <= slice_offset); - HDassert(slice_offset < edge_size); - HDassert(-2 <= pattern_offset); - HDassert(pattern_offset <= 2); + assert(0 < small_rank); + assert(small_rank <= large_rank); + assert(large_rank <= SS_DR_MAX_RANK); + assert(9 <= edge_size); + assert(edge_size <= 1000); + assert(0 <= slice_offset); + assert(slice_offset < edge_size); + assert(-2 <= pattern_offset); + assert(pattern_offset <= 2); for (i = SS_DR_MAX_RANK - large_rank; i < SS_DR_MAX_RANK; i++) if (dim_selected[i] == TRUE) dims_selected++; - HDassert(dims_selected >= 0); - HDassert(dims_selected <= large_rank); + assert(dims_selected >= 0); + assert(dims_selected <= large_rank); HDsnprintf(test_desc_0, sizeof(test_desc_0), "\tirregular sub set of n-cube slice through m-cube (n <= m) test %d.\n", test_num); @@ -11821,7 +11821,7 @@ test_shape_same_dr__irregular(int test_num, int small_rank, int large_rank, int */ i = SS_DR_MAX_RANK - large_rank; - HDassert(i >= 0); + assert(i >= 0); start_ptr = &(start[i]); stride_ptr = &(stride[i]); @@ -13592,10 +13592,10 @@ test_select_hyper_chunk_offset(void) MESSAGE(6, ("Testing hyperslab selections using offsets in chunked datasets\n")); /* Allocate buffers */ - wbuf = (int *)HDmalloc(sizeof(int) * SPACE10_DIM1); - CHECK_PTR(wbuf, "HDmalloc"); - rbuf = (int *)HDcalloc(sizeof(int), SPACE10_DIM1); - CHECK_PTR(rbuf, "HDcalloc"); + wbuf = (int *)malloc(sizeof(int) * SPACE10_DIM1); + CHECK_PTR(wbuf, "malloc"); + rbuf = (int *)calloc(sizeof(int), SPACE10_DIM1); + CHECK_PTR(rbuf, "calloc"); /* Initialize the write buffer */ for (i = 0; i < SPACE10_DIM1; i++) @@ -13775,8 +13775,8 @@ test_select_hyper_chunk_offset(void) CHECK(ret, FAIL, "H5Fclose"); /* Free the buffers */ - HDfree(wbuf); - HDfree(rbuf); + free(wbuf); + free(rbuf); } /* test_select_hyper_chunk_offset() */ #endif /**************************************************************** @@ -14327,14 +14327,14 @@ test_hyper_unlim_check(hid_t sid, hsize_t *dims, hssize_t endpoints, hssize_t en hsize_t blocklist[12]; herr_t ret; - HDassert(enblocks <= 2); + assert(enblocks <= 2); /* Copy sid to lim_sid */ lim_sid = H5Scopy(sid); CHECK(lim_sid, FAIL, "H5Scopy"); /* "And" lim_sid with dims to create limited selection */ - HDmemset(start, 0, sizeof(start)); + memset(start, 0, sizeof(start)); ret = H5Sselect_hyperslab(lim_sid, H5S_SELECT_AND, start, NULL, dims, NULL); CHECK(ret, FAIL, "H5Sselect_hyperslab"); @@ -14361,18 +14361,18 @@ test_hyper_unlim_check(hid_t sid, hsize_t *dims, hssize_t endpoints, hssize_t en /* Verify blocklist */ if (nblocks == (hssize_t)1) { - if (HDmemcmp(blocklist, eblock1, 6 * sizeof(eblock1[0])) != 0) + if (memcmp(blocklist, eblock1, 6 * sizeof(eblock1[0])) != 0) ERROR("H5Sget_select_hyper_blocklist"); } /* end if */ else { - HDassert(nblocks == (hssize_t)2); - if (HDmemcmp(blocklist, eblock1, 6 * sizeof(eblock1[0])) != 0) { - if (HDmemcmp(blocklist, eblock2, 6 * sizeof(eblock2[0])) != 0) + assert(nblocks == (hssize_t)2); + if (memcmp(blocklist, eblock1, 6 * sizeof(eblock1[0])) != 0) { + if (memcmp(blocklist, eblock2, 6 * sizeof(eblock2[0])) != 0) ERROR("H5Sget_select_hyper_blocklist"); - if (HDmemcmp(&blocklist[6], eblock1, 6 * sizeof(eblock1[0])) != 0) + if (memcmp(&blocklist[6], eblock1, 6 * sizeof(eblock1[0])) != 0) ERROR("H5Sget_select_hyper_blocklist"); } /* end if */ - else if (HDmemcmp(&blocklist[6], eblock2, 6 * sizeof(eblock2[0])) != 0) + else if (memcmp(&blocklist[6], eblock2, 6 * sizeof(eblock2[0])) != 0) ERROR("H5Sget_select_hyper_blocklist"); } /* end else */ } /* end if */ @@ -14795,7 +14795,7 @@ test_internal_consistency(void) /* Output message about test being performed */ MESSAGE(6, ("Testing Consistency of Internal States\n")); - HDassert(SPACE9_DIM2 >= POINT1_NPOINTS); + assert(SPACE9_DIM2 >= POINT1_NPOINTS); /* Create dataspace for "all" selection */ all_sid = H5Screate_simple(SPACE9_RANK, dims, NULL); @@ -15144,7 +15144,7 @@ test_irreg_io(void) CHECK(ret, FAIL, "H5Sselect_hyperslab"); /* Reset the buffer */ - HDmemset(rbuf, 0, sizeof(rbuf)); + memset(rbuf, 0, sizeof(rbuf)); /* Read selection from disk */ ret = H5Dread(did, H5T_NATIVE_UCHAR, mem_sid, sid, H5P_DEFAULT, rbuf); @@ -15362,7 +15362,7 @@ test_sel_iter(void) case H5S_SEL_ERROR: case H5S_SEL_N: default: - HDassert(0 && "Can't occur"); + assert(0 && "Can't occur"); break; } /* end switch */ @@ -15410,7 +15410,7 @@ test_sel_iter(void) case H5S_SEL_ERROR: case H5S_SEL_N: default: - HDassert(0 && "Can't occur"); + assert(0 && "Can't occur"); break; } /* end switch */ @@ -15481,7 +15481,7 @@ test_sel_iter(void) case H5S_SEL_ERROR: case H5S_SEL_N: default: - HDassert(0 && "Can't occur"); + assert(0 && "Can't occur"); break; } /* end switch */ @@ -15529,7 +15529,7 @@ test_sel_iter(void) case H5S_SEL_ERROR: case H5S_SEL_N: default: - HDassert(0 && "Can't occur"); + assert(0 && "Can't occur"); break; } /* end switch */ @@ -15567,7 +15567,7 @@ test_sel_iter(void) case H5S_SEL_ERROR: case H5S_SEL_N: default: - HDassert(0 && "Can't occur"); + assert(0 && "Can't occur"); break; } /* end switch */ @@ -16148,7 +16148,7 @@ test_select(void) test_select_hyper_contig_dr(H5T_STD_U16BE, H5P_DEFAULT); test_select_hyper_contig_dr(H5T_STD_U16BE, plist_id); #else - HDprintf("** SKIPPED a test due to file creation issues\n"); + printf("** SKIPPED a test due to file creation issues\n"); #endif #if 0 test_select_hyper_checker_board_dr(H5T_STD_U16LE, H5P_DEFAULT); @@ -16156,7 +16156,7 @@ test_select(void) test_select_hyper_checker_board_dr(H5T_STD_U16BE, H5P_DEFAULT); test_select_hyper_checker_board_dr(H5T_STD_U16BE, plist_id); #else - HDprintf("** SKIPPED a test due to assertion in HDF5\n"); + printf("** SKIPPED a test due to assertion in HDF5\n"); #endif test_select_hyper_copy(); /* Test hyperslab selection copying code */ test_select_point_copy(); /* Test point selection copying code */ @@ -16261,7 +16261,7 @@ test_select(void) test_select_hyper_chunk_offset(); test_select_hyper_chunk_offset2(); #else - HDprintf("** SKIPPED a test due to assertion in HDF5\n"); + printf("** SKIPPED a test due to assertion in HDF5\n"); #endif /* Test selection bounds with & without offsets */ diff --git a/test/API/ttime.c b/test/API/ttime.c index 74128fd..7735aad 100644 --- a/test/API/ttime.c +++ b/test/API/ttime.c @@ -176,13 +176,13 @@ test_time_io(void) tid = H5Dget_type(dsid); CHECK(tid, FAIL, "H5Dget_type"); if (H5Tget_class(tid) == H5T_TIME) - HDfprintf(stderr, "datatype class is H5T_TIME\n"); + fprintf(stderr, "datatype class is H5T_TIME\n"); status = H5Tclose(tid); CHECK(status, FAIL, "H5Tclose"); status = H5Dread(dsid, H5T_UNIX_D32LE, H5S_ALL, H5S_ALL, H5P_DEFAULT, &timethen); CHECK(status, FAIL, "H5Dread"); - HDfprintf(stderr, "time written was: %s\n", HDctime(&timethen)); + fprintf(stderr, "time written was: %s\n", HDctime(&timethen)); status = H5Dclose(dsid); CHECK(status, FAIL, "H5Dclose"); diff --git a/test/API/tunicode.c b/test/API/tunicode.c index fa59456..93e28e3 100644 --- a/test/API/tunicode.c +++ b/test/API/tunicode.c @@ -152,7 +152,7 @@ test_strpad(hid_t H5_ATTR_UNUSED fid, const char *string) /* Create a src_type that holds the UTF-8 string and its final NULL */ big_len = length + 1; /* +1 byte for final NULL */ - HDassert((2 * big_len) <= sizeof(cmpbuf)); + assert((2 * big_len) <= sizeof(cmpbuf)); src_type = mkstr(big_len, H5T_STR_NULLTERM); CHECK(src_type, FAIL, "mkstr"); /* Create a dst_type that holds half of the UTF-8 string and a final @@ -180,7 +180,7 @@ test_strpad(hid_t H5_ATTR_UNUSED fid, const char *string) cmpbuf[2 * small_len - 1] = '\0'; HDstrcpy(&cmpbuf[2 * small_len], new_string); - VERIFY(HDmemcmp(buf, cmpbuf, 2 * big_len), 0, "HDmemcmp"); + VERIFY(memcmp(buf, cmpbuf, 2 * big_len), 0, "memcmp"); /* Now convert from smaller datatype to bigger datatype. This should * leave our buffer looking like: "abc\0\0\0\0\0abc\0\0\0\0\0" */ @@ -188,12 +188,12 @@ test_strpad(hid_t H5_ATTR_UNUSED fid, const char *string) CHECK(ret, FAIL, "H5Tconvert"); /* First fill the buffer with NULLs */ - HDmemset(cmpbuf, '\0', (size_t)LONG_BUF_SIZE); + memset(cmpbuf, '\0', (size_t)LONG_BUF_SIZE); /* Copy in the characters */ HDstrncpy(cmpbuf, new_string, small_len - 1); HDstrncpy(&cmpbuf[big_len], new_string, small_len - 1); - VERIFY(HDmemcmp(buf, cmpbuf, 2 * big_len), 0, "HDmemcmp"); + VERIFY(memcmp(buf, cmpbuf, 2 * big_len), 0, "memcmp"); ret = H5Tclose(src_type); CHECK(ret, FAIL, "H5Tclose"); @@ -215,7 +215,7 @@ test_strpad(hid_t H5_ATTR_UNUSED fid, const char *string) /* Create a src_type that holds the UTF-8 string */ big_len = length; - HDassert((2 * big_len) <= sizeof(cmpbuf)); + assert((2 * big_len) <= sizeof(cmpbuf)); src_type = mkstr(big_len, H5T_STR_NULLPAD); CHECK(src_type, FAIL, "mkstr"); /* Create a dst_type that holds half of the UTF-8 string */ @@ -240,7 +240,7 @@ test_strpad(hid_t H5_ATTR_UNUSED fid, const char *string) HDstrncpy(&cmpbuf[small_len], new_string, small_len); HDstrncpy(&cmpbuf[2 * small_len], new_string, big_len); - VERIFY(HDmemcmp(buf, cmpbuf, 2 * big_len), 0, "HDmemcmp"); + VERIFY(memcmp(buf, cmpbuf, 2 * big_len), 0, "memcmp"); /* Now convert from smaller datatype to bigger datatype. This should * leave our buffer looking like: "abcd\0\0\0\0abcd\0\0\0\0" */ @@ -248,12 +248,12 @@ test_strpad(hid_t H5_ATTR_UNUSED fid, const char *string) CHECK(ret, FAIL, "H5Tconvert"); /* First fill the buffer with NULLs */ - HDmemset(cmpbuf, '\0', (size_t)LONG_BUF_SIZE); + memset(cmpbuf, '\0', (size_t)LONG_BUF_SIZE); /* Copy in the characters */ HDstrncpy(cmpbuf, new_string, small_len); HDstrncpy(&cmpbuf[big_len], new_string, small_len); - VERIFY(HDmemcmp(buf, cmpbuf, 2 * big_len), 0, "HDmemcmp"); + VERIFY(memcmp(buf, cmpbuf, 2 * big_len), 0, "memcmp"); ret = H5Tclose(src_type); CHECK(ret, FAIL, "H5Tclose"); @@ -285,7 +285,7 @@ test_strpad(hid_t H5_ATTR_UNUSED fid, const char *string) HDstrncpy(&cmpbuf[small_len], new_string, small_len); HDstrncpy(&cmpbuf[2 * small_len], new_string, big_len); - VERIFY(HDmemcmp(buf, cmpbuf, 2 * big_len), 0, "HDmemcmp"); + VERIFY(memcmp(buf, cmpbuf, 2 * big_len), 0, "memcmp"); /* Now convert from smaller datatype to bigger datatype. This should * leave our buffer looking like: "abcd abcd " */ @@ -293,12 +293,12 @@ test_strpad(hid_t H5_ATTR_UNUSED fid, const char *string) CHECK(ret, FAIL, "H5Tconvert"); /* First fill the buffer with spaces */ - HDmemset(cmpbuf, ' ', (size_t)LONG_BUF_SIZE); + memset(cmpbuf, ' ', (size_t)LONG_BUF_SIZE); /* Copy in the characters */ HDstrncpy(cmpbuf, new_string, small_len); HDstrncpy(&cmpbuf[big_len], new_string, small_len); - VERIFY(HDmemcmp(buf, cmpbuf, 2 * big_len), 0, "HDmemcmp"); + VERIFY(memcmp(buf, cmpbuf, 2 * big_len), 0, "memcmp"); ret = H5Tclose(src_type); CHECK(ret, FAIL, "H5Tclose"); @@ -589,7 +589,7 @@ test_compound(hid_t fid, const char *string) herr_t ret; /* Initialize compound data */ - HDmemset(&s1, 0, sizeof(s1_t)); /* To make purify happy */ + memset(&s1, 0, sizeof(s1_t)); /* To make purify happy */ s1.a = COMP_INT_VAL; s1.c = COMP_DOUBLE_VAL; s1.b = COMP_FLOAT_VAL; @@ -783,15 +783,15 @@ dump_string(const char *string) size_t length; size_t x; - HDprintf("The string was:\n %s", string); - HDprintf("Or in hex:\n"); + printf("The string was:\n %s", string); + printf("Or in hex:\n"); length = HDstrlen(string); for (x = 0; x < length; x++) - HDprintf("%x ", string[x] & (0x000000FF)); + printf("%x ", string[x] & (0x000000FF)); - HDprintf("\n"); + printf("\n"); } /* Main test. @@ -814,7 +814,7 @@ test_unicode(void) /* Create a random string with length NUM_CHARS */ HDsrandom((unsigned)HDtime(NULL)); - HDmemset(test_string, 0, sizeof(test_string)); + memset(test_string, 0, sizeof(test_string)); for (x = 0; x < NUM_CHARS; x++) { /* We need to avoid unprintable characters (codes 0-31) and the * . and / characters, since they aren't allowed in path names. diff --git a/test/API/tvlstr.c b/test/API/tvlstr.c index 35d5358..047b2ca 100644 --- a/test/API/tvlstr.c +++ b/test/API/tvlstr.c @@ -64,7 +64,7 @@ test_vlstr_alloc_custom(size_t size, void *info) */ extra = MAX(sizeof(void *), sizeof(size_t)); - if ((ret_value = HDmalloc(extra + size)) != NULL) { + if ((ret_value = malloc(extra + size)) != NULL) { *(size_t *)ret_value = size; *mem_used += size; } /* end if */ @@ -96,7 +96,7 @@ test_vlstr_free_custom(void *_mem, void *info) if (_mem != NULL) { mem = ((unsigned char *)_mem) - extra; *mem_used -= *(size_t *)((void *)mem); - HDfree(mem); + free(mem); } /* end if */ } @@ -162,15 +162,15 @@ test_vlstrings_basic(void) dataset2 = H5Dcreate2(fid1, "Dataset2", tid1, dataspace, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); CHECK(dataset, FAIL, "H5Dcreate2"); - wdata2 = (char *)HDcalloc((size_t)65534, sizeof(char)); - HDmemset(wdata2, 'A', (size_t)65533); + wdata2 = (char *)calloc((size_t)65534, sizeof(char)); + memset(wdata2, 'A', (size_t)65533); ret = H5Dwrite(dataset2, tid1, H5S_ALL, H5S_ALL, H5P_DEFAULT, &wdata2); CHECK(ret, FAIL, "H5Dwrite"); H5Sclose(dataspace); H5Dclose(dataset2); - HDfree(wdata2); + free(wdata2); /* Change to the custom memory allocation routines for reading VL string */ xfer_pid = H5Pcreate(H5P_DATASET_XFER); @@ -625,8 +625,8 @@ test_write_vl_string_attribute(void) att = H5Acreate2(root, "test_scalar_large", type, dataspace, H5P_DEFAULT, H5P_DEFAULT); CHECK(att, FAIL, "H5Acreate2"); - string_att_write = (char *)HDcalloc((size_t)8192, sizeof(char)); - HDmemset(string_att_write, 'A', (size_t)8191); + string_att_write = (char *)calloc((size_t)8192, sizeof(char)); + memset(string_att_write, 'A', (size_t)8191); ret = H5Awrite(att, type, &string_att_write); CHECK(ret, FAIL, "H5Awrite"); @@ -642,7 +642,7 @@ test_write_vl_string_attribute(void) string_att_check = NULL; /* The attribute string written is freed below, in the test_read_vl_string_attribute() test */ - /* HDfree(string_att_write); */ + /* free(string_att_write); */ ret = H5Aclose(att); CHECK(ret, FAIL, "HAclose"); @@ -723,7 +723,7 @@ test_read_vl_string_attribute(void) /* Free string allocated in test_write_vl_string_attribute */ if (string_att_write) - HDfree(string_att_write); + free(string_att_write); ret = H5Aclose(att); CHECK(ret, FAIL, "HAclose"); diff --git a/test/API/tvltypes.c b/test/API/tvltypes.c index eca534b..4579dc4 100644 --- a/test/API/tvltypes.c +++ b/test/API/tvltypes.c @@ -63,7 +63,7 @@ test_vltypes_alloc_custom(size_t size, void *mem_used) * DEC Alpha to keep the alignment correct - QAK) */ - if ((ret_value = HDmalloc(extra + size)) != NULL) { + if ((ret_value = malloc(extra + size)) != NULL) { *(size_t *)ret_value = size; *(size_t *)mem_used += size; } /* end if */ @@ -93,7 +93,7 @@ test_vltypes_free_custom(void *_mem, void *mem_used) unsigned char *mem = ((unsigned char *)_mem) - extra; /* Pointer to actual block allocated */ *(size_t *)mem_used -= *(size_t *)((void *)mem); - HDfree(mem); + free(mem); } /* end if */ } @@ -257,7 +257,7 @@ test_vltypes_vlen_atomic(void) /* Allocate and initialize VL data to write */ for (i = 0; i < SPACE1_DIM1; i++) { - wdata[i].p = HDmalloc((i + 1) * sizeof(unsigned int)); + wdata[i].p = malloc((i + 1) * sizeof(unsigned int)); wdata[i].len = i + 1; for (j = 0; j < (i + 1); j++) ((unsigned int *)wdata[i].p)[j] = i * 10 + j; @@ -588,7 +588,7 @@ rewrite_vltypes_vlen_atomic(void) /* Allocate and initialize VL data to write */ for (i = 0; i < SPACE1_DIM1; i++) { - wdata[i].p = HDmalloc((i + increment) * sizeof(unsigned int)); + wdata[i].p = malloc((i + increment) * sizeof(unsigned int)); wdata[i].len = i + increment; for (j = 0; j < (i + increment); j++) ((unsigned int *)wdata[i].p)[j] = i * 20 + j; @@ -750,7 +750,7 @@ test_vltypes_vlen_compound(void) /* Allocate and initialize VL data to write */ for (i = 0; i < SPACE1_DIM1; i++) { - wdata[i].p = HDmalloc((i + 1) * sizeof(s1)); + wdata[i].p = malloc((i + 1) * sizeof(s1)); wdata[i].len = i + 1; for (j = 0; j < (i + 1); j++) { ((s1 *)wdata[i].p)[j].i = (int)(i * 10 + j); @@ -902,7 +902,7 @@ rewrite_vltypes_vlen_compound(void) /* Allocate and initialize VL data to write */ for (i = 0; i < SPACE1_DIM1; i++) { - wdata[i].p = HDmalloc((i + increment) * sizeof(s1)); + wdata[i].p = malloc((i + increment) * sizeof(s1)); wdata[i].len = i + increment; for (j = 0; j < (i + increment); j++) { ((s1 *)wdata[i].p)[j].i = (int)(i * 40 + j); @@ -1051,17 +1051,17 @@ test_vltypes_compound_vlen_vlen(void) MESSAGE(5, ("Testing Compound Datatypes with VL Atomic Datatype Component Functionality\n")); /* Allocate and initialize VL data to write */ - wdata = (s1 *)HDmalloc(sizeof(s1) * SPACE3_DIM1); - CHECK_PTR(wdata, "HDmalloc"); - rdata = (s1 *)HDmalloc(sizeof(s1) * SPACE3_DIM1); - CHECK_PTR(rdata, "HDmalloc"); + wdata = (s1 *)malloc(sizeof(s1) * SPACE3_DIM1); + CHECK_PTR(wdata, "malloc"); + rdata = (s1 *)malloc(sizeof(s1) * SPACE3_DIM1); + CHECK_PTR(rdata, "malloc"); for (i = 0; i < SPACE3_DIM1; i++) { wdata[i].i = (int)(i * 10); wdata[i].f = (float)(i * 20) / 3.0F; - wdata[i].v.p = HDmalloc((i + L1_INCM) * sizeof(hvl_t)); + wdata[i].v.p = malloc((i + L1_INCM) * sizeof(hvl_t)); wdata[i].v.len = i + L1_INCM; for (t1 = (hvl_t *)((wdata[i].v).p), j = 0; j < (i + L1_INCM); j++, t1++) { - t1->p = HDmalloc((j + L2_INCM) * sizeof(unsigned int)); + t1->p = malloc((j + L2_INCM) * sizeof(unsigned int)); t1->len = j + L2_INCM; for (k = 0; k < j + L2_INCM; k++) ((unsigned int *)t1->p)[k] = i * 100 + j * 10 + k; @@ -1193,8 +1193,8 @@ test_vltypes_compound_vlen_vlen(void) CHECK(ret, FAIL, "H5Fclose"); /* Release buffers */ - HDfree(wdata); - HDfree(rdata); + free(wdata); + free(rdata); } /* end test_vltypes_compound_vlen_vlen() */ /**************************************************************** @@ -1241,11 +1241,11 @@ test_vltypes_compound_vlstr(void) /* Allocate and initialize VL data to write */ for (i = 0; i < SPACE1_DIM1; i++) { - wdata[i].v.p = (s2 *)HDmalloc((i + L3_INCM) * sizeof(s2)); + wdata[i].v.p = (s2 *)malloc((i + L3_INCM) * sizeof(s2)); wdata[i].v.len = i + L3_INCM; for (t1 = (s2 *)((wdata[i].v).p), j = 0; j < (i + L3_INCM); j++, t1++) { HDstrcat(str, "m"); - t1->string = (char *)HDmalloc(HDstrlen(str) * sizeof(char) + 1); + t1->string = (char *)malloc(HDstrlen(str) * sizeof(char) + 1); HDstrcpy(t1->string, str); /*t1->color = red;*/ t1->color = blue; @@ -1411,11 +1411,11 @@ test_vltypes_compound_vlstr(void) /* Use this part for new data */ HDstrcpy(str, "bbbbbbbb\0"); for (i = 0; i < SPACE1_DIM1; i++) { - wdata2[i].v.p = (s2 *)HDmalloc((i + 1) * sizeof(s2)); + wdata2[i].v.p = (s2 *)malloc((i + 1) * sizeof(s2)); wdata2[i].v.len = i + 1; for (t1 = (s2 *)(wdata2[i].v).p, j = 0; j < i + 1; j++, t1++) { HDstrcat(str, "pp"); - t1->string = (char *)HDmalloc(HDstrlen(str) * sizeof(char) + 1); + t1->string = (char *)malloc(HDstrlen(str) * sizeof(char) + 1); HDstrcpy(t1->string, str); t1->color = green; } @@ -1529,7 +1529,7 @@ test_vltypes_compound_vlen_atomic(void) for (i = 0; i < SPACE1_DIM1; i++) { wdata[i].i = (int)(i * 10); wdata[i].f = (float)(i * 20) / 3.0F; - wdata[i].v.p = HDmalloc((i + 1) * sizeof(unsigned int)); + wdata[i].v.p = malloc((i + 1) * sizeof(unsigned int)); wdata[i].v.len = i + 1; for (j = 0; j < (i + 1); j++) ((unsigned int *)wdata[i].v.p)[j] = i * 10 + j; @@ -1633,7 +1633,7 @@ test_vltypes_compound_vlen_atomic(void) CHECK(dcpl_pid, FAIL, "H5Pcreate"); /* Set the fill value for the second dataset */ - HDmemset(&fill, 0, sizeof(s1)); + memset(&fill, 0, sizeof(s1)); ret = H5Pset_fill_value(dcpl_pid, tid2, &fill); CHECK(ret, FAIL, "H5Pset_fill_value"); @@ -1763,7 +1763,7 @@ rewrite_vltypes_compound_vlen_atomic(void) for (i = 0; i < SPACE1_DIM1; i++) { wdata[i].i = (int)(i * 40); wdata[i].f = (float)(i * 50) / 3.0F; - wdata[i].v.p = HDmalloc((i + increment) * sizeof(unsigned int)); + wdata[i].v.p = malloc((i + increment) * sizeof(unsigned int)); wdata[i].v.len = i + increment; for (j = 0; j < (i + increment); j++) ((unsigned int *)wdata[i].v.p)[j] = i * 60 + j; @@ -1937,14 +1937,14 @@ test_vltypes_vlen_vlen_atomic(void) /* Allocate and initialize VL data to write */ for (i = 0; i < SPACE1_DIM1; i++) { - wdata[i].p = HDmalloc((i + 1) * sizeof(hvl_t)); + wdata[i].p = malloc((i + 1) * sizeof(hvl_t)); if (wdata[i].p == NULL) { TestErrPrintf("Cannot allocate memory for VL data! i=%u\n", i); return; } /* end if */ wdata[i].len = i + 1; for (t1 = (hvl_t *)(wdata[i].p), j = 0; j < (i + 1); j++, t1++) { - t1->p = HDmalloc((j + 1) * sizeof(unsigned int)); + t1->p = malloc((j + 1) * sizeof(unsigned int)); if (t1->p == NULL) { TestErrPrintf("Cannot allocate memory for VL data! i=%u, j=%u\n", i, j); return; @@ -2138,14 +2138,14 @@ rewrite_longer_vltypes_vlen_vlen_atomic(void) /* Allocate and initialize VL data to write */ for (i = 0; i < SPACE1_DIM1; i++) { - wdata[i].p = HDmalloc((i + increment) * sizeof(hvl_t)); + wdata[i].p = malloc((i + increment) * sizeof(hvl_t)); if (wdata[i].p == NULL) { TestErrPrintf("Cannot allocate memory for VL data! i=%u\n", i); return; } /* end if */ wdata[i].len = i + increment; for (t1 = (hvl_t *)(wdata[i].p), j = 0; j < (i + increment); j++, t1++) { - t1->p = HDmalloc((j + 1) * sizeof(unsigned int)); + t1->p = malloc((j + 1) * sizeof(unsigned int)); if (t1->p == NULL) { TestErrPrintf("Cannot allocate memory for VL data! i=%u, j=%u\n", i, j); return; @@ -2318,14 +2318,14 @@ rewrite_shorter_vltypes_vlen_vlen_atomic(void) /* Allocate and initialize VL data to write */ for (i = 0; i < SPACE1_DIM1; i++) { - wdata[i].p = HDmalloc((i + increment) * sizeof(hvl_t)); + wdata[i].p = malloc((i + increment) * sizeof(hvl_t)); if (wdata[i].p == NULL) { TestErrPrintf("Cannot allocate memory for VL data! i=%u\n", i); return; } /* end if */ wdata[i].len = i + increment; for (t1 = (hvl_t *)(wdata[i].p), j = 0; j < (i + increment); j++, t1++) { - t1->p = HDmalloc((j + 1) * sizeof(unsigned int)); + t1->p = malloc((j + 1) * sizeof(unsigned int)); if (t1->p == NULL) { TestErrPrintf("Cannot allocate memory for VL data! i=%u, j=%u\n", i, j); return; @@ -2594,8 +2594,8 @@ test_vltypes_fill_value(void) CHECK(ret, FAIL, "H5Tclose"); /* Allocate space for the buffer to read data */ - rbuf = (dtype1_struct *)HDmalloc(SPACE4_DIM_LARGE * sizeof(dtype1_struct)); - CHECK_PTR(rbuf, "HDmalloc"); + rbuf = (dtype1_struct *)malloc(SPACE4_DIM_LARGE * sizeof(dtype1_struct)); + CHECK_PTR(rbuf, "malloc"); /* Create the small & large dataspaces to use */ small_dspace_id = H5Screate_simple(SPACE4_RANK, small_dims, NULL); @@ -2693,13 +2693,13 @@ test_vltypes_fill_value(void) } break; case H5D_VIRTUAL: - HDassert(0 && "Invalid layout type!"); + assert(0 && "Invalid layout type!"); break; case H5D_LAYOUT_ERROR: case H5D_NLAYOUTS: default: - HDassert(0 && "Unknown layout type!"); + assert(0 && "Unknown layout type!"); break; } /* end switch */ @@ -2801,13 +2801,13 @@ test_vltypes_fill_value(void) break; case H5D_VIRTUAL: - HDassert(0 && "Invalid layout type!"); + assert(0 && "Invalid layout type!"); break; case H5D_LAYOUT_ERROR: case H5D_NLAYOUTS: default: - HDassert(0 && "Unknown layout type!"); + assert(0 && "Unknown layout type!"); break; } /* end switch */ @@ -2835,7 +2835,7 @@ test_vltypes_fill_value(void) CHECK(ret, FAIL, "H5Treclaim"); /* Clear the read buffer */ - HDmemset(rbuf, 0, dset_elmts * sizeof(dtype1_struct)); + memset(rbuf, 0, dset_elmts * sizeof(dtype1_struct)); /* Read in non-contiguous selection from 'empty' dataset of fill value */ ret = H5Dread(dset_id, dtype1_id, dset_select_dspace_id, dset_select_dspace_id, xfer_pid, rbuf); @@ -2893,7 +2893,7 @@ test_vltypes_fill_value(void) CHECK(ret, FAIL, "H5Treclaim"); /* Clear the read buffer */ - HDmemset(rbuf, 0, dset_elmts * sizeof(dtype1_struct)); + memset(rbuf, 0, dset_elmts * sizeof(dtype1_struct)); /* Read in non-contiguous selection from 'empty' dataset of fill value */ ret = H5Dread(dset_id, dtype1_id, dset_select_dspace_id, dset_select_dspace_id, xfer_pid, rbuf); @@ -2988,13 +2988,13 @@ test_vltypes_fill_value(void) break; case H5D_VIRTUAL: - HDassert(0 && "Invalid layout type!"); + assert(0 && "Invalid layout type!"); break; case H5D_LAYOUT_ERROR: case H5D_NLAYOUTS: default: - HDassert(0 && "Unknown layout type!"); + assert(0 && "Unknown layout type!"); break; } /* end switch */ @@ -3048,7 +3048,7 @@ test_vltypes_fill_value(void) CHECK(ret, FAIL, "H5Treclaim"); /* Clear the read buffer */ - HDmemset(rbuf, 0, dset_elmts * sizeof(dtype1_struct)); + memset(rbuf, 0, dset_elmts * sizeof(dtype1_struct)); /* Read in non-contiguous selection from dataset */ ret = H5Dread(dset_id, dtype1_id, dset_select_dspace_id, dset_select_dspace_id, xfer_pid, rbuf); @@ -3136,7 +3136,7 @@ test_vltypes_fill_value(void) CHECK(ret, FAIL, "H5Treclaim"); /* Clear the read buffer */ - HDmemset(rbuf, 0, dset_elmts * sizeof(dtype1_struct)); + memset(rbuf, 0, dset_elmts * sizeof(dtype1_struct)); /* Read in non-contiguous selection from dataset */ ret = H5Dread(dset_id, dtype1_id, dset_select_dspace_id, dset_select_dspace_id, xfer_pid, rbuf); @@ -3215,7 +3215,7 @@ test_vltypes_fill_value(void) CHECK(ret, FAIL, "H5Tclose"); /* Release buffer */ - HDfree(rbuf); + free(rbuf); } /* end test_vltypes_fill_value() */ /**************************************************************** diff --git a/test/accum.c b/test/accum.c index 816d9c0..aaa65d4 100644 --- a/test/accum.c +++ b/test/accum.c @@ -192,10 +192,10 @@ test_write_read(H5F_t *f) TESTING("simple write/read to/from metadata accumulator"); /* Allocate buffers */ - write_buf = (int *)HDmalloc(1024 * sizeof(int)); - HDassert(write_buf); - read_buf = (int *)HDcalloc((size_t)1024, sizeof(int)); - HDassert(read_buf); + write_buf = (int *)malloc(1024 * sizeof(int)); + assert(write_buf); + read_buf = (int *)calloc((size_t)1024, sizeof(int)); + assert(read_buf); /* Fill buffer with data, zero out read buffer */ for (i = 0; i < 1024; i++) @@ -207,7 +207,7 @@ test_write_read(H5F_t *f) FAIL_STACK_ERROR; if (accum_read(0, 1024, read_buf) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(write_buf, read_buf, (size_t)1024) != 0) + if (memcmp(write_buf, read_buf, (size_t)1024) != 0) TEST_ERROR; if (accum_reset(f) < 0) @@ -216,15 +216,15 @@ test_write_read(H5F_t *f) PASSED(); /* Release memory */ - HDfree(write_buf); - HDfree(read_buf); + free(write_buf); + free(read_buf); return 0; error: /* Release memory */ - HDfree(write_buf); - HDfree(read_buf); + free(write_buf); + free(read_buf); return 1; } /* test_write_read */ @@ -251,10 +251,10 @@ test_write_read_nonacc_front(H5F_t *f) TESTING("simple write/read to/from before metadata accumulator"); /* Allocate buffers */ - write_buf = (int *)HDmalloc(2048 * sizeof(int)); - HDassert(write_buf); - read_buf = (int *)HDcalloc((size_t)2048, sizeof(int)); - HDassert(read_buf); + write_buf = (int *)malloc(2048 * sizeof(int)); + assert(write_buf); + read_buf = (int *)calloc((size_t)2048, sizeof(int)); + assert(read_buf); /* Fill buffer with data, zero out read buffer */ for (i = 0; i < 2048; i++) @@ -272,7 +272,7 @@ test_write_read_nonacc_front(H5F_t *f) FAIL_STACK_ERROR; if (accum_read(0, 1024, read_buf) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(write_buf, read_buf, (size_t)1024) != 0) + if (memcmp(write_buf, read_buf, (size_t)1024) != 0) TEST_ERROR; if (accum_reset(f) < 0) @@ -281,15 +281,15 @@ test_write_read_nonacc_front(H5F_t *f) PASSED(); /* Release memory */ - HDfree(write_buf); - HDfree(read_buf); + free(write_buf); + free(read_buf); return 0; error: /* Release memory */ - HDfree(write_buf); - HDfree(read_buf); + free(write_buf); + free(read_buf); return 1; } /* test_write_read */ @@ -316,10 +316,10 @@ test_write_read_nonacc_end(H5F_t *f) TESTING("simple write/read to/from after metadata accumulator"); /* Allocate buffers */ - write_buf = (int *)HDmalloc(2048 * sizeof(int)); - HDassert(write_buf); - read_buf = (int *)HDcalloc((size_t)2048, sizeof(int)); - HDassert(read_buf); + write_buf = (int *)malloc(2048 * sizeof(int)); + assert(write_buf); + read_buf = (int *)calloc((size_t)2048, sizeof(int)); + assert(read_buf); /* Fill buffer with data, zero out read buffer */ for (i = 0; i < 2048; i++) @@ -337,7 +337,7 @@ test_write_read_nonacc_end(H5F_t *f) FAIL_STACK_ERROR; if (accum_read(1024, 1024, read_buf) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(write_buf, read_buf, (size_t)1024) != 0) + if (memcmp(write_buf, read_buf, (size_t)1024) != 0) TEST_ERROR; if (accum_reset(f) < 0) @@ -346,15 +346,15 @@ test_write_read_nonacc_end(H5F_t *f) PASSED(); /* Release memory */ - HDfree(write_buf); - HDfree(read_buf); + free(write_buf); + free(read_buf); return 0; error: /* Release memory */ - HDfree(write_buf); - HDfree(read_buf); + free(write_buf); + free(read_buf); return 1; } /* test_write_read */ @@ -383,12 +383,12 @@ test_free(H5F_t *f) TESTING("simple freeing metadata accumulator"); /* Write and free the whole accumulator. */ - wbuf = (int32_t *)HDmalloc(256 * sizeof(int32_t)); - HDassert(wbuf); - rbuf = (int32_t *)HDmalloc(256 * sizeof(int32_t)); - HDassert(rbuf); - expect = (int32_t *)HDmalloc(256 * sizeof(int32_t)); - HDassert(expect); + wbuf = (int32_t *)malloc(256 * sizeof(int32_t)); + assert(wbuf); + rbuf = (int32_t *)malloc(256 * sizeof(int32_t)); + assert(rbuf); + expect = (int32_t *)malloc(256 * sizeof(int32_t)); + assert(expect); /* Fill buffer with data */ for (i = 0; i < 256; i++) @@ -424,7 +424,7 @@ test_free(H5F_t *f) /* Check that the accumulator still contains the correct data */ if (accum_read(1 * sizeof(int32_t), 127 * sizeof(int32_t), rbuf) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(wbuf + 1, rbuf, 127 * sizeof(int32_t)) != 0) + if (memcmp(wbuf + 1, rbuf, 127 * sizeof(int32_t)) != 0) TEST_ERROR; /* Free the block of 4B at 127*4B */ @@ -434,7 +434,7 @@ test_free(H5F_t *f) /* Check that the accumulator still contains the correct data */ if (accum_read(1 * sizeof(int32_t), 126 * sizeof(int32_t), rbuf) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(wbuf + 1, rbuf, 126 * sizeof(int32_t)) != 0) + if (memcmp(wbuf + 1, rbuf, 126 * sizeof(int32_t)) != 0) TEST_ERROR; /* Free the block of 4B at 2*4B */ @@ -444,132 +444,132 @@ test_free(H5F_t *f) /* Check that the accumulator still contains the correct data */ if (accum_read(1 * sizeof(int32_t), 1 * sizeof(int32_t), rbuf) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(wbuf + 1, rbuf, 1 * sizeof(int32_t)) != 0) + if (memcmp(wbuf + 1, rbuf, 1 * sizeof(int32_t)) != 0) TEST_ERROR; if (accum_read(3 * sizeof(int32_t), 124 * sizeof(int32_t), rbuf) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(wbuf + 3, rbuf, 124 * sizeof(int32_t)) != 0) + if (memcmp(wbuf + 3, rbuf, 124 * sizeof(int32_t)) != 0) TEST_ERROR; /* Test freeing section that overlaps the start of the accumulator and is * entirely before dirty section */ if (accum_write(64 * sizeof(int32_t), 128 * sizeof(int32_t), wbuf) < 0) FAIL_STACK_ERROR; - HDmemcpy(expect + 64, wbuf, 128 * sizeof(int32_t)); + memcpy(expect + 64, wbuf, 128 * sizeof(int32_t)); if (accum_flush(f) < 0) FAIL_STACK_ERROR; if (accum_write(68 * sizeof(int32_t), 4 * sizeof(int32_t), wbuf) < 0) FAIL_STACK_ERROR; - HDmemcpy(expect + 68, wbuf, 4 * sizeof(int32_t)); + memcpy(expect + 68, wbuf, 4 * sizeof(int32_t)); if (accum_free(f, 62 * sizeof(int32_t), 4 * sizeof(int32_t)) < 0) FAIL_STACK_ERROR; /* Check that the accumulator still contains the correct data */ if (accum_read(66 * sizeof(int32_t), 126 * sizeof(int32_t), rbuf) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(expect + 66, rbuf, 126 * sizeof(int32_t)) != 0) + if (memcmp(expect + 66, rbuf, 126 * sizeof(int32_t)) != 0) TEST_ERROR; /* Test freeing section that overlaps the start of the accumulator and * completely contains dirty section */ if (accum_write(64 * sizeof(int32_t), 128 * sizeof(int32_t), wbuf) < 0) FAIL_STACK_ERROR; - HDmemcpy(expect + 64, wbuf, 128 * sizeof(int32_t)); + memcpy(expect + 64, wbuf, 128 * sizeof(int32_t)); if (accum_flush(f) < 0) FAIL_STACK_ERROR; if (accum_write(68 * sizeof(int32_t), 4 * sizeof(int32_t), wbuf) < 0) FAIL_STACK_ERROR; - HDmemcpy(expect + 68, wbuf, 4 * sizeof(int32_t)); + memcpy(expect + 68, wbuf, 4 * sizeof(int32_t)); if (accum_free(f, 62 * sizeof(int32_t), 16 * sizeof(int32_t)) < 0) FAIL_STACK_ERROR; /* Check that the accumulator still contains the correct data */ if (accum_read(78 * sizeof(int32_t), 114 * sizeof(int32_t), rbuf) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(expect + 78, rbuf, 114 * sizeof(int32_t)) != 0) + if (memcmp(expect + 78, rbuf, 114 * sizeof(int32_t)) != 0) TEST_ERROR; /* Test freeing section completely contained in accumulator and is entirely * before dirty section */ if (accum_write(64 * sizeof(int32_t), 128 * sizeof(int32_t), wbuf) < 0) FAIL_STACK_ERROR; - HDmemcpy(expect + 64, wbuf, 128 * sizeof(int32_t)); + memcpy(expect + 64, wbuf, 128 * sizeof(int32_t)); if (accum_flush(f) < 0) FAIL_STACK_ERROR; if (accum_write(72 * sizeof(int32_t), 4 * sizeof(int32_t), wbuf) < 0) FAIL_STACK_ERROR; - HDmemcpy(expect + 72, wbuf, 4 * sizeof(int32_t)); + memcpy(expect + 72, wbuf, 4 * sizeof(int32_t)); if (accum_free(f, 66 * sizeof(int32_t), 4 * sizeof(int32_t)) < 0) FAIL_STACK_ERROR; /* Check that the accumulator still contains the correct data */ if (accum_read(70 * sizeof(int32_t), 122 * sizeof(int32_t), rbuf) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(expect + 70, rbuf, 122 * sizeof(int32_t)) != 0) + if (memcmp(expect + 70, rbuf, 122 * sizeof(int32_t)) != 0) TEST_ERROR; /* Test freeing section completely contained in accumulator, starts before * dirty section, and ends in dirty section */ if (accum_write(64 * sizeof(int32_t), 128 * sizeof(int32_t), wbuf) < 0) FAIL_STACK_ERROR; - HDmemcpy(expect + 64, wbuf, 128 * sizeof(int32_t)); + memcpy(expect + 64, wbuf, 128 * sizeof(int32_t)); if (accum_flush(f) < 0) FAIL_STACK_ERROR; if (accum_write(72 * sizeof(int32_t), 4 * sizeof(int32_t), wbuf) < 0) FAIL_STACK_ERROR; - HDmemcpy(expect + 72, wbuf, 4 * sizeof(int32_t)); + memcpy(expect + 72, wbuf, 4 * sizeof(int32_t)); if (accum_free(f, 70 * sizeof(int32_t), 4 * sizeof(int32_t)) < 0) FAIL_STACK_ERROR; /* Check that the accumulator still contains the correct data */ if (accum_read(74 * sizeof(int32_t), 118 * sizeof(int32_t), rbuf) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(expect + 74, rbuf, 118 * sizeof(int32_t)) != 0) + if (memcmp(expect + 74, rbuf, 118 * sizeof(int32_t)) != 0) TEST_ERROR; /* Test freeing section completely contained in accumulator and completely * contains dirty section */ if (accum_write(64 * sizeof(int32_t), 128 * sizeof(int32_t), wbuf) < 0) FAIL_STACK_ERROR; - HDmemcpy(expect + 64, wbuf, 128 * sizeof(int32_t)); + memcpy(expect + 64, wbuf, 128 * sizeof(int32_t)); if (accum_flush(f) < 0) FAIL_STACK_ERROR; if (accum_write(72 * sizeof(int32_t), 4 * sizeof(int32_t), wbuf) < 0) FAIL_STACK_ERROR; - HDmemcpy(expect + 72, wbuf, 4 * sizeof(int32_t)); + memcpy(expect + 72, wbuf, 4 * sizeof(int32_t)); if (accum_free(f, 70 * sizeof(int32_t), 8 * sizeof(int32_t)) < 0) FAIL_STACK_ERROR; /* Check that the accumulator still contains the correct data */ if (accum_read(78 * sizeof(int32_t), 114 * sizeof(int32_t), rbuf) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(expect + 78, rbuf, 114 * sizeof(int32_t)) != 0) + if (memcmp(expect + 78, rbuf, 114 * sizeof(int32_t)) != 0) TEST_ERROR; /* Test freeing section completely contained in accumulator, starts at start * of dirty section, and ends in dirty section */ if (accum_write(64 * sizeof(int32_t), 128 * sizeof(int32_t), wbuf) < 0) FAIL_STACK_ERROR; - HDmemcpy(expect + 64, wbuf, 128 * sizeof(int32_t)); + memcpy(expect + 64, wbuf, 128 * sizeof(int32_t)); if (accum_flush(f) < 0) FAIL_STACK_ERROR; if (accum_write(72 * sizeof(int32_t), 8 * sizeof(int32_t), wbuf) < 0) FAIL_STACK_ERROR; - HDmemcpy(expect + 72, wbuf, 8 * sizeof(int32_t)); + memcpy(expect + 72, wbuf, 8 * sizeof(int32_t)); if (accum_free(f, 72 * sizeof(int32_t), 4 * sizeof(int32_t)) < 0) FAIL_STACK_ERROR; /* Check that the accumulator still contains the correct data */ if (accum_read(76 * sizeof(int32_t), 116 * sizeof(int32_t), rbuf) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(expect + 76, rbuf, 116 * sizeof(int32_t)) != 0) + if (memcmp(expect + 76, rbuf, 116 * sizeof(int32_t)) != 0) TEST_ERROR; - HDfree(wbuf); + free(wbuf); wbuf = NULL; - HDfree(rbuf); + free(rbuf); rbuf = NULL; - HDfree(expect); + free(expect); expect = NULL; if (accum_reset(f) < 0) @@ -581,11 +581,11 @@ test_free(H5F_t *f) error: if (wbuf) - HDfree(wbuf); + free(wbuf); if (rbuf) - HDfree(rbuf); + free(rbuf); if (expect) - HDfree(expect); + free(expect); return 1; } /* test_free */ @@ -614,10 +614,10 @@ test_accum_overlap(H5F_t *f) TESTING("overlapping write to metadata accumulator"); /* Allocate buffers */ - wbuf = (int32_t *)HDmalloc(4096 * sizeof(int32_t)); - HDassert(wbuf); - rbuf = (int32_t *)HDcalloc((size_t)4096, sizeof(int32_t)); - HDassert(rbuf); + wbuf = (int32_t *)malloc(4096 * sizeof(int32_t)); + assert(wbuf); + rbuf = (int32_t *)calloc((size_t)4096, sizeof(int32_t)); + assert(rbuf); /* Case 1: No metadata in accumulator */ /* Write 10 1's at address 40 */ @@ -629,7 +629,7 @@ test_accum_overlap(H5F_t *f) FAIL_STACK_ERROR; if (accum_read(40, 10 * sizeof(int32_t), rbuf) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(wbuf, rbuf, 10 * sizeof(int32_t)) != 0) + if (memcmp(wbuf, rbuf, 10 * sizeof(int32_t)) != 0) TEST_ERROR; /* Case 2: End of new piece aligns with start of accumulated data */ @@ -641,7 +641,7 @@ test_accum_overlap(H5F_t *f) FAIL_STACK_ERROR; if (accum_read(20, 5 * sizeof(int32_t), rbuf) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(wbuf, rbuf, 5 * sizeof(int32_t)) != 0) + if (memcmp(wbuf, rbuf, 5 * sizeof(int32_t)) != 0) TEST_ERROR; /* Case 3: Start of new piece aligns with start of accumulated data */ @@ -653,7 +653,7 @@ test_accum_overlap(H5F_t *f) FAIL_STACK_ERROR; if (accum_read(20, 3 * sizeof(int32_t), rbuf) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(wbuf, rbuf, 3 * sizeof(int32_t)) != 0) + if (memcmp(wbuf, rbuf, 3 * sizeof(int32_t)) != 0) TEST_ERROR; /* Case 4: New piece overlaps start of accumulated data */ @@ -665,7 +665,7 @@ test_accum_overlap(H5F_t *f) FAIL_STACK_ERROR; if (accum_read(8, 5 * sizeof(int32_t), rbuf) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(wbuf, rbuf, 5 * sizeof(int32_t)) != 0) + if (memcmp(wbuf, rbuf, 5 * sizeof(int32_t)) != 0) TEST_ERROR; /* Case 5: New piece completely within accumulated data */ @@ -677,7 +677,7 @@ test_accum_overlap(H5F_t *f) FAIL_STACK_ERROR; if (accum_read(48, 4 * sizeof(int32_t), rbuf) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(wbuf, rbuf, 4 * sizeof(int32_t)) != 0) + if (memcmp(wbuf, rbuf, 4 * sizeof(int32_t)) != 0) TEST_ERROR; /* Case 6: End of new piece aligns with end of accumulated data */ @@ -689,7 +689,7 @@ test_accum_overlap(H5F_t *f) FAIL_STACK_ERROR; if (accum_read(68, 3 * sizeof(int32_t), rbuf) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(wbuf, rbuf, 3 * sizeof(int32_t)) != 0) + if (memcmp(wbuf, rbuf, 3 * sizeof(int32_t)) != 0) TEST_ERROR; /* Case 7: New piece overlaps end of accumulated data */ @@ -701,7 +701,7 @@ test_accum_overlap(H5F_t *f) FAIL_STACK_ERROR; if (accum_read(76, 5 * sizeof(int32_t), rbuf) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(wbuf, rbuf, 5 * sizeof(int32_t)) != 0) + if (memcmp(wbuf, rbuf, 5 * sizeof(int32_t)) != 0) TEST_ERROR; /* Case 8: Start of new piece aligns with end of accumulated data */ @@ -713,7 +713,7 @@ test_accum_overlap(H5F_t *f) FAIL_STACK_ERROR; if (accum_read(96, 3 * sizeof(int32_t), rbuf) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(wbuf, rbuf, 3 * sizeof(int32_t)) != 0) + if (memcmp(wbuf, rbuf, 3 * sizeof(int32_t)) != 0) TEST_ERROR; /* Set up expected data buffer and verify contents of @@ -738,7 +738,7 @@ test_accum_overlap(H5F_t *f) wbuf[i] = 8; if (accum_read(8, 25 * sizeof(int32_t), rbuf) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(wbuf, rbuf, 25 * sizeof(int32_t)) != 0) + if (memcmp(wbuf, rbuf, 25 * sizeof(int32_t)) != 0) TEST_ERROR; /* Case 9: New piece completely before accumulated data */ @@ -750,7 +750,7 @@ test_accum_overlap(H5F_t *f) FAIL_STACK_ERROR; if (accum_read(0, 1 * sizeof(int32_t), rbuf) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(wbuf, rbuf, 1 * sizeof(int32_t)) != 0) + if (memcmp(wbuf, rbuf, 1 * sizeof(int32_t)) != 0) TEST_ERROR; /* Case 10: New piece completely after accumulated data */ @@ -762,7 +762,7 @@ test_accum_overlap(H5F_t *f) FAIL_STACK_ERROR; if (accum_read(116, 4 * sizeof(int32_t), rbuf) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(wbuf, rbuf, 4 * sizeof(int32_t)) != 0) + if (memcmp(wbuf, rbuf, 4 * sizeof(int32_t)) != 0) TEST_ERROR; /* Case 11: New piece completely overlaps accumulated data */ @@ -774,7 +774,7 @@ test_accum_overlap(H5F_t *f) FAIL_STACK_ERROR; if (accum_read(112, 6 * sizeof(int32_t), rbuf) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(wbuf, rbuf, 6 * sizeof(int32_t)) != 0) + if (memcmp(wbuf, rbuf, 6 * sizeof(int32_t)) != 0) TEST_ERROR; if (accum_reset(f) < 0) @@ -783,15 +783,15 @@ test_accum_overlap(H5F_t *f) PASSED(); /* Release memory */ - HDfree(wbuf); - HDfree(rbuf); + free(wbuf); + free(rbuf); return 0; error: /* Release memory */ - HDfree(wbuf); - HDfree(rbuf); + free(wbuf); + free(rbuf); return 1; } /* test_accum_overlap */ @@ -821,10 +821,10 @@ test_accum_overlap_clean(H5F_t *f) TESTING("overlapping write to partially clean metadata accumulator"); /* Allocate buffers */ - wbuf = (int32_t *)HDmalloc(4096 * sizeof(int32_t)); - HDassert(wbuf); - rbuf = (int32_t *)HDcalloc((size_t)4096, sizeof(int32_t)); - HDassert(rbuf); + wbuf = (int32_t *)malloc(4096 * sizeof(int32_t)); + assert(wbuf); + rbuf = (int32_t *)calloc((size_t)4096, sizeof(int32_t)); + assert(rbuf); /* Case 1: No metadata in accumulator */ /* Write 10 1's at address 40 */ @@ -836,7 +836,7 @@ test_accum_overlap_clean(H5F_t *f) FAIL_STACK_ERROR; if (accum_read(40, 10 * sizeof(int32_t), rbuf) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(wbuf, rbuf, 10 * sizeof(int32_t)) != 0) + if (memcmp(wbuf, rbuf, 10 * sizeof(int32_t)) != 0) TEST_ERROR; /* Case 2: End of new piece aligns with start of clean accumulated data */ @@ -850,7 +850,7 @@ test_accum_overlap_clean(H5F_t *f) FAIL_STACK_ERROR; if (accum_read(20, 5 * sizeof(int32_t), rbuf) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(wbuf, rbuf, 5 * sizeof(int32_t)) != 0) + if (memcmp(wbuf, rbuf, 5 * sizeof(int32_t)) != 0) TEST_ERROR; /* Case 3: Start of new piece aligns with start of accumulated data, @@ -863,7 +863,7 @@ test_accum_overlap_clean(H5F_t *f) FAIL_STACK_ERROR; if (accum_read(20, 6 * sizeof(int32_t), rbuf) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(wbuf, rbuf, 6 * sizeof(int32_t)) != 0) + if (memcmp(wbuf, rbuf, 6 * sizeof(int32_t)) != 0) TEST_ERROR; /* Case 4: New piece completely within accumulated data, overlaps @@ -876,7 +876,7 @@ test_accum_overlap_clean(H5F_t *f) FAIL_STACK_ERROR; if (accum_read(40, 2 * sizeof(int32_t), rbuf) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(wbuf, rbuf, 2 * sizeof(int32_t)) != 0) + if (memcmp(wbuf, rbuf, 2 * sizeof(int32_t)) != 0) TEST_ERROR; /* Case 5: New piece completely within accumulated data, completely @@ -889,7 +889,7 @@ test_accum_overlap_clean(H5F_t *f) FAIL_STACK_ERROR; if (accum_read(52, 2 * sizeof(int32_t), rbuf) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(wbuf, rbuf, 2 * sizeof(int32_t)) != 0) + if (memcmp(wbuf, rbuf, 2 * sizeof(int32_t)) != 0) TEST_ERROR; /* Case 6: New piece completely within clean accumulated data */ @@ -903,7 +903,7 @@ test_accum_overlap_clean(H5F_t *f) FAIL_STACK_ERROR; if (accum_read(44, 3 * sizeof(int32_t), rbuf) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(wbuf, rbuf, 3 * sizeof(int32_t)) != 0) + if (memcmp(wbuf, rbuf, 3 * sizeof(int32_t)) != 0) TEST_ERROR; /* Case 7: New piece overlaps start of clean accumulated data */ @@ -917,7 +917,7 @@ test_accum_overlap_clean(H5F_t *f) FAIL_STACK_ERROR; if (accum_read(16, 2 * sizeof(int32_t), rbuf) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(wbuf, rbuf, 2 * sizeof(int32_t)) != 0) + if (memcmp(wbuf, rbuf, 2 * sizeof(int32_t)) != 0) TEST_ERROR; /* Case 8: New piece overlaps start of accumulated data, completely @@ -930,7 +930,7 @@ test_accum_overlap_clean(H5F_t *f) FAIL_STACK_ERROR; if (accum_read(12, 4 * sizeof(int32_t), rbuf) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(wbuf, rbuf, 4 * sizeof(int32_t)) != 0) + if (memcmp(wbuf, rbuf, 4 * sizeof(int32_t)) != 0) TEST_ERROR; /* Case 9: Start of new piece aligns with end of clean accumulated data */ @@ -944,7 +944,7 @@ test_accum_overlap_clean(H5F_t *f) FAIL_STACK_ERROR; if (accum_read(80, 3 * sizeof(int32_t), rbuf) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(wbuf, rbuf, 3 * sizeof(int32_t)) != 0) + if (memcmp(wbuf, rbuf, 3 * sizeof(int32_t)) != 0) TEST_ERROR; /* Case 10: New piece overlaps end of clean accumulated data */ @@ -958,7 +958,7 @@ test_accum_overlap_clean(H5F_t *f) FAIL_STACK_ERROR; if (accum_read(88, 2 * sizeof(int32_t), rbuf) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(wbuf, rbuf, 2 * sizeof(int32_t)) != 0) + if (memcmp(wbuf, rbuf, 2 * sizeof(int32_t)) != 0) TEST_ERROR; /* Case 11: New piece overlaps end of accumulated data, completely encloses @@ -971,7 +971,7 @@ test_accum_overlap_clean(H5F_t *f) FAIL_STACK_ERROR; if (accum_read(84, 4 * sizeof(int32_t), rbuf) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(wbuf, rbuf, 4 * sizeof(int32_t)) != 0) + if (memcmp(wbuf, rbuf, 4 * sizeof(int32_t)) != 0) TEST_ERROR; /* Set up expected data buffer and verify contents of @@ -994,7 +994,7 @@ test_accum_overlap_clean(H5F_t *f) wbuf[i] = 7; if (accum_read(12, 22 * sizeof(int32_t), rbuf) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(wbuf, rbuf, 22 * sizeof(int32_t)) != 0) + if (memcmp(wbuf, rbuf, 22 * sizeof(int32_t)) != 0) TEST_ERROR; if (accum_reset(f) < 0) @@ -1003,15 +1003,15 @@ test_accum_overlap_clean(H5F_t *f) PASSED(); /* Release memory */ - HDfree(wbuf); - HDfree(rbuf); + free(wbuf); + free(rbuf); return 0; error: /* Release memory */ - HDfree(wbuf); - HDfree(rbuf); + free(wbuf); + free(rbuf); return 1; } /* test_accum_overlap_clean */ @@ -1040,10 +1040,10 @@ test_accum_non_overlap_size(H5F_t *f) TESTING("non-overlapping write to accumulator larger then accum_size"); /* Allocate buffers */ - wbuf = (int *)HDmalloc(4096 * sizeof(int32_t)); - HDassert(wbuf); - rbuf = (int *)HDcalloc((size_t)4096, sizeof(int32_t)); - HDassert(rbuf); + wbuf = (int *)malloc(4096 * sizeof(int32_t)); + assert(wbuf); + rbuf = (int *)calloc((size_t)4096, sizeof(int32_t)); + assert(rbuf); /* Case 1: No metadata in accumulator */ /* Write 10 1's at address 140 */ @@ -1055,7 +1055,7 @@ test_accum_non_overlap_size(H5F_t *f) FAIL_STACK_ERROR; if (accum_read(140, 10 * sizeof(int32_t), rbuf) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(wbuf, rbuf, 10 * sizeof(int32_t)) != 0) + if (memcmp(wbuf, rbuf, 10 * sizeof(int32_t)) != 0) TEST_ERROR; /* Case 9: New piece completely before accumulated data */ @@ -1067,7 +1067,7 @@ test_accum_non_overlap_size(H5F_t *f) FAIL_STACK_ERROR; if (accum_read(0, 20 * sizeof(int32_t), rbuf) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(wbuf, rbuf, 20 * sizeof(int32_t)) != 0) + if (memcmp(wbuf, rbuf, 20 * sizeof(int32_t)) != 0) TEST_ERROR; if (accum_reset(f) < 0) @@ -1076,15 +1076,15 @@ test_accum_non_overlap_size(H5F_t *f) PASSED(); /* Release memory */ - HDfree(wbuf); - HDfree(rbuf); + free(wbuf); + free(rbuf); return 0; error: /* Release memory */ - HDfree(wbuf); - HDfree(rbuf); + free(wbuf); + free(rbuf); return 1; } /* test_accum_non_overlap_size */ @@ -1114,10 +1114,10 @@ test_accum_overlap_size(H5F_t *f) TESTING("overlapping write to accumulator larger then accum_size"); /* Allocate buffers */ - wbuf = (int32_t *)HDmalloc(4096 * sizeof(int32_t)); - HDassert(wbuf); - rbuf = (int32_t *)HDcalloc((size_t)4096, sizeof(int32_t)); - HDassert(rbuf); + wbuf = (int32_t *)malloc(4096 * sizeof(int32_t)); + assert(wbuf); + rbuf = (int32_t *)calloc((size_t)4096, sizeof(int32_t)); + assert(rbuf); /* Case 1: No metadata in accumulator */ /* Write 10 1's at address 64 */ @@ -1129,7 +1129,7 @@ test_accum_overlap_size(H5F_t *f) FAIL_STACK_ERROR; if (accum_read(64, 10 * sizeof(int32_t), rbuf) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(wbuf, rbuf, 10 * sizeof(int32_t)) != 0) + if (memcmp(wbuf, rbuf, 10 * sizeof(int32_t)) != 0) TEST_ERROR; /* Case 9: New piece completely before accumulated data */ @@ -1141,7 +1141,7 @@ test_accum_overlap_size(H5F_t *f) FAIL_STACK_ERROR; if (accum_read(60, 72 * sizeof(int32_t), rbuf) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(wbuf, rbuf, 72 * sizeof(int32_t)) != 0) + if (memcmp(wbuf, rbuf, 72 * sizeof(int32_t)) != 0) TEST_ERROR; if (accum_reset(f) < 0) @@ -1150,15 +1150,15 @@ test_accum_overlap_size(H5F_t *f) PASSED(); /* Release memory */ - HDfree(wbuf); - HDfree(rbuf); + free(wbuf); + free(rbuf); return 0; error: /* Release memory */ - HDfree(wbuf); - HDfree(rbuf); + free(wbuf); + free(rbuf); return 1; } /* test_accum_overlap_size */ @@ -1199,10 +1199,10 @@ test_accum_adjust(H5F_t *f) TESTING("accumulator adjustments after append/prepend of data"); /* Allocate buffers */ - wbuf = (int32_t *)HDmalloc((size_t)s * sizeof(int32_t)); - HDassert(wbuf); - rbuf = (int32_t *)HDcalloc((size_t)s, sizeof(int32_t)); - HDassert(rbuf); + wbuf = (int32_t *)malloc((size_t)s * sizeof(int32_t)); + assert(wbuf); + rbuf = (int32_t *)calloc((size_t)s, sizeof(int32_t)); + assert(rbuf); /* Fill up write buffer */ for (i = 0; i < s; i++) @@ -1232,13 +1232,13 @@ test_accum_adjust(H5F_t *f) /* Read back and verify first write */ if (accum_read((1024 * 1024), (1024 * 1024) - 1, rbuf) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(wbuf, rbuf, (size_t)((1024 * 1024) - 1)) != 0) + if (memcmp(wbuf, rbuf, (size_t)((1024 * 1024) - 1)) != 0) TEST_ERROR; /* Read back and verify second write */ if (accum_read((1024 * 1024) - 1024, 1024, rbuf) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(wbuf, rbuf, (size_t)1024) != 0) + if (memcmp(wbuf, rbuf, (size_t)1024) != 0) TEST_ERROR; /* Reset accumulator for next case */ @@ -1269,12 +1269,12 @@ test_accum_adjust(H5F_t *f) /* Read back and verify both pieces of data */ if (accum_read(1048576, 1048575, rbuf) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(wbuf, rbuf, (size_t)1048576) != 0) + if (memcmp(wbuf, rbuf, (size_t)1048576) != 0) TEST_ERROR; if (accum_read(5, 1048571, rbuf) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(wbuf, rbuf, (size_t)1048571) != 0) + if (memcmp(wbuf, rbuf, (size_t)1048571) != 0) TEST_ERROR; /* Reset accumulator for next case */ @@ -1316,7 +1316,7 @@ test_accum_adjust(H5F_t *f) the data is as expected */ if (accum_read((1024 * 1024) - 1, 1024, rbuf) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(wbuf, rbuf, (size_t)1024) != 0) + if (memcmp(wbuf, rbuf, (size_t)1024) != 0) TEST_ERROR; /* Reset accumulator for next case */ @@ -1364,7 +1364,7 @@ test_accum_adjust(H5F_t *f) the data is as expected */ if (accum_read(1048571, 349523, rbuf) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(wbuf, rbuf, (size_t)349523) != 0) + if (memcmp(wbuf, rbuf, (size_t)349523) != 0) TEST_ERROR; /* Reset accumulator for next case */ @@ -1409,7 +1409,7 @@ test_accum_adjust(H5F_t *f) the data is as expected */ if (accum_read((1024 * 1024) - 5, 10, rbuf) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(wbuf, rbuf, (size_t)10) != 0) + if (memcmp(wbuf, rbuf, (size_t)10) != 0) TEST_ERROR; /* Reset accumulator for next case */ @@ -1447,7 +1447,7 @@ test_accum_adjust(H5F_t *f) the data is as expected */ if (accum_read(1048571, 349523, rbuf) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(wbuf, rbuf, (size_t)349523) != 0) + if (memcmp(wbuf, rbuf, (size_t)349523) != 0) TEST_ERROR; if (accum_reset(f) < 0) @@ -1456,15 +1456,15 @@ test_accum_adjust(H5F_t *f) PASSED(); /* Release memory */ - HDfree(wbuf); - HDfree(rbuf); + free(wbuf); + free(rbuf); return 0; error: /* Release memory */ - HDfree(wbuf); - HDfree(rbuf); + free(wbuf); + free(rbuf); return 1; } /* test_accum_adjust */ @@ -1497,10 +1497,10 @@ test_read_after(H5F_t *f) TESTING("reading data from both accumulator and disk"); /* Allocate buffers */ - wbuf = (int32_t *)HDmalloc((size_t)s * sizeof(int32_t)); - HDassert(wbuf); - rbuf = (int32_t *)HDcalloc((size_t)s, sizeof(int32_t)); - HDassert(rbuf); + wbuf = (int32_t *)malloc((size_t)s * sizeof(int32_t)); + assert(wbuf); + rbuf = (int32_t *)calloc((size_t)s, sizeof(int32_t)); + assert(rbuf); /* Fill up write buffer with 1s */ for (i = 0; i < s; i++) @@ -1536,7 +1536,7 @@ test_read_after(H5F_t *f) the data is as expected */ if (accum_read(512, 512, rbuf) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(wbuf, rbuf, (size_t)128) != 0) + if (memcmp(wbuf, rbuf, (size_t)128) != 0) TEST_ERROR; if (accum_reset(f) < 0) @@ -1545,15 +1545,15 @@ test_read_after(H5F_t *f) PASSED(); /* Release memory */ - HDfree(wbuf); - HDfree(rbuf); + free(wbuf); + free(rbuf); return 0; error: /* Release memory */ - HDfree(wbuf); - HDfree(rbuf); + free(wbuf); + free(rbuf); return 1; } /* end test_read_after */ @@ -1579,14 +1579,14 @@ test_big(H5F_t *f) unsigned u; /* Local index variable */ /* Allocate space for the write & read buffers */ - wbuf = (uint8_t *)HDmalloc((size_t)BIG_BUF_SIZE); - HDassert(wbuf); - wbuf2 = (uint8_t *)HDmalloc((size_t)BIG_BUF_SIZE); - HDassert(wbuf2); - rbuf = (uint8_t *)HDcalloc((size_t)(BIG_BUF_SIZE + 1536), (size_t)1); - HDassert(rbuf); - zbuf = (uint8_t *)HDcalloc((size_t)(BIG_BUF_SIZE + 1536), (size_t)1); - HDassert(zbuf); + wbuf = (uint8_t *)malloc((size_t)BIG_BUF_SIZE); + assert(wbuf); + wbuf2 = (uint8_t *)malloc((size_t)BIG_BUF_SIZE); + assert(wbuf2); + rbuf = (uint8_t *)calloc((size_t)(BIG_BUF_SIZE + 1536), (size_t)1); + assert(rbuf); + zbuf = (uint8_t *)calloc((size_t)(BIG_BUF_SIZE + 1536), (size_t)1); + assert(zbuf); /* Initialize write buffers */ for (u = 0; u < BIG_BUF_SIZE; u++) { @@ -1605,13 +1605,13 @@ test_big(H5F_t *f) FAIL_STACK_ERROR; /* Verify data read */ - if (HDmemcmp(wbuf, rbuf, (size_t)BIG_BUF_SIZE) != 0) + if (memcmp(wbuf, rbuf, (size_t)BIG_BUF_SIZE) != 0) TEST_ERROR; /* Reset data in file back to zeros & reset the read buffer */ if (accum_write(0, BIG_BUF_SIZE, zbuf) < 0) FAIL_STACK_ERROR; - HDmemset(rbuf, 0, (size_t)BIG_BUF_SIZE); + memset(rbuf, 0, (size_t)BIG_BUF_SIZE); if (accum_reset(f) < 0) FAIL_STACK_ERROR; @@ -1625,17 +1625,17 @@ test_big(H5F_t *f) FAIL_STACK_ERROR; /* Verify data read */ - if (HDmemcmp(zbuf, rbuf, (size_t)1024) != 0) + if (memcmp(zbuf, rbuf, (size_t)1024) != 0) TEST_ERROR; - if (HDmemcmp(wbuf, rbuf + 1024, (size_t)1024) != 0) + if (memcmp(wbuf, rbuf + 1024, (size_t)1024) != 0) TEST_ERROR; - if (HDmemcmp(zbuf, rbuf + 2048, (size_t)(BIG_BUF_SIZE - 2048)) != 0) + if (memcmp(zbuf, rbuf + 2048, (size_t)(BIG_BUF_SIZE - 2048)) != 0) TEST_ERROR; /* Reset data in file back to zeros & reset the read buffer */ if (accum_write(1024, 1024, zbuf) < 0) FAIL_STACK_ERROR; - HDmemset(rbuf, 0, (size_t)BIG_BUF_SIZE); + memset(rbuf, 0, (size_t)BIG_BUF_SIZE); if (accum_reset(f) < 0) FAIL_STACK_ERROR; @@ -1649,15 +1649,15 @@ test_big(H5F_t *f) FAIL_STACK_ERROR; /* Verify data read */ - if (HDmemcmp(zbuf, rbuf, (size_t)(BIG_BUF_SIZE - 512)) != 0) + if (memcmp(zbuf, rbuf, (size_t)(BIG_BUF_SIZE - 512)) != 0) TEST_ERROR; - if (HDmemcmp(wbuf, rbuf + (BIG_BUF_SIZE - 512), (size_t)512) != 0) + if (memcmp(wbuf, rbuf + (BIG_BUF_SIZE - 512), (size_t)512) != 0) TEST_ERROR; /* Reset data in file back to zeros & reset the read buffer */ if (accum_write(BIG_BUF_SIZE - 512, 1024, zbuf) < 0) FAIL_STACK_ERROR; - HDmemset(rbuf, 0, (size_t)BIG_BUF_SIZE); + memset(rbuf, 0, (size_t)BIG_BUF_SIZE); if (accum_reset(f) < 0) FAIL_STACK_ERROR; @@ -1671,15 +1671,15 @@ test_big(H5F_t *f) FAIL_STACK_ERROR; /* Verify data read */ - if (HDmemcmp(wbuf + 512, rbuf, (size_t)512) != 0) + if (memcmp(wbuf + 512, rbuf, (size_t)512) != 0) TEST_ERROR; - if (HDmemcmp(zbuf, rbuf + 512, (size_t)(BIG_BUF_SIZE - 512)) != 0) + if (memcmp(zbuf, rbuf + 512, (size_t)(BIG_BUF_SIZE - 512)) != 0) TEST_ERROR; /* Reset data in file back to zeros & reset the read buffer */ if (accum_write(0, 1024, zbuf) < 0) FAIL_STACK_ERROR; - HDmemset(rbuf, 0, (size_t)BIG_BUF_SIZE); + memset(rbuf, 0, (size_t)BIG_BUF_SIZE); if (accum_reset(f) < 0) FAIL_STACK_ERROR; @@ -1699,13 +1699,13 @@ test_big(H5F_t *f) FAIL_STACK_ERROR; /* Verify data read */ - if (HDmemcmp(wbuf2, rbuf, (size_t)BIG_BUF_SIZE) != 0) + if (memcmp(wbuf2, rbuf, (size_t)BIG_BUF_SIZE) != 0) TEST_ERROR; /* Reset data in file back to zeros & reset the read buffer */ if (accum_write(0, BIG_BUF_SIZE, zbuf) < 0) FAIL_STACK_ERROR; - HDmemset(rbuf, 0, (size_t)BIG_BUF_SIZE); + memset(rbuf, 0, (size_t)BIG_BUF_SIZE); if (accum_reset(f) < 0) FAIL_STACK_ERROR; @@ -1725,15 +1725,15 @@ test_big(H5F_t *f) FAIL_STACK_ERROR; /* Verify data read */ - if (HDmemcmp(wbuf2, rbuf, (size_t)BIG_BUF_SIZE) != 0) + if (memcmp(wbuf2, rbuf, (size_t)BIG_BUF_SIZE) != 0) TEST_ERROR; - if (HDmemcmp(wbuf + 512, rbuf + BIG_BUF_SIZE, (size_t)512) != 0) + if (memcmp(wbuf + 512, rbuf + BIG_BUF_SIZE, (size_t)512) != 0) TEST_ERROR; /* Reset data in file back to zeros & reset the read buffer */ if (accum_write(0, BIG_BUF_SIZE + 512, zbuf) < 0) FAIL_STACK_ERROR; - HDmemset(rbuf, 0, (size_t)(BIG_BUF_SIZE + 512)); + memset(rbuf, 0, (size_t)(BIG_BUF_SIZE + 512)); if (accum_reset(f) < 0) FAIL_STACK_ERROR; @@ -1758,17 +1758,17 @@ test_big(H5F_t *f) FAIL_STACK_ERROR; /* Verify data read */ - if (HDmemcmp(wbuf2, rbuf, (size_t)BIG_BUF_SIZE) != 0) + if (memcmp(wbuf2, rbuf, (size_t)BIG_BUF_SIZE) != 0) TEST_ERROR; - if (HDmemcmp(zbuf, rbuf + BIG_BUF_SIZE, (size_t)512) != 0) + if (memcmp(zbuf, rbuf + BIG_BUF_SIZE, (size_t)512) != 0) TEST_ERROR; - if (HDmemcmp(wbuf, rbuf + BIG_BUF_SIZE + 512, (size_t)512) != 0) + if (memcmp(wbuf, rbuf + BIG_BUF_SIZE + 512, (size_t)512) != 0) TEST_ERROR; /* Reset data in file back to zeros & reset the read buffer */ if (accum_write(0, BIG_BUF_SIZE + 1536, zbuf) < 0) FAIL_STACK_ERROR; - HDmemset(rbuf, 0, (size_t)(BIG_BUF_SIZE + 1024)); + memset(rbuf, 0, (size_t)(BIG_BUF_SIZE + 1024)); if (accum_reset(f) < 0) FAIL_STACK_ERROR; @@ -1795,15 +1795,15 @@ test_big(H5F_t *f) FAIL_STACK_ERROR; /* Verify data read */ - if (HDmemcmp(zbuf, rbuf, (size_t)1536) != 0) + if (memcmp(zbuf, rbuf, (size_t)1536) != 0) TEST_ERROR; - if (HDmemcmp(wbuf2, rbuf + 1536, (size_t)BIG_BUF_SIZE) != 0) + if (memcmp(wbuf2, rbuf + 1536, (size_t)BIG_BUF_SIZE) != 0) TEST_ERROR; /* Reset data in file back to zeros & reset the read buffer */ if (accum_write(1536, BIG_BUF_SIZE, zbuf) < 0) FAIL_STACK_ERROR; - HDmemset(rbuf, 0, (size_t)(BIG_BUF_SIZE + 1536)); + memset(rbuf, 0, (size_t)(BIG_BUF_SIZE + 1536)); if (accum_reset(f) < 0) FAIL_STACK_ERROR; @@ -1828,15 +1828,15 @@ test_big(H5F_t *f) FAIL_STACK_ERROR; /* Verify data read */ - if (HDmemcmp(zbuf, rbuf, (size_t)512) != 0) + if (memcmp(zbuf, rbuf, (size_t)512) != 0) TEST_ERROR; - if (HDmemcmp(wbuf2, rbuf + 512, (size_t)BIG_BUF_SIZE) != 0) + if (memcmp(wbuf2, rbuf + 512, (size_t)BIG_BUF_SIZE) != 0) TEST_ERROR; /* Reset data in file back to zeros & reset the read buffer */ if (accum_write(512, BIG_BUF_SIZE, zbuf) < 0) FAIL_STACK_ERROR; - HDmemset(rbuf, 0, (size_t)(BIG_BUF_SIZE + 512)); + memset(rbuf, 0, (size_t)(BIG_BUF_SIZE + 512)); if (accum_reset(f) < 0) FAIL_STACK_ERROR; @@ -1861,17 +1861,17 @@ test_big(H5F_t *f) FAIL_STACK_ERROR; /* Verify data read */ - if (HDmemcmp(wbuf, rbuf, (size_t)1024) != 0) + if (memcmp(wbuf, rbuf, (size_t)1024) != 0) TEST_ERROR; - if (HDmemcmp(zbuf, rbuf + 1024, (size_t)512) != 0) + if (memcmp(zbuf, rbuf + 1024, (size_t)512) != 0) TEST_ERROR; - if (HDmemcmp(wbuf2, rbuf + 1536, (size_t)BIG_BUF_SIZE) != 0) + if (memcmp(wbuf2, rbuf + 1536, (size_t)BIG_BUF_SIZE) != 0) TEST_ERROR; /* Reset data in file back to zeros & reset the read buffer */ if (accum_write(0, BIG_BUF_SIZE + 1536, zbuf) < 0) FAIL_STACK_ERROR; - HDmemset(rbuf, 0, (size_t)(BIG_BUF_SIZE + 1536)); + memset(rbuf, 0, (size_t)(BIG_BUF_SIZE + 1536)); if (accum_reset(f) < 0) FAIL_STACK_ERROR; @@ -1896,9 +1896,9 @@ test_big(H5F_t *f) FAIL_STACK_ERROR; /* Verify data read */ - if (HDmemcmp(wbuf, rbuf, (size_t)512) != 0) + if (memcmp(wbuf, rbuf, (size_t)512) != 0) TEST_ERROR; - if (HDmemcmp(wbuf2, rbuf + 512, (size_t)BIG_BUF_SIZE) != 0) + if (memcmp(wbuf2, rbuf + 512, (size_t)BIG_BUF_SIZE) != 0) TEST_ERROR; if (accum_reset(f) < 0) @@ -1907,18 +1907,18 @@ test_big(H5F_t *f) PASSED(); /* Release memory */ - HDfree(wbuf); - HDfree(wbuf2); - HDfree(rbuf); - HDfree(zbuf); + free(wbuf); + free(wbuf2); + free(rbuf); + free(zbuf); return 0; error: - HDfree(wbuf); - HDfree(wbuf2); - HDfree(rbuf); - HDfree(zbuf); + free(wbuf); + free(wbuf2); + free(rbuf); + free(zbuf); return 1; } /* end test_big() */ @@ -1950,10 +1950,10 @@ test_random_write(H5F_t *f) unsigned u; /* Local index variable */ /* Allocate space for the write & read buffers */ - wbuf = (uint8_t *)HDmalloc((size_t)RANDOM_BUF_SIZE); - HDassert(wbuf); - rbuf = (uint8_t *)HDcalloc((size_t)RANDOM_BUF_SIZE, (size_t)1); - HDassert(rbuf); + wbuf = (uint8_t *)malloc((size_t)RANDOM_BUF_SIZE); + assert(wbuf); + rbuf = (uint8_t *)calloc((size_t)RANDOM_BUF_SIZE, (size_t)1); + assert(rbuf); /* Initialize write buffer */ for (u = 0; u < RANDOM_BUF_SIZE; u++) @@ -1965,15 +1965,15 @@ test_random_write(H5F_t *f) seed = (unsigned)HDtime(NULL); #if 0 /* seed = (unsigned)1155438845; */ -HDfprintf(stderr, "Random # seed was: %u\n", seed); +fprintf(stderr, "Random # seed was: %u\n", seed); #endif HDsrandom(seed); /* Allocate space for the segment length buffer */ - off = (size_t *)HDmalloc(MAX_RANDOM_SEGMENTS * sizeof(size_t)); - HDassert(off); - len = (size_t *)HDmalloc(MAX_RANDOM_SEGMENTS * sizeof(size_t)); - HDassert(len); + off = (size_t *)malloc(MAX_RANDOM_SEGMENTS * sizeof(size_t)); + assert(off); + len = (size_t *)malloc(MAX_RANDOM_SEGMENTS * sizeof(size_t)); + assert(len); /* Randomly choose lengths of segments */ cur_off = 0; @@ -2035,7 +2035,7 @@ HDfprintf(stderr, "Random # seed was: %u\n", seed); /* Verify individual reads */ if (accum_read(RANDOM_BASE_OFF + off[u], len[u], rbuf) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(wbuf + off[u], rbuf, len[u]) != 0) + if (memcmp(wbuf + off[u], rbuf, len[u]) != 0) TEST_ERROR; } /* end for */ @@ -2044,7 +2044,7 @@ HDfprintf(stderr, "Random # seed was: %u\n", seed); FAIL_STACK_ERROR; /* Verify data read back in */ - if (HDmemcmp(wbuf, rbuf, (size_t)RANDOM_BUF_SIZE) != 0) + if (memcmp(wbuf, rbuf, (size_t)RANDOM_BUF_SIZE) != 0) TEST_ERROR; if (accum_reset(f) < 0) @@ -2053,21 +2053,21 @@ HDfprintf(stderr, "Random # seed was: %u\n", seed); PASSED(); /* Release memory */ - HDfree(wbuf); - HDfree(rbuf); - HDfree(off); - HDfree(len); + free(wbuf); + free(rbuf); + free(off); + free(len); return 0; error: /* Release memory */ - HDfree(wbuf); - HDfree(rbuf); - HDfree(off); - HDfree(len); + free(wbuf); + free(rbuf); + free(off); + free(len); - HDfprintf(stderr, "Random # seed was: %u\n", seed); + fprintf(stderr, "Random # seed was: %u\n", seed); return 1; } /* end test_random_write() */ @@ -2176,9 +2176,9 @@ test_swmr_write_big(hbool_t newest_format) FAIL_STACK_ERROR; /* Allocate space for the write & read buffers */ - if ((wbuf2 = (uint8_t *)HDmalloc((size_t)BIG_BUF_SIZE)) == NULL) + if ((wbuf2 = (uint8_t *)malloc((size_t)BIG_BUF_SIZE)) == NULL) FAIL_STACK_ERROR; - if ((rbuf = (uint8_t *)HDmalloc((size_t)BIG_BUF_SIZE)) == NULL) + if ((rbuf = (uint8_t *)malloc((size_t)BIG_BUF_SIZE)) == NULL) FAIL_STACK_ERROR; /* Initialize wbuf with "0, 1, 2...1024"*/ @@ -2192,7 +2192,7 @@ test_swmr_write_big(hbool_t newest_format) if (H5F_block_read(rf, H5FD_MEM_DEFAULT, (haddr_t)1024, (size_t)1024, rbuf) < 0) FAIL_STACK_ERROR; /* Verify the data read is correct */ - if (HDmemcmp(wbuf, rbuf, (size_t)1024) != 0) + if (memcmp(wbuf, rbuf, (size_t)1024) != 0) TEST_ERROR; /* Flush the data to disk */ if (accum_reset(rf) < 0) @@ -2213,7 +2213,7 @@ test_swmr_write_big(hbool_t newest_format) if (H5F_block_read(rf, H5FD_MEM_DEFAULT, (haddr_t)1024, (size_t)1024, rbuf) < 0) FAIL_STACK_ERROR; /* Verify the data read is correct */ - if (HDmemcmp(wbuf, rbuf, (size_t)1024) != 0) + if (memcmp(wbuf, rbuf, (size_t)1024) != 0) TEST_ERROR; /* The data stays in the accumulator */ @@ -2224,7 +2224,7 @@ test_swmr_write_big(hbool_t newest_format) if (H5F_block_read(rf, H5FD_MEM_DEFAULT, (haddr_t)2048, (size_t)BIG_BUF_SIZE, rbuf) < 0) FAIL_STACK_ERROR; /* Verify the data read is correct */ - if (HDmemcmp(wbuf2, rbuf, (size_t)BIG_BUF_SIZE) != 0) + if (memcmp(wbuf2, rbuf, (size_t)BIG_BUF_SIZE) != 0) TEST_ERROR; #if defined(H5_HAVE_WIN32_API) @@ -2238,7 +2238,7 @@ test_swmr_write_big(hbool_t newest_format) ZeroMemory(&pi, sizeof(pi)); if (0 == CreateProcess(NULL, SWMR_READER, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi)) { - HDprintf("CreateProcess failed (%d).\n", GetLastError()); + printf("CreateProcess failed (%d).\n", GetLastError()); FAIL_STACK_ERROR; } @@ -2272,7 +2272,7 @@ test_swmr_write_big(hbool_t newest_format) char *const new_argv[] = {swmr_reader, NULL}; /* Run the reader */ status = HDexecv(SWMR_READER, new_argv); - HDprintf("errno from execv = %s\n", HDstrerror(errno)); + printf("errno from execv = %s\n", HDstrerror(errno)); FAIL_STACK_ERROR; } /* end if */ @@ -2309,9 +2309,9 @@ test_swmr_write_big(hbool_t newest_format) /* Release memory */ if (wbuf2) - HDfree(wbuf2); + free(wbuf2); if (rbuf) - HDfree(rbuf); + free(rbuf); PASSED(); return 0; @@ -2327,9 +2327,9 @@ error: /* Release memory */ if (wbuf2) - HDfree(wbuf2); + free(wbuf2); if (rbuf) - HDfree(rbuf); + free(rbuf); return 1; @@ -2355,31 +2355,31 @@ accum_printf(const H5F_t *f) { H5F_meta_accum_t *accum = &f->shared->accum; - HDprintf("\n"); - HDprintf("Current contents of accumulator:\n"); + printf("\n"); + printf("Current contents of accumulator:\n"); if (accum->alloc_size == 0) { - HDprintf("=====================================================\n"); - HDprintf(" No accumulator allocated.\n"); - HDprintf("=====================================================\n"); + printf("=====================================================\n"); + printf(" No accumulator allocated.\n"); + printf("=====================================================\n"); } else { - HDprintf("=====================================================\n"); - HDprintf(" accumulator allocated size == %zu\n", accum->alloc_size); - HDprintf(" accumulated data size == %zu\n", accum->size); - HDfprintf(stdout, " accumulator dirty? == %s\n", accum->dirty ? "TRUE" : "FALSE"); - HDprintf("=====================================================\n"); - HDfprintf(stdout, " start of accumulated data, loc = %" PRIuHADDR "\n", accum->loc); + printf("=====================================================\n"); + printf(" accumulator allocated size == %zu\n", accum->alloc_size); + printf(" accumulated data size == %zu\n", accum->size); + fprintf(stdout, " accumulator dirty? == %s\n", accum->dirty ? "TRUE" : "FALSE"); + printf("=====================================================\n"); + fprintf(stdout, " start of accumulated data, loc = %" PRIuHADDR "\n", accum->loc); if (accum->dirty) { - HDfprintf(stdout, " start of dirty region, loc = %" PRIuHADDR "\n", - (haddr_t)(accum->loc + accum->dirty_off)); - HDfprintf(stdout, " end of dirty region, loc = %" PRIuHADDR "\n", - (haddr_t)(accum->loc + accum->dirty_off + accum->dirty_len)); + fprintf(stdout, " start of dirty region, loc = %" PRIuHADDR "\n", + (haddr_t)(accum->loc + accum->dirty_off)); + fprintf(stdout, " end of dirty region, loc = %" PRIuHADDR "\n", + (haddr_t)(accum->loc + accum->dirty_off + accum->dirty_len)); } /* end if */ - HDfprintf(stdout, " end of accumulated data, loc = %" PRIuHADDR "\n", - (haddr_t)(accum->loc + accum->size)); - HDfprintf(stdout, " end of accumulator allocation, loc = %" PRIuHADDR "\n", - (haddr_t)(accum->loc + accum->alloc_size)); - HDprintf("=====================================================\n"); + fprintf(stdout, " end of accumulated data, loc = %" PRIuHADDR "\n", + (haddr_t)(accum->loc + accum->size)); + fprintf(stdout, " end of accumulator allocation, loc = %" PRIuHADDR "\n", + (haddr_t)(accum->loc + accum->alloc_size)); + printf("=====================================================\n"); } - HDprintf("\n\n"); + printf("\n\n"); } /* accum_printf() */ diff --git a/test/accum_swmr_reader.c b/test/accum_swmr_reader.c index 1269c5a..7f8e775 100644 --- a/test/accum_swmr_reader.c +++ b/test/accum_swmr_reader.c @@ -88,7 +88,7 @@ main(void) FAIL_STACK_ERROR; /* Verify the data read is correct */ - if (HDmemcmp(buf, rbuf, (size_t)1024) != 0) + if (memcmp(buf, rbuf, (size_t)1024) != 0) TEST_ERROR; /* CLose the file */ diff --git a/test/app_ref.c b/test/app_ref.c index 9b08650..f7a8378 100644 --- a/test/app_ref.c +++ b/test/app_ref.c @@ -72,9 +72,9 @@ Abrt_Handler(int H5_ATTR_UNUSED sig) const char *string = " ID reference count: "; for (i = 0; i < T_NUMCLASSES; i++) { - HDfprintf(stderr, "%s%s", IDNAME[i], string); + fprintf(stderr, "%s%s", IDNAME[i], string); n = (int)(strlen(IDNAME[i]) + strlen(string)); - HDfprintf(stderr, "%*d\n", (n < ERR_WIDTH) ? (ERR_WIDTH - n) : 0, rc[i]); + fprintf(stderr, "%*d\n", (n < ERR_WIDTH) ? (ERR_WIDTH - n) : 0, rc[i]); } } @@ -270,7 +270,7 @@ enough_room(hid_t fapl) fd[i] = -1; /* Get file name template */ - HDassert(H5FD_FAMILY == H5Pget_driver(fapl)); + assert(H5FD_FAMILY == H5Pget_driver(fapl)); h5_fixname(FILENAME[0], fapl, filename, sizeof(filename)); /* Create files */ @@ -322,9 +322,9 @@ writer(char *filename, hid_t fapl, fsizes_t testsize, int wrt_n) hsize_t hs_start[1]; hsize_t hs_size[1]; hid_t file = -1, space1 = -1, space2 = -1, mem_space = -1, d1 = -1, d2 = -1; - int *buf = (int *)HDmalloc(sizeof(int) * WRT_SIZE); + int *buf = (int *)malloc(sizeof(int) * WRT_SIZE); int i, j; - FILE *out = HDfopen(DNAME, "w"); + FILE *out = fopen(DNAME, "w"); hid_t dcpl; switch (testsize) { @@ -356,12 +356,12 @@ writer(char *filename, hid_t fapl, fsizes_t testsize, int wrt_n) case NO_FILE: /* what to do?? */ - HDfprintf(stdout, "Unexpected file size of NO_FILE\n"); + fprintf(stdout, "Unexpected file size of NO_FILE\n"); goto error; break; default: - HDfprintf(stdout, "Unexpected file size(%d)\n", testsize); + fprintf(stdout, "Unexpected file size(%d)\n", testsize); goto error; break; } @@ -404,7 +404,7 @@ writer(char *filename, hid_t fapl, fsizes_t testsize, int wrt_n) for (i = 0; i < wrt_n; i++) { /* start position must be at least hs_size from the end */ hs_start[0] = randll(size2[0] - hs_size[0], i); - HDfprintf(out, "#%03d 0x%016" PRIxHSIZE "\n", i, hs_start[0]); + fprintf(out, "#%03d 0x%016" PRIxHSIZE "\n", i, hs_start[0]); if (H5Sselect_hyperslab(space2, H5S_SELECT_SET, hs_start, NULL, hs_size, NULL) < 0) goto error; for (j = 0; j < WRT_SIZE; j++) { @@ -426,7 +426,7 @@ writer(char *filename, hid_t fapl, fsizes_t testsize, int wrt_n) goto error; if (H5Fclose(file) < 0) goto error; - HDfree(buf); + free(buf); HDfclose(out); PASSED(); return 0; @@ -443,7 +443,7 @@ error: } H5E_END_TRY; if (buf) - HDfree(buf); + free(buf); if (out) HDfclose(out); return 1; @@ -471,11 +471,11 @@ reader(char *filename, hid_t fapl) char ln[128], *s; hsize_t hs_offset[1]; hsize_t hs_size[1] = {WRT_SIZE}; - int *buf = (int *)HDmalloc(sizeof(int) * WRT_SIZE); + int *buf = (int *)malloc(sizeof(int) * WRT_SIZE); int i, j, zero, wrong, nerrors = 0; /* Open script file */ - script = HDfopen(DNAME, "r"); + script = fopen(DNAME, "r"); /* Open HDF5 file */ if ((file = H5Fopen(filename, H5F_ACC_RDONLY, fapl)) < 0) @@ -497,8 +497,8 @@ reader(char *filename, hid_t fapl) break; i = (int)HDstrtol(ln + 1, &s, 10); hs_offset[0] = HDstrtoull(s, NULL, 0); - HDfprintf(stdout, "#%03d 0x%016" PRIxHSIZE "%47s", i, hs_offset[0], ""); - HDfflush(stdout); + fprintf(stdout, "#%03d 0x%016" PRIxHSIZE "%47s", i, hs_offset[0], ""); + fflush(stdout); if (H5Sselect_hyperslab(fspace, H5S_SELECT_SET, hs_offset, NULL, hs_size, NULL) < 0) FAIL_STACK_ERROR; @@ -514,7 +514,7 @@ reader(char *filename, hid_t fapl) } if (zero) { H5_FAILED(); - HDprintf(" %d zero%s\n", zero, 1 == zero ? "" : "s"); + printf(" %d zero%s\n", zero, 1 == zero ? "" : "s"); } else if (wrong) { SKIPPED(); @@ -534,7 +534,7 @@ reader(char *filename, hid_t fapl) FAIL_STACK_ERROR; if (H5Fclose(file) < 0) FAIL_STACK_ERROR; - HDfree(buf); + free(buf); HDfclose(script); return nerrors; @@ -549,7 +549,7 @@ error: } H5E_END_TRY; if (buf) - HDfree(buf); + free(buf); if (script) HDfclose(script); return 1; @@ -570,18 +570,18 @@ error: static void usage(void) { - HDfprintf(stdout, - "Usage: big [-h] [-c] [-fsize <fsize>}\n" - "\t-h\tPrint the help page\n" - "\t-c\tFile system Checking skipped. Caution: this test generates\n" - "\t\tmany big files and may fill up the file system.\n" - "\t-fsize\tChange family size default to <fsize> where <fsize> is\n" - "\t\ta positive float point number. Default value is %" PRIuHSIZE ".\n" - "Examples:\n" - "\t big -fsize 2.1e9 \t# test with file size just under 2GB\n" - "\t big -fsize 2.2e9 \t# test with file size just above 2GB\n" - "\t Be sure the file system can support the file size requested\n", - (hsize_t)FAMILY_SIZE); + fprintf(stdout, + "Usage: big [-h] [-c] [-fsize <fsize>}\n" + "\t-h\tPrint the help page\n" + "\t-c\tFile system Checking skipped. Caution: this test generates\n" + "\t\tmany big files and may fill up the file system.\n" + "\t-fsize\tChange family size default to <fsize> where <fsize> is\n" + "\t\ta positive float point number. Default value is %" PRIuHSIZE ".\n" + "Examples:\n" + "\t big -fsize 2.1e9 \t# test with file size just under 2GB\n" + "\t big -fsize 2.2e9 \t# test with file size just above 2GB\n" + "\t Be sure the file system can support the file size requested\n", + (hsize_t)FAMILY_SIZE); } static int @@ -592,7 +592,7 @@ test_sec2(hid_t fapl) testsize = supports_big(); if (testsize == NO_FILE) { - HDfprintf(stdout, "Test for sec2 is skipped because file system does not support big files.\n"); + fprintf(stdout, "Test for sec2 is skipped because file system does not support big files.\n"); goto quit; } /* Test big file with the SEC2 driver */ @@ -627,7 +627,7 @@ test_stdio(hid_t fapl) testsize = supports_big(); if (testsize == NO_FILE) { - HDfprintf(stdout, "Test for stdio is skipped because file system does not support big files.\n"); + fprintf(stdout, "Test for stdio is skipped because file system does not support big files.\n"); goto quit; } HDputs("\nTesting big file with the STDIO Driver "); @@ -649,12 +649,12 @@ quit: /* Clean up the test file */ h5_clean_files(FILENAME, fapl); HDremove(DNAME); - HDfflush(stdout); + fflush(stdout); return 0; error: HDputs("*** TEST FAILED ***"); - HDfflush(stdout); + fflush(stdout); return 1; } /* end test_stdio() */ @@ -744,7 +744,7 @@ main(int ac, char **av) family_size_def = (hsize_t)HDstrtoull(*av, NULL, 0); } else { - HDprintf("***Missing fsize value***\n"); + printf("***Missing fsize value***\n"); usage(); return 1; } @@ -777,7 +777,7 @@ main(int ac, char **av) seed = (unsigned long)HDtime(NULL); #if 0 /* seed = (unsigned long)1155438845; */ - HDfprintf(stderr, "Random # seed was: %lu\n", seed); + fprintf(stderr, "Random # seed was: %lu\n", seed); #endif HDsrandom((unsigned)seed); diff --git a/test/bittests.c b/test/bittests.c index 285f404..6db1705 100644 --- a/test/bittests.c +++ b/test/bittests.c @@ -49,7 +49,7 @@ test_find(void) TESTING("bit search operations"); /* The zero length buffer */ - HDmemset(v1, 0xaa, sizeof v1); + memset(v1, 0xaa, sizeof v1); n = H5T__bit_find(v1, (size_t)0, (size_t)0, H5T_BIT_LSB, TRUE); if (-1 != n) { H5_FAILED(); @@ -64,7 +64,7 @@ test_find(void) } /* The zero buffer */ - HDmemset(v1, 0, sizeof v1); + memset(v1, 0, sizeof v1); n = H5T__bit_find(v1, (size_t)0, 8 * sizeof(v1), H5T_BIT_LSB, TRUE); if (-1 != n) { H5_FAILED(); @@ -80,24 +80,24 @@ test_find(void) /* Try all combinations of one byte */ for (i = 0; i < 8 * (int)sizeof(v1); i++) { - HDmemset(v1, 0, sizeof v1); + memset(v1, 0, sizeof v1); v1[i / 8] = (uint8_t)(1 << (i % 8)); n = H5T__bit_find(v1, (size_t)0, 8 * sizeof(v1), H5T_BIT_LSB, TRUE); if ((ssize_t)i != n) { H5_FAILED(); - HDprintf(" Test for set bit %d failed (lsb)!\n", i); + printf(" Test for set bit %d failed (lsb)!\n", i); goto failed; } n = H5T__bit_find(v1, (size_t)0, 8 * sizeof(v1), H5T_BIT_MSB, TRUE); if ((ssize_t)i != n) { H5_FAILED(); - HDprintf(" Test for set bit %d failed (msb)!\n", i); + printf(" Test for set bit %d failed (msb)!\n", i); goto failed; } } /* The one buffer */ - HDmemset(v1, 0xff, sizeof v1); + memset(v1, 0xff, sizeof v1); n = H5T__bit_find(v1, (size_t)0, 8 * sizeof(v1), H5T_BIT_LSB, FALSE); if (-1 != n) { H5_FAILED(); @@ -113,18 +113,18 @@ test_find(void) /* Try all combinations of one byte */ for (i = 0; i < 8 * (int)sizeof(v1); i++) { - HDmemset(v1, 0xff, sizeof v1); + memset(v1, 0xff, sizeof v1); v1[i / 8] &= (uint8_t) ~(1 << (i % 8)); n = H5T__bit_find(v1, (size_t)0, 8 * sizeof(v1), H5T_BIT_LSB, FALSE); if ((ssize_t)i != n) { H5_FAILED(); - HDprintf(" Test for clear bit %d failed (lsb)!\n", i); + printf(" Test for clear bit %d failed (lsb)!\n", i); goto failed; } n = H5T__bit_find(v1, (size_t)0, 8 * sizeof(v1), H5T_BIT_MSB, FALSE); if ((ssize_t)i != n) { H5_FAILED(); - HDprintf(" Test for clear bit %d failed (lsb)!\n", i); + printf(" Test for clear bit %d failed (lsb)!\n", i); goto failed; } } @@ -133,10 +133,10 @@ test_find(void) return 0; failed: - HDprintf(" v = 0x"); + printf(" v = 0x"); for (i = 0; i < (int)sizeof(v1); i++) - HDprintf("%02x", v1[i]); - HDprintf("\n"); + printf("%02x", v1[i]); + printf("\n"); return -1; } @@ -169,8 +169,8 @@ test_copy(void) d_offset = (size_t)HDrand() % (8 * sizeof v2); size = (unsigned)HDrand() % MIN(8 * sizeof(v1), 8 * sizeof(v2)); size = MIN3(size, 8 * sizeof(v1) - s_offset, 8 * sizeof(v2) - d_offset); - HDmemset(v1, 0xff, sizeof v1); - HDmemset(v2, 0x00, sizeof v2); + memset(v1, 0xff, sizeof v1); + memset(v2, 0x00, sizeof v2); /* Copy some bits to v2 and make sure something was copied */ H5T__bit_copy(v2, d_offset, v1, s_offset, size); @@ -192,9 +192,9 @@ test_copy(void) n = H5T__bit_find(v2, (size_t)0, 8 * sizeof(v2), H5T_BIT_LSB, 1); if (size > 0 && n != (ssize_t)d_offset) { H5_FAILED(); - HDprintf(" Unable to find first copied bit in destination " - "(n=%d)\n", - (int)n); + printf(" Unable to find first copied bit in destination " + "(n=%d)\n", + (int)n); goto failed; } if (0 == size && n >= 0) { @@ -205,9 +205,9 @@ test_copy(void) n = H5T__bit_find(v2, d_offset, 8 * sizeof(v2) - d_offset, H5T_BIT_LSB, 0); if (d_offset + size < 8 * sizeof(v2) && n != (ssize_t)size) { H5_FAILED(); - HDprintf(" Unable to find last copied bit in destination " - "(n=%d)\n", - (int)n); + printf(" Unable to find last copied bit in destination " + "(n=%d)\n", + (int)n); goto failed; } if (d_offset + size == 8 * sizeof(v2) && n >= 0) { @@ -223,9 +223,9 @@ test_copy(void) n = H5T__bit_find(v2, (size_t)0, 8 * sizeof(v2), H5T_BIT_MSB, 1); if (size > 0 && (size_t)(n + 1) != d_offset + size) { H5_FAILED(); - HDprintf(" Unable to find last copied bit in destination " - "(reverse, n=%d)\n", - (int)n); + printf(" Unable to find last copied bit in destination " + "(reverse, n=%d)\n", + (int)n); goto failed; } if (0 == size && n >= 0) { @@ -236,9 +236,9 @@ test_copy(void) n = H5T__bit_find(v2, (size_t)0, d_offset + size, H5T_BIT_MSB, 0); if (d_offset > 0 && n + 1 != (ssize_t)d_offset) { H5_FAILED(); - HDprintf(" Unable to find beginning of copied data " - "(reverse, n=%d)\n", - (int)n); + printf(" Unable to find beginning of copied data " + "(reverse, n=%d)\n", + (int)n); goto failed; } if (0 == d_offset && n >= 0) { @@ -252,15 +252,15 @@ test_copy(void) return 0; failed: - HDprintf(" i=%d, s_offset=%lu, d_offset=%lu, size=%lu\n", i, (unsigned long)s_offset, - (unsigned long)d_offset, (unsigned long)size); - HDprintf(" s = 0x"); + printf(" i=%d, s_offset=%lu, d_offset=%lu, size=%lu\n", i, (unsigned long)s_offset, + (unsigned long)d_offset, (unsigned long)size); + printf(" s = 0x"); for (j = sizeof(v1) - 1; j >= 0; --j) - HDprintf("%02x", v1[j]); - HDprintf("\n d = 0x"); + printf("%02x", v1[j]); + printf("\n d = 0x"); for (j = sizeof(v2) - 1; j >= 0; --j) - HDprintf("%02x", v2[j]); - HDprintf("\n"); + printf("%02x", v2[j]); + printf("\n"); return -1; } @@ -297,7 +297,7 @@ test_shift(void) shift_dist = (ssize_t)((size_t)HDrand() % size); /*-------- LEFT-shift some bits and make sure something was shifted --------*/ - HDmemset(vector, 0x00, sizeof vector); + memset(vector, 0x00, sizeof vector); H5T__bit_set(vector, offset, size, 1); H5T__bit_shift(vector, shift_dist, offset, size); @@ -306,9 +306,9 @@ test_shift(void) n = H5T__bit_find(vector, (size_t)0, 8 * sizeof(vector), H5T_BIT_LSB, 1); if (n != (ssize_t)offset + shift_dist) { H5_FAILED(); - HDprintf(" Unable to find first bit in destination " - "(n=%d)\n", - (int)n); + printf(" Unable to find first bit in destination " + "(n=%d)\n", + (int)n); goto failed; } @@ -319,14 +319,14 @@ test_shift(void) n = H5T__bit_find(vector, (size_t)0, 8 * sizeof(vector), H5T_BIT_MSB, 1); if (n != (ssize_t)(offset + size - 1)) { H5_FAILED(); - HDprintf(" Unable to find last bit in destination " - "(reverse, n=%d)\n", - (int)n); + printf(" Unable to find last bit in destination " + "(reverse, n=%d)\n", + (int)n); goto failed; } /*-------- RIGHT-shift some bits and make sure something was shifted --------*/ - HDmemset(vector, 0x00, sizeof vector); + memset(vector, 0x00, sizeof vector); H5T__bit_set(vector, offset, size, 1); H5T__bit_shift(vector, -shift_dist, offset, size); @@ -335,9 +335,9 @@ test_shift(void) n = H5T__bit_find(vector, (size_t)0, 8 * sizeof(vector), H5T_BIT_LSB, 1); if ((size_t)n != offset) { H5_FAILED(); - HDprintf(" Unable to find first bit in destination " - "(n=%d)\n", - (int)n); + printf(" Unable to find first bit in destination " + "(n=%d)\n", + (int)n); goto failed; } @@ -348,9 +348,9 @@ test_shift(void) n = H5T__bit_find(vector, (size_t)0, 8 * sizeof(vector), H5T_BIT_MSB, 1); if (n != (ssize_t)(offset + size) - shift_dist - 1) { H5_FAILED(); - HDprintf(" Unable to find last bit in destination " - "(reverse, n=%d)\n", - (int)n); + printf(" Unable to find last bit in destination " + "(reverse, n=%d)\n", + (int)n); goto failed; } @@ -363,7 +363,7 @@ test_shift(void) else shift_dist = -((ssize_t)size); - HDmemset(vector, 0x00, sizeof vector); + memset(vector, 0x00, sizeof vector); H5T__bit_set(vector, offset, size, 1); H5T__bit_shift(vector, shift_dist, offset, size); @@ -372,9 +372,9 @@ test_shift(void) n = H5T__bit_find(vector, (size_t)0, 8 * sizeof(vector), H5T_BIT_LSB, 1); if (n >= 0) { H5_FAILED(); - HDprintf(" Unable to verify all bits are zero in destination(LSB) " - "(n=%d)\n", - (int)n); + printf(" Unable to verify all bits are zero in destination(LSB) " + "(n=%d)\n", + (int)n); goto failed; } @@ -382,9 +382,9 @@ test_shift(void) n = H5T__bit_find(vector, (size_t)0, 8 * sizeof(vector), H5T_BIT_MSB, 1); if (n >= 0) { H5_FAILED(); - HDprintf(" Unable to verify all bits are zero in destination(MSB) " - "(n=%d)\n", - (int)n); + printf(" Unable to verify all bits are zero in destination(MSB) " + "(n=%d)\n", + (int)n); goto failed; } } @@ -393,11 +393,11 @@ test_shift(void) return 0; failed: - HDprintf(" i=%d, offset=%lu, size=%lu, shift_dist=%lu\n", i, (unsigned long)offset, - (unsigned long)size, (unsigned long)shift_dist); + printf(" i=%d, offset=%lu, size=%lu, shift_dist=%lu\n", i, (unsigned long)offset, (unsigned long)size, + (unsigned long)shift_dist); for (j = sizeof(vector) - 1; j >= 0; --j) - HDprintf("%02x", vector[j]); - HDprintf("\n"); + printf("%02x", vector[j]); + printf("\n"); return -1; } @@ -432,7 +432,7 @@ test_increment(void) if (size == 0) continue; - HDmemset(vector, 0x00, sizeof vector); + memset(vector, 0x00, sizeof vector); if (size > 1) /* if size=6, make a sequence like 011111 */ H5T__bit_set(vector, offset, size - 1, 1); else /* if size=1, just set this one bit to 1 */ @@ -445,16 +445,16 @@ test_increment(void) n = H5T__bit_find(vector, (size_t)0, 8 * sizeof(vector), H5T_BIT_LSB, 1); if (size != 1 && (size_t)n != offset + size - 1) { H5_FAILED(); - HDprintf(" Unable to find first bit in destination " - "(n=%d)\n", - (int)n); + printf(" Unable to find first bit in destination " + "(n=%d)\n", + (int)n); goto failed; } if (size == 1 && n >= 0) { H5_FAILED(); - HDprintf(" Unable to verify all-zero bit in destination " - "(n=%d)\n", - (int)n); + printf(" Unable to verify all-zero bit in destination " + "(n=%d)\n", + (int)n); goto failed; } @@ -465,16 +465,16 @@ test_increment(void) n = H5T__bit_find(vector, (size_t)0, 8 * sizeof(vector), H5T_BIT_MSB, 1); if (size != 1 && n != (ssize_t)(offset + size - 1)) { H5_FAILED(); - HDprintf(" Unable to find last bit in destination " - "(reverse, n=%d)\n", - (int)n); + printf(" Unable to find last bit in destination " + "(reverse, n=%d)\n", + (int)n); goto failed; } if (size == 1 && n >= 0) { H5_FAILED(); - HDprintf(" Unable to verify all-zero bit in destination " - "(reverse, n=%d)\n", - (int)n); + printf(" Unable to verify all-zero bit in destination " + "(reverse, n=%d)\n", + (int)n); goto failed; } } @@ -483,10 +483,10 @@ test_increment(void) return 0; failed: - HDprintf(" i=%d, offset=%lu, size=%lu\n", i, (unsigned long)offset, (unsigned long)size); + printf(" i=%d, offset=%lu, size=%lu\n", i, (unsigned long)offset, (unsigned long)size); for (j = sizeof(vector) - 1; j >= 0; --j) - HDprintf("%02x", vector[j]); - HDprintf("\n"); + printf("%02x", vector[j]); + printf("\n"); return -1; } @@ -522,7 +522,7 @@ test_decrement(void) continue; /* All-zero sequence will become 111111(size=6) after decrement */ - HDmemset(vector, 0x00, sizeof vector); + memset(vector, 0x00, sizeof vector); /* decrement the sequence by one */ H5T__bit_dec(vector, offset, size); @@ -531,9 +531,9 @@ test_decrement(void) n = H5T__bit_find(vector, (size_t)0, 8 * sizeof(vector), H5T_BIT_LSB, 1); if ((size_t)n != offset) { H5_FAILED(); - HDprintf(" Unable to find first bit in destination " - "(n=%d)\n", - (int)n); + printf(" Unable to find first bit in destination " + "(n=%d)\n", + (int)n); goto failed; } @@ -544,9 +544,9 @@ test_decrement(void) n = H5T__bit_find(vector, (size_t)0, 8 * sizeof(vector), H5T_BIT_MSB, 1); if (n != (ssize_t)(offset + size - 1)) { H5_FAILED(); - HDprintf(" Unable to find last bit in destination " - "(reverse, n=%d)\n", - (int)n); + printf(" Unable to find last bit in destination " + "(reverse, n=%d)\n", + (int)n); goto failed; } } @@ -555,10 +555,10 @@ test_decrement(void) return 0; failed: - HDprintf(" i=%d, offset=%lu, size=%lu\n", i, (unsigned long)offset, (unsigned long)size); + printf(" i=%d, offset=%lu, size=%lu\n", i, (unsigned long)offset, (unsigned long)size); for (j = sizeof(vector) - 1; j >= 0; --j) - HDprintf("%02x", vector[j]); - HDprintf("\n"); + printf("%02x", vector[j]); + printf("\n"); return -1; } @@ -594,7 +594,7 @@ test_negate(void) continue; /* All-zero sequence will become 111111(size=6) after negating */ - HDmemset(vector, 0x00, sizeof vector); + memset(vector, 0x00, sizeof vector); /* negate the sequence */ H5T__bit_neg(vector, offset, size); @@ -603,9 +603,9 @@ test_negate(void) n = H5T__bit_find(vector, (size_t)0, 8 * sizeof(vector), H5T_BIT_LSB, 1); if ((size_t)n != offset) { H5_FAILED(); - HDprintf(" Unable to find first bit in destination " - "(n=%d)\n", - (int)n); + printf(" Unable to find first bit in destination " + "(n=%d)\n", + (int)n); goto failed; } @@ -616,14 +616,14 @@ test_negate(void) n = H5T__bit_find(vector, (size_t)0, 8 * sizeof(vector), H5T_BIT_MSB, 1); if (n != (ssize_t)(offset + size - 1)) { H5_FAILED(); - HDprintf(" Unable to find last bit in destination " - "(reverse, n=%d)\n", - (int)n); + printf(" Unable to find last bit in destination " + "(reverse, n=%d)\n", + (int)n); goto failed; } /* All-one sequence will become 000000(size=6) after negating */ - HDmemset(vector, 0x00, sizeof vector); + memset(vector, 0x00, sizeof vector); H5T__bit_set(vector, offset, size, 1); /* negate the sequence */ @@ -633,9 +633,9 @@ test_negate(void) n = H5T__bit_find(vector, (size_t)0, 8 * sizeof(vector), H5T_BIT_LSB, 1); if (n >= 0) { H5_FAILED(); - HDprintf(" Unable to verify all-zero bits in destination " - "(n=%d)\n", - (int)n); + printf(" Unable to verify all-zero bits in destination " + "(n=%d)\n", + (int)n); goto failed; } @@ -646,9 +646,9 @@ test_negate(void) n = H5T__bit_find(vector, (size_t)0, 8 * sizeof(vector), H5T_BIT_MSB, 1); if (n >= 0) { H5_FAILED(); - HDprintf(" Unable to verify all-zero bits in destination " - "(reverse, n=%d)\n", - (int)n); + printf(" Unable to verify all-zero bits in destination " + "(reverse, n=%d)\n", + (int)n); goto failed; } } @@ -657,10 +657,10 @@ test_negate(void) return 0; failed: - HDprintf(" i=%d, offset=%lu, size=%lu\n", i, (unsigned long)offset, (unsigned long)size); + printf(" i=%d, offset=%lu, size=%lu\n", i, (unsigned long)offset, (unsigned long)size); for (j = sizeof(vector) - 1; j >= 0; --j) - HDprintf("%02x", vector[j]); - HDprintf("\n"); + printf("%02x", vector[j]); + printf("\n"); return -1; } @@ -692,7 +692,7 @@ test_set(void) d_offset = (size_t)HDrand() % (8 * sizeof v2); size = (size_t)HDrand() % (8 * sizeof(v2)); size = MIN(size, 8 * sizeof(v2) - d_offset); - HDmemset(v2, 0x00, sizeof v2); + memset(v2, 0x00, sizeof v2); /* Set some bits in v2 */ H5T__bit_set(v2, d_offset, size, TRUE); @@ -714,9 +714,9 @@ test_set(void) n = H5T__bit_find(v2, (size_t)0, 8 * sizeof(v2), H5T_BIT_LSB, 1); if (size > 0 && n != (ssize_t)d_offset) { H5_FAILED(); - HDprintf(" Unable to find first set bit in destination " - "(n=%d)\n", - (int)n); + printf(" Unable to find first set bit in destination " + "(n=%d)\n", + (int)n); goto failed; } if (0 == size && n >= 0) { @@ -727,9 +727,9 @@ test_set(void) n = H5T__bit_find(v2, d_offset, 8 * sizeof(v2) - d_offset, H5T_BIT_LSB, 0); if (d_offset + size < 8 * sizeof(v2) && n != (ssize_t)size) { H5_FAILED(); - HDprintf(" Unable to find last set bit in destination " - "(n=%d)\n", - (int)n); + printf(" Unable to find last set bit in destination " + "(n=%d)\n", + (int)n); goto failed; } if (d_offset + size == 8 * sizeof(v2) && n >= 0) { @@ -745,9 +745,9 @@ test_set(void) n = H5T__bit_find(v2, (size_t)0, 8 * sizeof(v2), H5T_BIT_MSB, 1); if (size > 0 && (size_t)(n + 1) != d_offset + size) { H5_FAILED(); - HDprintf(" Unable to find last set bit in destination " - "(reverse, n=%d)\n", - (int)n); + printf(" Unable to find last set bit in destination " + "(reverse, n=%d)\n", + (int)n); goto failed; } if (0 == size && n >= 0) { @@ -758,9 +758,9 @@ test_set(void) n = H5T__bit_find(v2, (size_t)0, d_offset + size, H5T_BIT_MSB, 0); if (d_offset > 0 && n + 1 != (ssize_t)d_offset) { H5_FAILED(); - HDprintf(" Unable to find beginning of set bit region " - "(reverse, n=%d)\n", - (int)n); + printf(" Unable to find beginning of set bit region " + "(reverse, n=%d)\n", + (int)n); goto failed; } if (0 == d_offset && n >= 0) { @@ -774,11 +774,11 @@ test_set(void) return 0; failed: - HDprintf(" i=%d, d_offset=%lu, size=%lu\n", i, (unsigned long)d_offset, (unsigned long)size); - HDprintf(" d = 0x"); + printf(" i=%d, d_offset=%lu, size=%lu\n", i, (unsigned long)d_offset, (unsigned long)size); + printf(" d = 0x"); for (j = sizeof(v2) - 1; j >= 0; --j) - HDprintf("%02x", v2[j]); - HDprintf("\n"); + printf("%02x", v2[j]); + printf("\n"); return -1; } @@ -810,7 +810,7 @@ test_clear(void) d_offset = (size_t)HDrand() % (8 * sizeof v2); size = (size_t)HDrand() % (8 * sizeof(v2)); size = MIN(size, 8 * sizeof(v2) - d_offset); - HDmemset(v2, 0xff, sizeof v2); + memset(v2, 0xff, sizeof v2); /* Clear some bits in v2 */ H5T__bit_set(v2, d_offset, size, FALSE); @@ -832,9 +832,9 @@ test_clear(void) n = H5T__bit_find(v2, (size_t)0, 8 * sizeof(v2), H5T_BIT_LSB, 0); if (size > 0 && n != (ssize_t)d_offset) { H5_FAILED(); - HDprintf(" Unable to find first cleared bit in destination " - "(n=%d)\n", - (int)n); + printf(" Unable to find first cleared bit in destination " + "(n=%d)\n", + (int)n); goto failed; } if (0 == size && n >= 0) { @@ -845,9 +845,9 @@ test_clear(void) n = H5T__bit_find(v2, d_offset, 8 * sizeof(v2) - d_offset, H5T_BIT_LSB, 1); if (d_offset + size < 8 * sizeof(v2) && n != (ssize_t)size) { H5_FAILED(); - HDprintf(" Unable to find last cleared bit in destination " - "(n=%d)\n", - (int)n); + printf(" Unable to find last cleared bit in destination " + "(n=%d)\n", + (int)n); goto failed; } if (d_offset + size == 8 * sizeof(v2) && n >= 0) { @@ -863,9 +863,9 @@ test_clear(void) n = H5T__bit_find(v2, (size_t)0, 8 * sizeof(v2), H5T_BIT_MSB, 0); if (size > 0 && (size_t)(n + 1) != d_offset + size) { H5_FAILED(); - HDprintf(" Unable to find last cleared bit in destination " - "(reverse, n=%d)\n", - (int)n); + printf(" Unable to find last cleared bit in destination " + "(reverse, n=%d)\n", + (int)n); goto failed; } if (0 == size && n >= 0) { @@ -876,9 +876,9 @@ test_clear(void) n = H5T__bit_find(v2, (size_t)0, d_offset + size, H5T_BIT_MSB, 1); if (d_offset > 0 && n + 1 != (ssize_t)d_offset) { H5_FAILED(); - HDprintf(" Unable to find beginning of cleared bit region " - "(reverse, n=%d)\n", - (int)n); + printf(" Unable to find beginning of cleared bit region " + "(reverse, n=%d)\n", + (int)n); goto failed; } if (0 == d_offset && n >= 0) { @@ -892,11 +892,11 @@ test_clear(void) return 0; failed: - HDprintf(" i=%d, d_offset=%lu, size=%lu\n", i, (unsigned long)d_offset, (unsigned long)size); - HDprintf(" d = 0x"); + printf(" i=%d, d_offset=%lu, size=%lu\n", i, (unsigned long)d_offset, (unsigned long)size); + printf(" d = 0x"); for (j = sizeof(v2) - 1; j >= 0; --j) - HDprintf("%02x", v2[j]); - HDprintf("\n"); + printf("%02x", v2[j]); + printf("\n"); return -1; } @@ -932,12 +932,12 @@ main(void) nerrors += test_negate() < 0 ? 1 : 0; if (nerrors) { - HDprintf("***** %u FAILURE%s! *****\n", nerrors, 1 == nerrors ? "" : "S"); - HDexit(EXIT_FAILURE); + printf("***** %u FAILURE%s! *****\n", nerrors, 1 == nerrors ? "" : "S"); + exit(EXIT_FAILURE); } - HDprintf("All bit tests passed.\n"); + printf("All bit tests passed.\n"); H5close(); - HDexit(EXIT_SUCCESS); + exit(EXIT_SUCCESS); } /* end main() */ diff --git a/test/btree2.c b/test/btree2.c index 35d35d7..1bb0550 100644 --- a/test/btree2.c +++ b/test/btree2.c @@ -62,7 +62,7 @@ static int init_cparam(H5B2_create_t *cparam, H5B2_create_t *cparam2) { /* Wipe out background */ - HDmemset(cparam, 0, sizeof(*cparam)); + memset(cparam, 0, sizeof(*cparam)); /* General parameters */ cparam->cls = H5B2_TEST; @@ -72,7 +72,7 @@ init_cparam(H5B2_create_t *cparam, H5B2_create_t *cparam2) cparam->merge_percent = 40; /* Wipe out background */ - HDmemset(cparam2, 0, sizeof(*cparam2)); + memset(cparam2, 0, sizeof(*cparam2)); /* General parameters */ cparam2->cls = H5B2_TEST2; @@ -476,8 +476,8 @@ index_rec_cb(const void *_record, void *_op_data) const H5B2_test_rec_t *record = (const H5B2_test_rec_t *)_record; H5B2_test_rec_t *search = (H5B2_test_rec_t *)_op_data; - HDassert(record); - HDassert(search); + assert(record); + assert(search); search->key = record->key; search->val = record->val; @@ -554,7 +554,7 @@ modify_rec_cb(void *_record, void *_op_data, hbool_t *changed) H5B2_test_rec_t *record = (H5B2_test_rec_t *)_record; H5B2_test_rec_t *modify = (H5B2_test_rec_t *)_op_data; - HDassert(record->key == modify->key); + assert(record->key == modify->key); record->val = modify->val; *changed = TRUE; @@ -3008,7 +3008,7 @@ test_insert_lots(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t curr_time = HDtime(NULL); #if 0 curr_time=1109170019; -HDfprintf(stderr,"curr_time=%lu\n",(unsigned long)curr_time); +fprintf(stderr,"curr_time=%lu\n",(unsigned long)curr_time); #endif HDsrandom((unsigned)curr_time); @@ -3018,7 +3018,7 @@ HDfprintf(stderr,"curr_time=%lu\n",(unsigned long)curr_time); TESTING("B-tree insert: create random level 4 B-tree"); /* Allocate space for the records */ - if (NULL == (records = (hsize_t *)HDmalloc(sizeof(hsize_t) * INSERT_MANY))) + if (NULL == (records = (hsize_t *)malloc(sizeof(hsize_t) * INSERT_MANY))) TEST_ERROR; /* Initialize record #'s */ @@ -3198,7 +3198,7 @@ HDfprintf(stderr,"curr_time=%lu\n",(unsigned long)curr_time); PASSED(); - HDfree(records); + free(records); return 0; @@ -3210,7 +3210,7 @@ error: H5Fclose(file); } H5E_END_TRY; - HDfree(records); + free(records); return 1; } /* test_insert_lots() */ @@ -5102,7 +5102,7 @@ test_update_lots(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t curr_time = HDtime(NULL); #if 0 curr_time = 1451342093; -HDfprintf(stderr, "curr_time = %lu\n", (unsigned long)curr_time); +fprintf(stderr, "curr_time = %lu\n", (unsigned long)curr_time); #endif HDsrandom((unsigned)curr_time); @@ -5112,7 +5112,7 @@ HDfprintf(stderr, "curr_time = %lu\n", (unsigned long)curr_time); TESTING("B-tree update: create random level 4 B-tree"); /* Allocate space for the records */ - if (NULL == (records = (H5B2_test_rec_t *)HDmalloc(sizeof(H5B2_test_rec_t) * INSERT_MANY_REC))) + if (NULL == (records = (H5B2_test_rec_t *)malloc(sizeof(H5B2_test_rec_t) * INSERT_MANY_REC))) TEST_ERROR; /* Initialize record #'s */ @@ -5300,12 +5300,12 @@ HDfprintf(stderr, "curr_time = %lu\n", (unsigned long)curr_time); PASSED(); - HDfree(records); + free(records); return 0; error: - HDfprintf(stderr, "curr_time = %lu\n", (unsigned long)curr_time); + fprintf(stderr, "curr_time = %lu\n", (unsigned long)curr_time); H5E_BEGIN_TRY { if (bt2) @@ -5313,7 +5313,7 @@ error: H5Fclose(file); } H5E_END_TRY; - HDfree(records); + free(records); return 1; } /* test_update_lots() */ @@ -8814,7 +8814,7 @@ test_remove_lots(const char *env_h5_drvr, hid_t fapl, const H5B2_create_t *cpara curr_time = HDtime(NULL); #if 0 curr_time = 1163537969; -HDfprintf(stderr, "curr_time = %lu\n", (unsigned long)curr_time); +fprintf(stderr, "curr_time = %lu\n", (unsigned long)curr_time); #endif HDsrandom((unsigned)curr_time); @@ -8823,7 +8823,7 @@ HDfprintf(stderr, "curr_time = %lu\n", (unsigned long)curr_time); */ /* Allocate space for the records */ - if (NULL == (records = (hsize_t *)HDmalloc(sizeof(hsize_t) * INSERT_MANY))) + if (NULL == (records = (hsize_t *)malloc(sizeof(hsize_t) * INSERT_MANY))) TEST_ERROR; /* Initialize record #'s */ @@ -8861,7 +8861,7 @@ HDfprintf(stderr, "curr_time = %lu\n", (unsigned long)curr_time); TEST_ERROR; /* Allocate space for the file data */ - if (NULL == (file_data = HDmalloc((size_t)sb.st_size))) + if (NULL == (file_data = malloc((size_t)sb.st_size))) TEST_ERROR; /* Read file's data into memory */ @@ -9192,9 +9192,9 @@ HDfprintf(stderr, "curr_time = %lu\n", (unsigned long)curr_time); PASSED(); if (records) - HDfree(records); + free(records); if (file_data) - HDfree(file_data); + free(file_data); return 0; @@ -9210,9 +9210,9 @@ error: if (fd > 0) HDclose(fd); if (records) - HDfree(records); + free(records); if (file_data) - HDfree(file_data); + free(file_data); return 1; } /* test_remove_lots() */ @@ -9246,7 +9246,7 @@ test_find_neighbor(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param herr_t ret; /* Generic error return value */ /* Allocate space for the records */ - if (NULL == (records = (hsize_t *)HDmalloc(sizeof(hsize_t) * FIND_NEIGHBOR))) + if (NULL == (records = (hsize_t *)malloc(sizeof(hsize_t) * FIND_NEIGHBOR))) TEST_ERROR; /* Initialize record #'s */ @@ -9426,7 +9426,7 @@ test_find_neighbor(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param PASSED(); - HDfree(records); + free(records); return 0; @@ -9438,7 +9438,7 @@ error: H5Fclose(file); } H5E_END_TRY; - HDfree(records); + free(records); return 1; } /* test_find_neighbor() */ @@ -10139,7 +10139,7 @@ main(void) ExpressMode = 2; if (ExpressMode > 1) - HDprintf("***Express test mode on. Some tests may be skipped\n"); + printf("***Express test mode on. Some tests may be skipped\n"); /* Initialize v2 B-tree creation parameters */ init_cparam(&cparam, &cparam2); @@ -10152,11 +10152,11 @@ main(void) /* Loop over re-opening B-tree during tests */ for (reopen = FALSE; reopen <= TRUE; reopen++) { if (reopen) { - HDfprintf(stdout, "Testing with reopening B-tree:\n"); + fprintf(stdout, "Testing with reopening B-tree:\n"); tparam.reopen_btree = TRUE; } /* end if */ else { - HDfprintf(stdout, "Testing without reopening B-tree:\n"); + fprintf(stdout, "Testing without reopening B-tree:\n"); tparam.reopen_btree = FALSE; } /* end else */ @@ -10176,7 +10176,7 @@ main(void) nerrors += test_insert_level2_3internal_redistrib(fapl, &cparam, &tparam); nerrors += test_insert_level2_3internal_split(fapl, &cparam, &tparam); if (ExpressMode > 1) - HDprintf("***Express test mode on. test_insert_lots skipped\n"); + printf("***Express test mode on. test_insert_lots skipped\n"); else nerrors += test_insert_lots(fapl, &cparam, &tparam); @@ -10190,7 +10190,7 @@ main(void) nerrors += test_update_level1_middle_split(fapl, &cparam2, &tparam); nerrors += test_update_make_level2(fapl, &cparam2, &tparam); if (ExpressMode > 1) - HDprintf("***Express test mode on. test_update_lots skipped\n"); + printf("***Express test mode on. test_update_lots skipped\n"); else nerrors += test_update_lots(fapl, &cparam2, &tparam); @@ -10217,7 +10217,7 @@ main(void) nerrors += test_remove_level2_3internal_merge(fapl, &cparam, &tparam); nerrors += test_remove_level2_collapse_right(fapl, &cparam, &tparam); if (ExpressMode > 1) - HDprintf("***Express test mode on. test_remove_lots skipped\n"); + printf("***Express test mode on. test_remove_lots skipped\n"); else nerrors += test_remove_lots(envval, fapl, &cparam); diff --git a/test/cache.c b/test/cache.c index 517c0b5..39cc0c9 100644 --- a/test/cache.c +++ b/test/cache.c @@ -286,7 +286,7 @@ smoke_check_1(int express_test, unsigned paged) default: SKIPPED(); - HDfprintf(stdout, " Long tests disabled.\n"); + fprintf(stdout, " Long tests disabled.\n"); return 0; /* <========== note return */ break; } @@ -294,17 +294,17 @@ smoke_check_1(int express_test, unsigned paged) pass = TRUE; if (show_progress) /* 1 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); reset_entries(); if (show_progress) /* 2 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); file_ptr = setup_cache((size_t)(4 * 1024 * 1024), (size_t)(2 * 1024 * 1024), paged); if (show_progress) /* 3 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); row_major_scan_forward(/* file_ptr */ file_ptr, /* max_index */ max_index, @@ -322,7 +322,7 @@ smoke_check_1(int express_test, unsigned paged) /* dirty_unprotects */ dirty_unprotects); if (show_progress) /* 4 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); row_major_scan_backward(/* file_ptr */ file_ptr, /* max_index */ max_index, @@ -340,7 +340,7 @@ smoke_check_1(int express_test, unsigned paged) /* dirty_unprotects */ dirty_unprotects); if (show_progress) /* 5 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); row_major_scan_forward(/* file_ptr */ file_ptr, /* max_index */ max_index, @@ -358,7 +358,7 @@ smoke_check_1(int express_test, unsigned paged) /* dirty_unprotects */ dirty_unprotects); if (show_progress) /* 6 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); /* flush and destroy all entries in the cache: */ @@ -368,7 +368,7 @@ smoke_check_1(int express_test, unsigned paged) /* dump_detailed_stats */ FALSE); if (show_progress) /* 7 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); col_major_scan_forward(/* file_ptr */ file_ptr, /* max_index */ max_index, @@ -381,7 +381,7 @@ smoke_check_1(int express_test, unsigned paged) /* dirty_unprotects */ dirty_unprotects); if (show_progress) /* 8 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); /* flush all entries in the cache: */ @@ -391,7 +391,7 @@ smoke_check_1(int express_test, unsigned paged) /* dump_detailed_stats */ FALSE); if (show_progress) /* 9 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); col_major_scan_backward(/* file_ptr */ file_ptr, /* max_index */ max_index, @@ -404,12 +404,12 @@ smoke_check_1(int express_test, unsigned paged) /* dirty_unprotects */ dirty_unprotects); if (show_progress) /* 10 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); takedown_cache(file_ptr, display_stats, TRUE); if (show_progress) /* 11 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); verify_clean(); verify_unprotected(); @@ -423,7 +423,7 @@ smoke_check_1(int express_test, unsigned paged) if (!pass) { - HDfprintf(stdout, "%s(): failure_mssg = \"%s\".\n", __func__, failure_mssg); + fprintf(stdout, "%s(): failure_mssg = \"%s\".\n", __func__, failure_mssg); } return (unsigned)!pass; @@ -484,7 +484,7 @@ smoke_check_2(int express_test, unsigned paged) default: SKIPPED(); - HDfprintf(stdout, " Long tests disabled.\n"); + fprintf(stdout, " Long tests disabled.\n"); return 0; /* <========== note return */ break; } @@ -492,17 +492,17 @@ smoke_check_2(int express_test, unsigned paged) pass = TRUE; if (show_progress) /* 1 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); reset_entries(); if (show_progress) /* 2 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); file_ptr = setup_cache((size_t)(4 * 1024 * 1024), (size_t)(2 * 1024 * 1024), paged); if (show_progress) /* 3 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); row_major_scan_forward(/* file_ptr */ file_ptr, /* max_index */ max_index, @@ -520,7 +520,7 @@ smoke_check_2(int express_test, unsigned paged) /* dirty_unprotects */ dirty_unprotects); if (show_progress) /* 4 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); row_major_scan_backward(/* file_ptr */ file_ptr, /* max_index */ max_index, @@ -538,7 +538,7 @@ smoke_check_2(int express_test, unsigned paged) /* dirty_unprotects */ dirty_unprotects); if (show_progress) /* 5 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); row_major_scan_forward(/* file_ptr */ file_ptr, /* max_index */ max_index, @@ -556,7 +556,7 @@ smoke_check_2(int express_test, unsigned paged) /* dirty_unprotects */ dirty_unprotects); if (show_progress) /* 6 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); /* flush and destroy all entries in the cache: */ @@ -566,7 +566,7 @@ smoke_check_2(int express_test, unsigned paged) /* dump_detailed_stats */ FALSE); if (show_progress) /* 7 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); col_major_scan_forward(/* file_ptr */ file_ptr, /* max_index */ max_index, @@ -579,7 +579,7 @@ smoke_check_2(int express_test, unsigned paged) /* dirty_unprotects */ dirty_unprotects); if (show_progress) /* 8 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); /* flush all entries in the cache: */ @@ -589,7 +589,7 @@ smoke_check_2(int express_test, unsigned paged) /* dump_detailed_stats */ FALSE); if (show_progress) /* 9 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); col_major_scan_backward(/* file_ptr */ file_ptr, /* max_index */ max_index, @@ -602,12 +602,12 @@ smoke_check_2(int express_test, unsigned paged) /* dirty_unprotects */ dirty_unprotects); if (show_progress) /* 10 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); takedown_cache(file_ptr, display_stats, TRUE); if (show_progress) /* 11 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); verify_clean(); verify_unprotected(); @@ -621,7 +621,7 @@ smoke_check_2(int express_test, unsigned paged) if (!pass) { - HDfprintf(stdout, "%s(): failure_mssg = \"%s\".\n", __func__, failure_mssg); + fprintf(stdout, "%s(): failure_mssg = \"%s\".\n", __func__, failure_mssg); } return (unsigned)!pass; @@ -681,7 +681,7 @@ smoke_check_3(int express_test, unsigned paged) default: SKIPPED(); - HDfprintf(stdout, " Long tests disabled.\n"); + fprintf(stdout, " Long tests disabled.\n"); return 0; /* <========== note return */ break; } @@ -689,17 +689,17 @@ smoke_check_3(int express_test, unsigned paged) pass = TRUE; if (show_progress) /* 1 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); reset_entries(); if (show_progress) /* 2 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); file_ptr = setup_cache((size_t)(2 * 1024), (size_t)(1 * 1024), paged); if (show_progress) /* 3 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); row_major_scan_forward(/* file_ptr */ file_ptr, /* max_index */ max_index, @@ -717,7 +717,7 @@ smoke_check_3(int express_test, unsigned paged) /* dirty_unprotects */ dirty_unprotects); if (show_progress) /* 4 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); row_major_scan_backward(/* file_ptr */ file_ptr, /* max_index */ max_index, @@ -735,7 +735,7 @@ smoke_check_3(int express_test, unsigned paged) /* dirty_unprotects */ dirty_unprotects); if (show_progress) /* 5 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); row_major_scan_forward(/* file_ptr */ file_ptr, /* max_index */ max_index, @@ -753,7 +753,7 @@ smoke_check_3(int express_test, unsigned paged) /* dirty_unprotects */ dirty_unprotects); if (show_progress) /* 6 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); /* flush and destroy all entries in the cache: */ @@ -763,7 +763,7 @@ smoke_check_3(int express_test, unsigned paged) /* dump_detailed_stats */ FALSE); if (show_progress) /* 7 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); col_major_scan_forward(/* file_ptr */ file_ptr, /* max_index */ max_index, @@ -776,7 +776,7 @@ smoke_check_3(int express_test, unsigned paged) /* dirty_unprotects */ dirty_unprotects); if (show_progress) /* 8 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); /* flush all entries in the cache: */ @@ -786,7 +786,7 @@ smoke_check_3(int express_test, unsigned paged) /* dump_detailed_stats */ FALSE); if (show_progress) /* 9 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); col_major_scan_backward(/* file_ptr */ file_ptr, /* max_index */ max_index, @@ -799,12 +799,12 @@ smoke_check_3(int express_test, unsigned paged) /* dirty_unprotects */ dirty_unprotects); if (show_progress) /* 10 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); takedown_cache(file_ptr, display_stats, TRUE); if (show_progress) /* 11 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); verify_clean(); verify_unprotected(); @@ -818,7 +818,7 @@ smoke_check_3(int express_test, unsigned paged) if (!pass) { - HDfprintf(stdout, "%s(): failure_mssg = \"%s\".\n", __func__, failure_mssg); + fprintf(stdout, "%s(): failure_mssg = \"%s\".\n", __func__, failure_mssg); } return (unsigned)!pass; @@ -879,7 +879,7 @@ smoke_check_4(int express_test, unsigned paged) default: SKIPPED(); - HDfprintf(stdout, " Long tests disabled.\n"); + fprintf(stdout, " Long tests disabled.\n"); return 0; /* <========== note return */ break; } @@ -887,17 +887,17 @@ smoke_check_4(int express_test, unsigned paged) pass = TRUE; if (show_progress) /* 1 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); reset_entries(); if (show_progress) /* 2 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); file_ptr = setup_cache((size_t)(2 * 1024), (size_t)(1 * 1024), paged); if (show_progress) /* 3 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); row_major_scan_forward(/* file_ptr */ file_ptr, /* max_index */ max_index, @@ -915,7 +915,7 @@ smoke_check_4(int express_test, unsigned paged) /* dirty_unprotects */ dirty_unprotects); if (show_progress) /* 4 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); row_major_scan_backward(/* file_ptr */ file_ptr, /* max_index */ max_index, @@ -933,7 +933,7 @@ smoke_check_4(int express_test, unsigned paged) /* dirty_unprotects */ dirty_unprotects); if (show_progress) /* 5 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); row_major_scan_forward(/* file_ptr */ file_ptr, /* max_index */ max_index, @@ -951,7 +951,7 @@ smoke_check_4(int express_test, unsigned paged) /* dirty_unprotects */ dirty_unprotects); if (show_progress) /* 6 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); /* flush and destroy all entries in the cache: */ @@ -961,7 +961,7 @@ smoke_check_4(int express_test, unsigned paged) /* dump_detailed_stats */ FALSE); if (show_progress) /* 7 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); col_major_scan_forward(/* file_ptr */ file_ptr, /* max_index */ max_index, @@ -974,7 +974,7 @@ smoke_check_4(int express_test, unsigned paged) /* dirty_unprotects */ dirty_unprotects); if (show_progress) /* 8 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); /* flush all entries in the cache: */ @@ -984,7 +984,7 @@ smoke_check_4(int express_test, unsigned paged) /* dump_detailed_stats */ FALSE); if (show_progress) /* 9 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); col_major_scan_backward(/* file_ptr */ file_ptr, /* max_index */ max_index, @@ -997,12 +997,12 @@ smoke_check_4(int express_test, unsigned paged) /* dirty_unprotects */ dirty_unprotects); if (show_progress) /* 10 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); takedown_cache(file_ptr, display_stats, TRUE); if (show_progress) /* 11 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); verify_clean(); verify_unprotected(); @@ -1016,7 +1016,7 @@ smoke_check_4(int express_test, unsigned paged) if (!pass) { - HDfprintf(stdout, "%s(): failure_mssg = \"%s\".\n", __func__, failure_mssg); + fprintf(stdout, "%s(): failure_mssg = \"%s\".\n", __func__, failure_mssg); } return (unsigned)!pass; @@ -1117,7 +1117,7 @@ smoke_check_5(int express_test, unsigned paged) default: SKIPPED(); - HDfprintf(stdout, " Long tests disabled.\n"); + fprintf(stdout, " Long tests disabled.\n"); return 0; /* <========== note return */ break; } @@ -1125,12 +1125,12 @@ smoke_check_5(int express_test, unsigned paged) pass = TRUE; if (show_progress) /* 1 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); reset_entries(); if (show_progress) /* 2 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); file_ptr = setup_cache((size_t)(2 * 1024), (size_t)(1 * 1024), paged); cache_ptr = file_ptr->shared->cache; @@ -1147,7 +1147,7 @@ smoke_check_5(int express_test, unsigned paged) } if (show_progress) /* 3 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); hl_row_major_scan_forward(/* file_ptr */ file_ptr, /* max_index */ max_index, @@ -1158,7 +1158,7 @@ smoke_check_5(int express_test, unsigned paged) /* do_inserts */ FALSE); if (show_progress) /* 4 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); hl_row_major_scan_backward(/* file_ptr */ file_ptr, /* max_index */ max_index, @@ -1169,7 +1169,7 @@ smoke_check_5(int express_test, unsigned paged) /* do_inserts */ FALSE); if (show_progress) /* 5 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); hl_row_major_scan_forward(/* file_ptr */ file_ptr, /* max_index */ max_index, @@ -1180,7 +1180,7 @@ smoke_check_5(int express_test, unsigned paged) /* do_inserts */ TRUE); if (show_progress) /* 6 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); /* flush and destroy all entries in the cache: */ @@ -1190,7 +1190,7 @@ smoke_check_5(int express_test, unsigned paged) /* dump_detailed_stats */ FALSE); if (show_progress) /* 7 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); hl_col_major_scan_forward(/* file_ptr */ file_ptr, /* max_index */ max_index, @@ -1202,7 +1202,7 @@ smoke_check_5(int express_test, unsigned paged) /* dirty_unprotects */ dirty_unprotects); if (show_progress) /* 8 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); /* flush all entries in the cache: */ @@ -1212,7 +1212,7 @@ smoke_check_5(int express_test, unsigned paged) /* dump_detailed_stats */ FALSE); if (show_progress) /* 9 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); hl_col_major_scan_backward(/* file_ptr */ file_ptr, /* max_index */ max_index, @@ -1224,12 +1224,12 @@ smoke_check_5(int express_test, unsigned paged) /* dirty_unprotects */ dirty_unprotects); if (show_progress) /* 10 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); takedown_cache(file_ptr, display_stats, TRUE); if (show_progress) /* 11 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); verify_clean(); verify_unprotected(); @@ -1243,7 +1243,7 @@ smoke_check_5(int express_test, unsigned paged) if (!pass) { - HDfprintf(stdout, "%s(): failure_mssg = \"%s\".\n", __func__, failure_mssg); + fprintf(stdout, "%s(): failure_mssg = \"%s\".\n", __func__, failure_mssg); } return (unsigned)!pass; @@ -1346,18 +1346,18 @@ smoke_check_6(int express_test, unsigned paged) default: SKIPPED(); - HDfprintf(stdout, " Long tests disabled.\n"); + fprintf(stdout, " Long tests disabled.\n"); return 0; /* <========== note return */ break; } if (show_progress) /* 1 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); reset_entries(); if (show_progress) /* 2 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); file_ptr = setup_cache((size_t)(2 * 1024), (size_t)(1 * 1024), paged); cache_ptr = file_ptr->shared->cache; @@ -1374,7 +1374,7 @@ smoke_check_6(int express_test, unsigned paged) } if (show_progress) /* 3 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); hl_row_major_scan_forward(/* file_ptr */ file_ptr, /* max_index */ max_index, @@ -1385,7 +1385,7 @@ smoke_check_6(int express_test, unsigned paged) /* do_inserts */ FALSE); if (show_progress) /* 4 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); hl_row_major_scan_backward(/* file_ptr */ file_ptr, /* max_index */ max_index, @@ -1396,7 +1396,7 @@ smoke_check_6(int express_test, unsigned paged) /* do_inserts */ FALSE); if (show_progress) /* 5 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); hl_row_major_scan_forward(/* file_ptr */ file_ptr, /* max_index */ max_index, @@ -1407,7 +1407,7 @@ smoke_check_6(int express_test, unsigned paged) /* do_inserts */ TRUE); if (show_progress) /* 6 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); /* flush and destroy all entries in the cache: */ @@ -1417,7 +1417,7 @@ smoke_check_6(int express_test, unsigned paged) /* dump_detailed_stats */ FALSE); if (show_progress) /* 7 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); hl_col_major_scan_forward(/* file_ptr */ file_ptr, /* max_index */ max_index, @@ -1429,7 +1429,7 @@ smoke_check_6(int express_test, unsigned paged) /* dirty_unprotects */ dirty_unprotects); if (show_progress) /* 8 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); /* flush all entries in the cache: */ @@ -1439,7 +1439,7 @@ smoke_check_6(int express_test, unsigned paged) /* dump_detailed_stats */ FALSE); if (show_progress) /* 9 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); hl_col_major_scan_backward(/* file_ptr */ file_ptr, /* max_index */ max_index, @@ -1451,12 +1451,12 @@ smoke_check_6(int express_test, unsigned paged) /* dirty_unprotects */ dirty_unprotects); if (show_progress) /* 10 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); takedown_cache(file_ptr, display_stats, TRUE); if (show_progress) /* 11 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); verify_clean(); verify_unprotected(); @@ -1470,7 +1470,7 @@ smoke_check_6(int express_test, unsigned paged) if (!pass) { - HDfprintf(stdout, "%s(): failure_mssg = \"%s\".\n", __func__, failure_mssg); + fprintf(stdout, "%s(): failure_mssg = \"%s\".\n", __func__, failure_mssg); } return (unsigned)!pass; @@ -1572,7 +1572,7 @@ smoke_check_7(int express_test, unsigned paged) default: SKIPPED(); - HDfprintf(stdout, " Long tests disabled.\n"); + fprintf(stdout, " Long tests disabled.\n"); return 0; /* <========== note return */ break; } @@ -1580,12 +1580,12 @@ smoke_check_7(int express_test, unsigned paged) pass = TRUE; if (show_progress) /* 1 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); reset_entries(); if (show_progress) /* 2 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); file_ptr = setup_cache((size_t)(2 * 1024), (size_t)(1 * 1024), paged); cache_ptr = file_ptr->shared->cache; @@ -1602,7 +1602,7 @@ smoke_check_7(int express_test, unsigned paged) } if (show_progress) /* 3 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); hl_row_major_scan_forward(/* file_ptr */ file_ptr, /* max_index */ max_index, @@ -1613,7 +1613,7 @@ smoke_check_7(int express_test, unsigned paged) /* do_inserts */ FALSE); if (show_progress) /* 4 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); hl_row_major_scan_backward(/* file_ptr */ file_ptr, /* max_index */ max_index, @@ -1624,7 +1624,7 @@ smoke_check_7(int express_test, unsigned paged) /* do_inserts */ FALSE); if (show_progress) /* 5 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); hl_row_major_scan_forward(/* file_ptr */ file_ptr, /* max_index */ max_index, @@ -1635,7 +1635,7 @@ smoke_check_7(int express_test, unsigned paged) /* do_inserts */ TRUE); if (show_progress) /* 6 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); /* flush and destroy all entries in the cache: */ @@ -1645,7 +1645,7 @@ smoke_check_7(int express_test, unsigned paged) /* dump_detailed_stats */ FALSE); if (show_progress) /* 7 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); hl_col_major_scan_forward(/* file_ptr */ file_ptr, /* max_index */ max_index, @@ -1657,7 +1657,7 @@ smoke_check_7(int express_test, unsigned paged) /* dirty_unprotects */ dirty_unprotects); if (show_progress) /* 8 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); /* flush all entries in the cache: */ @@ -1667,7 +1667,7 @@ smoke_check_7(int express_test, unsigned paged) /* dump_detailed_stats */ FALSE); if (show_progress) /* 9 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); hl_col_major_scan_backward(/* file_ptr */ file_ptr, /* max_index */ max_index, @@ -1679,12 +1679,12 @@ smoke_check_7(int express_test, unsigned paged) /* dirty_unprotects */ dirty_unprotects); if (show_progress) /* 10 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); takedown_cache(file_ptr, display_stats, TRUE); if (show_progress) /* 11 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); verify_clean(); verify_unprotected(); @@ -1698,7 +1698,7 @@ smoke_check_7(int express_test, unsigned paged) if (!pass) { - HDfprintf(stdout, "%s(): failure_mssg = \"%s\".\n", __func__, failure_mssg); + fprintf(stdout, "%s(): failure_mssg = \"%s\".\n", __func__, failure_mssg); } return (unsigned)!pass; @@ -1800,7 +1800,7 @@ smoke_check_8(int express_test, unsigned paged) default: SKIPPED(); - HDfprintf(stdout, " Long tests disabled.\n"); + fprintf(stdout, " Long tests disabled.\n"); return 0; /* <========== note return */ break; } @@ -1808,12 +1808,12 @@ smoke_check_8(int express_test, unsigned paged) pass = TRUE; if (show_progress) /* 1 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); reset_entries(); if (show_progress) /* 2 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); file_ptr = setup_cache((size_t)(2 * 1024), (size_t)(1 * 1024), paged); cache_ptr = file_ptr->shared->cache; @@ -1830,7 +1830,7 @@ smoke_check_8(int express_test, unsigned paged) } if (show_progress) /* 3 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); hl_row_major_scan_forward(/* file_ptr */ file_ptr, /* max_index */ max_index, @@ -1841,7 +1841,7 @@ smoke_check_8(int express_test, unsigned paged) /* do_inserts */ FALSE); if (show_progress) /* 4 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); hl_row_major_scan_backward(/* file_ptr */ file_ptr, /* max_index */ max_index, @@ -1852,7 +1852,7 @@ smoke_check_8(int express_test, unsigned paged) /* do_inserts */ FALSE); if (show_progress) /* 5 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); hl_row_major_scan_forward(/* file_ptr */ file_ptr, /* max_index */ max_index, @@ -1863,7 +1863,7 @@ smoke_check_8(int express_test, unsigned paged) /* do_inserts */ TRUE); if (show_progress) /* 6 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); /* flush and destroy all entries in the cache: */ @@ -1873,7 +1873,7 @@ smoke_check_8(int express_test, unsigned paged) /* dump_detailed_stats */ FALSE); if (show_progress) /* 7 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); hl_col_major_scan_forward(/* file_ptr */ file_ptr, /* max_index */ max_index, @@ -1885,7 +1885,7 @@ smoke_check_8(int express_test, unsigned paged) /* dirty_unprotects */ dirty_unprotects); if (show_progress) /* 8 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); /* flush all entries in the cache: */ @@ -1895,7 +1895,7 @@ smoke_check_8(int express_test, unsigned paged) /* dump_detailed_stats */ FALSE); if (show_progress) /* 9 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); hl_col_major_scan_backward(/* file_ptr */ file_ptr, /* max_index */ max_index, @@ -1907,12 +1907,12 @@ smoke_check_8(int express_test, unsigned paged) /* dirty_unprotects */ dirty_unprotects); if (show_progress) /* 10 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); takedown_cache(file_ptr, display_stats, TRUE); if (show_progress) /* 11 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); verify_clean(); verify_unprotected(); @@ -1926,7 +1926,7 @@ smoke_check_8(int express_test, unsigned paged) if (!pass) { - HDfprintf(stdout, "%s(): failure_mssg = \"%s\".\n", __func__, failure_mssg); + fprintf(stdout, "%s(): failure_mssg = \"%s\".\n", __func__, failure_mssg); } return (unsigned)!pass; @@ -1993,7 +1993,7 @@ smoke_check_9(int express_test, unsigned paged) default: SKIPPED(); - HDfprintf(stdout, " Long tests disabled.\n"); + fprintf(stdout, " Long tests disabled.\n"); return 0; /* <========== note return */ break; } @@ -2001,12 +2001,12 @@ smoke_check_9(int express_test, unsigned paged) pass = TRUE; if (show_progress) /* 1 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); reset_entries(); if (show_progress) /* 2 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); file_ptr = setup_cache((size_t)(4 * 1024 * 1024), (size_t)(2 * 1024 * 1024), paged); cache_ptr = file_ptr->shared->cache; @@ -2014,7 +2014,7 @@ smoke_check_9(int express_test, unsigned paged) /* disable evictions */ if (show_progress) /* 3 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); if (pass) { @@ -2028,8 +2028,7 @@ smoke_check_9(int express_test, unsigned paged) } if (show_progress) /* 4 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d -- evictions disabled\n", __func__, mile_stone++, - (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d -- evictions disabled\n", __func__, mile_stone++, (int)pass); row_major_scan_forward(/* file_ptr */ file_ptr, /* max_index */ max_index, @@ -2049,7 +2048,7 @@ smoke_check_9(int express_test, unsigned paged) /* enable evictions */ if (show_progress) /* 5 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); if (pass) { @@ -2063,8 +2062,7 @@ smoke_check_9(int express_test, unsigned paged) } if (show_progress) /* 6 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d -- evictions enabled \n", __func__, mile_stone++, - (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d -- evictions enabled \n", __func__, mile_stone++, (int)pass); row_major_scan_backward(/* file_ptr */ file_ptr, /* max_index */ max_index, @@ -2082,7 +2080,7 @@ smoke_check_9(int express_test, unsigned paged) /* dirty_unprotects */ dirty_unprotects); if (show_progress) /* 7 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); if (pass) { @@ -2096,8 +2094,8 @@ smoke_check_9(int express_test, unsigned paged) } if (show_progress) /* 8 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d -- evictions disabled \n", __func__, mile_stone++, - (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d -- evictions disabled \n", __func__, mile_stone++, + (int)pass); row_major_scan_forward(/* file_ptr */ file_ptr, /* max_index */ max_index, @@ -2115,7 +2113,7 @@ smoke_check_9(int express_test, unsigned paged) /* dirty_unprotects */ dirty_unprotects); if (show_progress) /* 9 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); if (pass) { @@ -2129,8 +2127,7 @@ smoke_check_9(int express_test, unsigned paged) } if (show_progress) /* 10 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d -- evictions enabled \n", __func__, mile_stone++, - (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d -- evictions enabled \n", __func__, mile_stone++, (int)pass); /* flush and destroy all entries in the cache: */ @@ -2140,7 +2137,7 @@ smoke_check_9(int express_test, unsigned paged) /* dump_detailed_stats */ FALSE); if (show_progress) /* 11 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); if (pass) { @@ -2154,8 +2151,7 @@ smoke_check_9(int express_test, unsigned paged) } if (show_progress) /* 12 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d -- evictions disabled\n", __func__, mile_stone++, - (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d -- evictions disabled\n", __func__, mile_stone++, (int)pass); col_major_scan_forward(/* file_ptr */ file_ptr, /* max_index */ max_index, @@ -2168,7 +2164,7 @@ smoke_check_9(int express_test, unsigned paged) /* dirty_unprotects */ dirty_unprotects); if (show_progress) /* 13 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); /* flush all entries in the cache: */ @@ -2178,7 +2174,7 @@ smoke_check_9(int express_test, unsigned paged) /* dump_detailed_stats */ FALSE); if (show_progress) /* 14 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); if (pass) { @@ -2192,8 +2188,7 @@ smoke_check_9(int express_test, unsigned paged) } if (show_progress) /* 15 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d -- evictions enabled\n", __func__, mile_stone++, - (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d -- evictions enabled\n", __func__, mile_stone++, (int)pass); col_major_scan_backward(/* file_ptr */ file_ptr, /* max_index */ max_index, @@ -2206,7 +2201,7 @@ smoke_check_9(int express_test, unsigned paged) /* dirty_unprotects */ dirty_unprotects); if (show_progress) /* 16 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); if (pass) { @@ -2220,13 +2215,12 @@ smoke_check_9(int express_test, unsigned paged) } if (show_progress) /* 17 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d -- evictions disabled\n", __func__, mile_stone++, - (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d -- evictions disabled\n", __func__, mile_stone++, (int)pass); takedown_cache(file_ptr, display_stats, TRUE); if (show_progress) /* 18 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); verify_clean(); verify_unprotected(); @@ -2240,7 +2234,7 @@ smoke_check_9(int express_test, unsigned paged) if (!pass) { - HDfprintf(stdout, "%s(): failure_mssg = \"%s\".\n", __func__, failure_mssg); + fprintf(stdout, "%s(): failure_mssg = \"%s\".\n", __func__, failure_mssg); } return (unsigned)!pass; @@ -2307,7 +2301,7 @@ smoke_check_10(int express_test, unsigned paged) default: SKIPPED(); - HDfprintf(stdout, " Long tests disabled.\n"); + fprintf(stdout, " Long tests disabled.\n"); return 0; /* <========== note return */ break; } @@ -2315,19 +2309,18 @@ smoke_check_10(int express_test, unsigned paged) pass = TRUE; if (show_progress) /* 1 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); reset_entries(); if (show_progress) /* 2 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); file_ptr = setup_cache((size_t)(4 * 1024 * 1024), (size_t)(2 * 1024 * 1024), paged); cache_ptr = file_ptr->shared->cache; if (show_progress) /* 3 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d -- evictions enabled\n", __func__, mile_stone++, - (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d -- evictions enabled\n", __func__, mile_stone++, (int)pass); row_major_scan_forward(/* file_ptr */ file_ptr, /* max_index */ max_index, @@ -2345,7 +2338,7 @@ smoke_check_10(int express_test, unsigned paged) /* dirty_unprotects */ dirty_unprotects); if (show_progress) /* 4 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); if (pass) { @@ -2359,8 +2352,7 @@ smoke_check_10(int express_test, unsigned paged) } if (show_progress) /* 5 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d -- evictions disabled\n", __func__, mile_stone++, - (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d -- evictions disabled\n", __func__, mile_stone++, (int)pass); row_major_scan_backward(/* file_ptr */ file_ptr, /* max_index */ max_index, @@ -2378,7 +2370,7 @@ smoke_check_10(int express_test, unsigned paged) /* dirty_unprotects */ dirty_unprotects); if (show_progress) /* 6 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); if (pass) { @@ -2392,8 +2384,7 @@ smoke_check_10(int express_test, unsigned paged) } if (show_progress) /* 7 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d -- evictions enabled\n", __func__, mile_stone++, - (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d -- evictions enabled\n", __func__, mile_stone++, (int)pass); row_major_scan_forward(/* file_ptr */ file_ptr, /* max_index */ max_index, @@ -2411,7 +2402,7 @@ smoke_check_10(int express_test, unsigned paged) /* dirty_unprotects */ dirty_unprotects); if (show_progress) /* 8 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); if (pass) { @@ -2425,8 +2416,7 @@ smoke_check_10(int express_test, unsigned paged) } if (show_progress) /* 9 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d -- evictions disabled\n", __func__, mile_stone++, - (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d -- evictions disabled\n", __func__, mile_stone++, (int)pass); /* flush and destroy all entries in the cache: */ @@ -2436,7 +2426,7 @@ smoke_check_10(int express_test, unsigned paged) /* dump_detailed_stats */ FALSE); if (show_progress) /* 10 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); if (pass) { @@ -2450,8 +2440,7 @@ smoke_check_10(int express_test, unsigned paged) } if (show_progress) /* 11 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d -- evictions enabled\n", __func__, mile_stone++, - (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d -- evictions enabled\n", __func__, mile_stone++, (int)pass); col_major_scan_forward(/* file_ptr */ file_ptr, /* max_index */ max_index, @@ -2464,7 +2453,7 @@ smoke_check_10(int express_test, unsigned paged) /* dirty_unprotects */ dirty_unprotects); if (show_progress) /* 12 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); if (pass) { @@ -2478,8 +2467,7 @@ smoke_check_10(int express_test, unsigned paged) } if (show_progress) /* 13 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d -- evictions disabled\n", __func__, mile_stone++, - (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d -- evictions disabled\n", __func__, mile_stone++, (int)pass); /* flush all entries in the cache: */ @@ -2489,7 +2477,7 @@ smoke_check_10(int express_test, unsigned paged) /* dump_detailed_stats */ FALSE); if (show_progress) /* 14 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); if (pass) { @@ -2503,8 +2491,7 @@ smoke_check_10(int express_test, unsigned paged) } if (show_progress) /* 15 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d -- evictions enabled\n", __func__, mile_stone++, - (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d -- evictions enabled\n", __func__, mile_stone++, (int)pass); col_major_scan_backward(/* file_ptr */ file_ptr, /* max_index */ max_index, @@ -2517,7 +2504,7 @@ smoke_check_10(int express_test, unsigned paged) /* dirty_unprotects */ dirty_unprotects); if (show_progress) /* 16 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); if (pass) { @@ -2531,13 +2518,12 @@ smoke_check_10(int express_test, unsigned paged) } if (show_progress) /* 17 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d -- evictions disabled\n", __func__, mile_stone++, - (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d -- evictions disabled\n", __func__, mile_stone++, (int)pass); takedown_cache(file_ptr, display_stats, TRUE); if (show_progress) /* 18 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); verify_clean(); verify_unprotected(); @@ -2551,7 +2537,7 @@ smoke_check_10(int express_test, unsigned paged) if (!pass) { - HDfprintf(stdout, "%s(): failure_mssg = \"%s\".\n", __func__, failure_mssg); + fprintf(stdout, "%s(): failure_mssg = \"%s\".\n", __func__, failure_mssg); } return (unsigned)!pass; @@ -2616,7 +2602,7 @@ write_permitted_check(int default: SKIPPED(); - HDfprintf(stdout, " Long tests disabled.\n"); + fprintf(stdout, " Long tests disabled.\n"); return 0; /* <========== note return */ break; } @@ -2624,17 +2610,17 @@ write_permitted_check(int pass = TRUE; if (show_progress) /* 1 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); reset_entries(); if (show_progress) /* 2 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); file_ptr = setup_cache((size_t)(1 * 1024 * 1024), (size_t)0, paged); if (show_progress) /* 3 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); row_major_scan_forward(/* file_ptr */ file_ptr, /* max_index */ max_index, @@ -2652,7 +2638,7 @@ write_permitted_check(int /* dirty_unprotects */ TRUE); if (show_progress) /* 4 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); write_permitted = FALSE; @@ -2672,7 +2658,7 @@ write_permitted_check(int /* dirty_unprotects */ NO_CHANGE); if (show_progress) /* 5 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); write_permitted = TRUE; @@ -2692,7 +2678,7 @@ write_permitted_check(int /* dirty_unprotects */ TRUE); if (show_progress) /* 6 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); /* flush and destroy all entries in the cache: */ @@ -2702,7 +2688,7 @@ write_permitted_check(int /* dump_detailed_stats */ FALSE); if (show_progress) /* 7 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); col_major_scan_forward(/* file_ptr */ file_ptr, /* max_index */ max_index, @@ -2715,7 +2701,7 @@ write_permitted_check(int /* dirty_unprotects */ TRUE); if (show_progress) /* 8 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); write_permitted = FALSE; @@ -2732,12 +2718,12 @@ write_permitted_check(int write_permitted = TRUE; if (show_progress) /* 9 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); takedown_cache(file_ptr, display_stats, TRUE); if (show_progress) /* 10 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); verify_clean(); verify_unprotected(); @@ -2751,14 +2737,14 @@ write_permitted_check(int if (!pass) { - HDfprintf(stdout, "%s(): failure_mssg = \"%s\".\n", __func__, failure_mssg); + fprintf(stdout, "%s(): failure_mssg = \"%s\".\n", __func__, failure_mssg); } #else /* H5C_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS */ SKIPPED(); - HDfprintf(stdout, " Clean and dirty LRU lists disabled.\n"); + fprintf(stdout, " Clean and dirty LRU lists disabled.\n"); #endif /* H5C_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS */ @@ -3039,7 +3025,7 @@ check_insert_entry(unsigned paged) if (!pass) { - HDfprintf(stdout, "%s(): failure_mssg = \"%s\".\n", __func__, failure_mssg); + fprintf(stdout, "%s(): failure_mssg = \"%s\".\n", __func__, failure_mssg); } return (unsigned)!pass; @@ -3126,7 +3112,7 @@ check_flush_cache(unsigned paged) if (!pass) { - HDfprintf(stdout, "%s(): failure_mssg = \"%s\".\n", __func__, failure_mssg); + fprintf(stdout, "%s(): failure_mssg = \"%s\".\n", __func__, failure_mssg); } return (unsigned)!pass; @@ -4751,14 +4737,14 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) failure_mssg = "cache not empty at beginning of flush ops test."; } - spec = HDmalloc((size_t)max_num_spec * sizeof(struct fo_flush_cache_test_spec)); + spec = malloc((size_t)max_num_spec * sizeof(struct fo_flush_cache_test_spec)); if (spec == NULL) { pass = FALSE; failure_mssg = "couldn't allocate flush ops test spec array"; } - checks = HDmalloc((size_t)max_num_check * sizeof(struct fo_flush_entry_check)); + checks = malloc((size_t)max_num_check * sizeof(struct fo_flush_entry_check)); if (checks == NULL) { pass = FALSE; @@ -4780,8 +4766,8 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) unsigned expected_index_len = 2; size_t expected_index_size = 2 * PICO_ENTRY_SIZE; - HDassert(spec_size <= max_num_spec); - HDassert(check_size <= max_num_check); + assert(spec_size <= max_num_spec); + assert(check_size <= max_num_check); spec[0] = (struct fo_flush_cache_test_spec){ /* entry_num = */ 0, @@ -4874,8 +4860,8 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) unsigned expected_index_len = 0; size_t expected_index_size = 0; - HDassert(spec_size <= max_num_spec); - HDassert(check_size <= max_num_check); + assert(spec_size <= max_num_spec); + assert(check_size <= max_num_check); spec[0] = (struct fo_flush_cache_test_spec){ /* entry_num = */ 0, @@ -4965,8 +4951,8 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) unsigned expected_index_len = 1; size_t expected_index_size = VARIABLE_ENTRY_SIZE / 2; - HDassert(spec_size <= max_num_spec); - HDassert(check_size <= max_num_check); + assert(spec_size <= max_num_spec); + assert(check_size <= max_num_check); spec[0] = (struct fo_flush_cache_test_spec){ /* entry_num = */ 0, @@ -5031,8 +5017,8 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) unsigned expected_index_len = 0; size_t expected_index_size = 0; - HDassert(spec_size <= max_num_spec); - HDassert(check_size <= max_num_check); + assert(spec_size <= max_num_spec); + assert(check_size <= max_num_check); spec[0] = (struct fo_flush_cache_test_spec){ /* entry_num = */ 0, @@ -5104,8 +5090,8 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) unsigned expected_index_len = 1; size_t expected_index_size = VARIABLE_ENTRY_SIZE / 2; - HDassert(spec_size <= max_num_spec); - HDassert(check_size <= max_num_check); + assert(spec_size <= max_num_spec); + assert(check_size <= max_num_check); spec[0] = (struct fo_flush_cache_test_spec){ /* entry_num = */ 0, @@ -5201,8 +5187,8 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) unsigned expected_index_len = 1; size_t expected_index_size = VARIABLE_ENTRY_SIZE / 2; - HDassert(spec_size <= max_num_spec); - HDassert(check_size <= max_num_check); + assert(spec_size <= max_num_spec); + assert(check_size <= max_num_check); spec[0] = (struct fo_flush_cache_test_spec){ /* entry_num = */ 0, @@ -5294,8 +5280,8 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) unsigned expected_index_len = 1; size_t expected_index_size = VARIABLE_ENTRY_SIZE / 4; - HDassert(spec_size <= max_num_spec); - HDassert(check_size <= max_num_check); + assert(spec_size <= max_num_spec); + assert(check_size <= max_num_check); spec[0] = (struct fo_flush_cache_test_spec){ /* entry_num = */ 0, @@ -5385,8 +5371,8 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) unsigned expected_index_len = 1; size_t expected_index_size = VARIABLE_ENTRY_SIZE / 4; - HDassert(spec_size <= max_num_spec); - HDassert(check_size <= max_num_check); + assert(spec_size <= max_num_spec); + assert(check_size <= max_num_check); spec[0] = (struct fo_flush_cache_test_spec){ /* entry_num = */ 0, @@ -5478,8 +5464,8 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) unsigned expected_index_len = 3; size_t expected_index_size = 3 * PICO_ENTRY_SIZE; - HDassert(spec_size <= max_num_spec); - HDassert(check_size <= max_num_check); + assert(spec_size <= max_num_spec); + assert(check_size <= max_num_check); spec[0] = (struct fo_flush_cache_test_spec){ /* entry_num = */ 0, @@ -5560,8 +5546,8 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) unsigned expected_index_len = 0; size_t expected_index_size = (size_t)0; - HDassert(spec_size <= max_num_spec); - HDassert(check_size <= max_num_check); + assert(spec_size <= max_num_spec); + assert(check_size <= max_num_check); spec[0] = (struct fo_flush_cache_test_spec){ /* entry_num = */ 0, @@ -5640,8 +5626,8 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) size_t expected_index_size = VARIABLE_ENTRY_SIZE + (VARIABLE_ENTRY_SIZE / 4) + (VARIABLE_ENTRY_SIZE / 2); - HDassert(spec_size <= max_num_spec); - HDassert(check_size <= max_num_check); + assert(spec_size <= max_num_spec); + assert(check_size <= max_num_check); spec[0] = (struct fo_flush_cache_test_spec){ /* entry_num = */ 0, @@ -5721,8 +5707,8 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) unsigned expected_index_len = 0; size_t expected_index_size = (size_t)0; - HDassert(spec_size <= max_num_spec); - HDassert(check_size <= max_num_check); + assert(spec_size <= max_num_spec); + assert(check_size <= max_num_check); spec[0] = (struct fo_flush_cache_test_spec){ /* entry_num = */ 0, @@ -5801,8 +5787,8 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) size_t expected_index_size = VARIABLE_ENTRY_SIZE + (VARIABLE_ENTRY_SIZE / 4) + (VARIABLE_ENTRY_SIZE / 2); - HDassert(spec_size <= max_num_spec); - HDassert(check_size <= max_num_check); + assert(spec_size <= max_num_spec); + assert(check_size <= max_num_check); spec[0] = (struct fo_flush_cache_test_spec){ /* entry_num = */ 0, @@ -5905,8 +5891,8 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) size_t expected_index_size = VARIABLE_ENTRY_SIZE + (VARIABLE_ENTRY_SIZE / 4) + (VARIABLE_ENTRY_SIZE / 2); - HDassert(spec_size <= max_num_spec); - HDassert(check_size <= max_num_check); + assert(spec_size <= max_num_spec); + assert(check_size <= max_num_check); spec[0] = (struct fo_flush_cache_test_spec){ /* entry_num = */ 0, @@ -6020,8 +6006,8 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) size_t expected_index_size = (2 * VARIABLE_ENTRY_SIZE) + (VARIABLE_ENTRY_SIZE / 4) + (VARIABLE_ENTRY_SIZE / 2) + (2 * PICO_ENTRY_SIZE); - HDassert(spec_size <= max_num_spec); - HDassert(check_size <= max_num_check); + assert(spec_size <= max_num_spec); + assert(check_size <= max_num_check); spec[0] = (struct fo_flush_cache_test_spec){ /* entry_num = */ 0, @@ -6208,8 +6194,8 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) size_t expected_index_size = (2 * VARIABLE_ENTRY_SIZE) + (2 * (VARIABLE_ENTRY_SIZE / 4)) + (2 * (VARIABLE_ENTRY_SIZE / 2)) + (4 * PICO_ENTRY_SIZE); - HDassert(spec_size <= max_num_spec); - HDassert(check_size <= max_num_check); + assert(spec_size <= max_num_spec); + assert(check_size <= max_num_check); spec[0] = (struct fo_flush_cache_test_spec){ /* entry_num = */ 0, @@ -6451,8 +6437,8 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) unsigned expected_index_len = 0; size_t expected_index_size = 0; - HDassert(spec_size <= max_num_spec); - HDassert(check_size <= max_num_check); + assert(spec_size <= max_num_spec); + assert(check_size <= max_num_check); spec[0] = (struct fo_flush_cache_test_spec){ /* entry_num = */ 0, @@ -6690,8 +6676,8 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) unsigned expected_index_len = 3; size_t expected_index_size = 3 * PICO_ENTRY_SIZE; - HDassert(spec_size <= max_num_spec); - HDassert(check_size <= max_num_check); + assert(spec_size <= max_num_spec); + assert(check_size <= max_num_check); spec[0] = (struct fo_flush_cache_test_spec){ /* entry_num = */ 0, @@ -6809,8 +6795,8 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) unsigned expected_index_len = 0; size_t expected_index_size = (size_t)0; - HDassert(spec_size <= max_num_spec); - HDassert(check_size <= max_num_check); + assert(spec_size <= max_num_spec); + assert(check_size <= max_num_check); spec[0] = (struct fo_flush_cache_test_spec){ /* entry_num = */ 0, @@ -6998,8 +6984,8 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) unsigned expected_index_len = 13; size_t expected_index_size = 9 * VARIABLE_ENTRY_SIZE; - HDassert(spec_size <= max_num_spec); - HDassert(check_size <= max_num_check); + assert(spec_size <= max_num_spec); + assert(check_size <= max_num_check); spec[0] = (struct fo_flush_cache_test_spec){ /* entry_num = */ 0, @@ -7406,8 +7392,8 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) unsigned expected_index_len = 0; size_t expected_index_size = (size_t)0; - HDassert(spec_size <= max_num_spec); - HDassert(check_size <= max_num_check); + assert(spec_size <= max_num_spec); + assert(check_size <= max_num_check); spec[0] = (struct fo_flush_cache_test_spec){ /* entry_num = */ 0, @@ -7739,8 +7725,8 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) unsigned expected_index_len = 5; size_t expected_index_size = 4 * VARIABLE_ENTRY_SIZE; - HDassert(spec_size <= max_num_spec); - HDassert(check_size <= max_num_check); + assert(spec_size <= max_num_spec); + assert(check_size <= max_num_check); spec[0] = (struct fo_flush_cache_test_spec){ /* entry_num = */ 0, @@ -7915,8 +7901,8 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) unsigned expected_index_len = 0; size_t expected_index_size = 0; - HDassert(spec_size <= max_num_spec); - HDassert(check_size <= max_num_check); + assert(spec_size <= max_num_spec); + assert(check_size <= max_num_check); spec[0] = (struct fo_flush_cache_test_spec){ /* entry_num = */ 0, @@ -8074,8 +8060,8 @@ check_flush_cache__flush_ops(H5F_t *file_ptr) reset_entries(); } - HDfree(checks); - HDfree(spec); + free(checks); + free(spec); /* finally finish up with the flush ops eviction test */ check_flush_cache__flush_op_eviction_test(file_ptr); @@ -8370,7 +8356,7 @@ check_flush_cache__flush_op_eviction_test(H5F_t *file_ptr) test_entry_t *entry_ptr; test_entry_t *base_addr; - expected = HDmalloc((size_t)num_total_entries * sizeof(struct expected_entry_status)); + expected = malloc((size_t)num_total_entries * sizeof(struct expected_entry_status)); if (expected == NULL) { pass = FALSE; @@ -8396,8 +8382,8 @@ check_flush_cache__flush_op_eviction_test(H5F_t *file_ptr) expected[i].serialized = FALSE; expected[i].destroyed = FALSE; - HDmemset(expected[i].flush_dep_par_type, 0, sizeof(expected[i].flush_dep_par_type)); - HDmemset(expected[i].flush_dep_par_idx, 0, sizeof(expected[i].flush_dep_par_idx)); + memset(expected[i].flush_dep_par_type, 0, sizeof(expected[i].flush_dep_par_type)); + memset(expected[i].flush_dep_par_idx, 0, sizeof(expected[i].flush_dep_par_idx)); expected[i].flush_dep_npar = 0; expected[i].flush_dep_nchd = 0; @@ -8442,8 +8428,8 @@ check_flush_cache__flush_op_eviction_test(H5F_t *file_ptr) expected[i].serialized = FALSE; expected[i].destroyed = FALSE; - HDmemset(expected[i].flush_dep_par_type, 0, sizeof(expected[i].flush_dep_par_type)); - HDmemset(expected[i].flush_dep_par_idx, 0, sizeof(expected[i].flush_dep_par_idx)); + memset(expected[i].flush_dep_par_type, 0, sizeof(expected[i].flush_dep_par_type)); + memset(expected[i].flush_dep_par_idx, 0, sizeof(expected[i].flush_dep_par_idx)); expected[i].flush_dep_npar = 0; expected[i].flush_dep_nchd = 0; @@ -8465,8 +8451,8 @@ check_flush_cache__flush_op_eviction_test(H5F_t *file_ptr) expected[i].serialized = FALSE; expected[i].destroyed = FALSE; - HDmemset(expected[i].flush_dep_par_type, 0, sizeof(expected[i].flush_dep_par_type)); - HDmemset(expected[i].flush_dep_par_idx, 0, sizeof(expected[i].flush_dep_par_idx)); + memset(expected[i].flush_dep_par_type, 0, sizeof(expected[i].flush_dep_par_type)); + memset(expected[i].flush_dep_par_idx, 0, sizeof(expected[i].flush_dep_par_idx)); expected[i].flush_dep_npar = 0; expected[i].flush_dep_nchd = 0; @@ -8475,7 +8461,7 @@ check_flush_cache__flush_op_eviction_test(H5F_t *file_ptr) expected[i].is_corked = FALSE; } - HDassert(i == num_total_entries); + assert(i == num_total_entries); pass = TRUE; } @@ -9588,7 +9574,7 @@ check_flush_cache__flush_op_eviction_test(H5F_t *file_ptr) reset_entries(); } - HDfree(expected); + free(expected); } /* check_flush_cache__flush_op_eviction_test() */ @@ -10654,7 +10640,7 @@ check_flush_cache__single_entry(H5F_t *file_ptr) struct pinned_single_entry_test_spec *spec = NULL; size_t i; - spec = HDmalloc(256 * sizeof(struct pinned_single_entry_test_spec)); + spec = malloc(256 * sizeof(struct pinned_single_entry_test_spec)); if (spec == NULL) { pass = FALSE; @@ -10772,7 +10758,7 @@ check_flush_cache__single_entry(H5F_t *file_ptr) i++; } - HDfree(spec); + free(spec); } } /* check_flush_cache__single_entry() */ @@ -11258,7 +11244,7 @@ check_get_entry_status(unsigned paged) if (!pass) { - HDfprintf(stdout, "%s(): failure_mssg = \"%s\".\n", __func__, failure_mssg); + fprintf(stdout, "%s(): failure_mssg = \"%s\".\n", __func__, failure_mssg); } return (unsigned)!pass; @@ -11536,7 +11522,7 @@ check_expunge_entry(unsigned paged) if (!pass) { - HDfprintf(stdout, "%s(): failure_mssg = \"%s\".\n", __func__, failure_mssg); + fprintf(stdout, "%s(): failure_mssg = \"%s\".\n", __func__, failure_mssg); } return (unsigned)!pass; @@ -11923,7 +11909,7 @@ check_multiple_read_protect(unsigned paged) if (!pass) { - HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg); + fprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg); } return (unsigned)!pass; @@ -12023,7 +12009,7 @@ check_move_entry(unsigned paged) H5_FAILED(); if (!pass) - HDfprintf(stdout, "%s(): failure_mssg = \"%s\".\n", __func__, failure_mssg); + fprintf(stdout, "%s(): failure_mssg = \"%s\".\n", __func__, failure_mssg); return (unsigned)!pass; } /* check_move_entry() */ @@ -12275,7 +12261,7 @@ check_pin_protected_entry(unsigned paged) if (!pass) { - HDfprintf(stdout, "%s(): failure_mssg = \"%s\".\n", __func__, failure_mssg); + fprintf(stdout, "%s(): failure_mssg = \"%s\".\n", __func__, failure_mssg); } return (unsigned)!pass; @@ -13137,7 +13123,7 @@ check_resize_entry(unsigned paged) if (!pass) { - HDfprintf(stdout, "%s(): failure_mssg = \"%s\".\n", __func__, failure_mssg); + fprintf(stdout, "%s(): failure_mssg = \"%s\".\n", __func__, failure_mssg); } return (unsigned)!pass; @@ -13216,7 +13202,7 @@ check_evictions_enabled(unsigned paged) pass = TRUE; if (show_progress) /* 1 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); /* create the cache */ if (pass) { @@ -13238,7 +13224,7 @@ check_evictions_enabled(unsigned paged) } if (show_progress) /* 2 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); /* verify that it is empty */ if (pass) { @@ -13254,7 +13240,7 @@ check_evictions_enabled(unsigned paged) } if (show_progress) /* 3 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); /* verify that H5C_get_evictions_enabled() returns the expected value */ if (pass) { @@ -13270,7 +13256,7 @@ check_evictions_enabled(unsigned paged) } if (show_progress) /* 4 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); if (pass) { @@ -13282,7 +13268,7 @@ check_evictions_enabled(unsigned paged) } if (show_progress) /* 5 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); /* verify that the cache is full */ if (pass) { @@ -13298,7 +13284,7 @@ check_evictions_enabled(unsigned paged) } if (show_progress) /* 6 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); if (pass) { @@ -13308,7 +13294,7 @@ check_evictions_enabled(unsigned paged) } if (show_progress) /* 7 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); /* verify that an entry has been evicted */ if (pass) { @@ -13324,7 +13310,7 @@ check_evictions_enabled(unsigned paged) } if (show_progress) /* 8 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); if (pass) { @@ -13354,7 +13340,7 @@ check_evictions_enabled(unsigned paged) } if (show_progress) /* 9 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); if (pass) { @@ -13363,7 +13349,7 @@ check_evictions_enabled(unsigned paged) } if (show_progress) /* 10 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); /* verify that another entry has been evicted */ if (pass) { @@ -13380,7 +13366,7 @@ check_evictions_enabled(unsigned paged) } if (show_progress) /* 11 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); if (pass) { @@ -13410,7 +13396,7 @@ check_evictions_enabled(unsigned paged) } if (show_progress) /* 12 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); /* disable evictions */ if (pass) { @@ -13426,7 +13412,7 @@ check_evictions_enabled(unsigned paged) } if (show_progress) /* 13 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); /* verify that evictions are disabled */ if (pass) { @@ -13443,7 +13429,7 @@ check_evictions_enabled(unsigned paged) } if (show_progress) /* 14 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); if (pass) { @@ -13453,7 +13439,7 @@ check_evictions_enabled(unsigned paged) } if (show_progress) /* 15 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); /* verify that no entry has been evicted */ if (pass) { @@ -13470,7 +13456,7 @@ check_evictions_enabled(unsigned paged) } if (show_progress) /* 16 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); if (pass) { @@ -13479,7 +13465,7 @@ check_evictions_enabled(unsigned paged) } if (show_progress) /* 17 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); /* verify that no entry has been evicted */ if (pass) { @@ -13496,7 +13482,7 @@ check_evictions_enabled(unsigned paged) } if (show_progress) /* 18 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); /* re-enable evictions */ if (pass) { @@ -13512,7 +13498,7 @@ check_evictions_enabled(unsigned paged) } if (show_progress) /* 19 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); if (pass) { @@ -13522,7 +13508,7 @@ check_evictions_enabled(unsigned paged) } if (show_progress) /* 20 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); /* verify that no entries have been evicted */ if (pass) { @@ -13539,7 +13525,7 @@ check_evictions_enabled(unsigned paged) } if (show_progress) /* 21 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); if (pass) { @@ -13549,7 +13535,7 @@ check_evictions_enabled(unsigned paged) } if (show_progress) /* 22 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); /* verify that the entries have been evicted to bring the * cache back down to its normal size. @@ -13569,7 +13555,7 @@ check_evictions_enabled(unsigned paged) } if (show_progress) /* 23 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); if (pass) { @@ -13599,7 +13585,7 @@ check_evictions_enabled(unsigned paged) } if (show_progress) /* 24 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); if (pass) { @@ -13629,7 +13615,7 @@ check_evictions_enabled(unsigned paged) } if (show_progress) /* 25 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); /* disable evictions again */ if (pass) { @@ -13645,7 +13631,7 @@ check_evictions_enabled(unsigned paged) } if (show_progress) /* 26 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); if (pass) { @@ -13657,7 +13643,7 @@ check_evictions_enabled(unsigned paged) } if (show_progress) /* 27 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); /* verify that the cache has grown */ if (pass) { @@ -13674,7 +13660,7 @@ check_evictions_enabled(unsigned paged) } if (show_progress) /* 28 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); /* re-enable evictions again */ if (pass) { @@ -13690,7 +13676,7 @@ check_evictions_enabled(unsigned paged) } if (show_progress) /* 29 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); if (pass) { @@ -13699,7 +13685,7 @@ check_evictions_enabled(unsigned paged) } if (show_progress) /* 30 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); /* verify that the cache has returned to its maximum size */ if (pass) { @@ -13716,7 +13702,7 @@ check_evictions_enabled(unsigned paged) } if (show_progress) /* 31 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); if (pass) { @@ -13746,7 +13732,7 @@ check_evictions_enabled(unsigned paged) } if (show_progress) /* 32 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); /* disable evictions one last time before we shut down */ if (pass) { @@ -13762,7 +13748,7 @@ check_evictions_enabled(unsigned paged) } if (show_progress) /* 33 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); if (pass) { @@ -13770,7 +13756,7 @@ check_evictions_enabled(unsigned paged) } if (show_progress) /* 34 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); if (pass) { PASSED(); @@ -13781,7 +13767,7 @@ check_evictions_enabled(unsigned paged) if (!pass) { - HDfprintf(stdout, "%s(): failure_mssg = \"%s\".\n", __func__, failure_mssg); + fprintf(stdout, "%s(): failure_mssg = \"%s\".\n", __func__, failure_mssg); } return (unsigned)!pass; @@ -13872,7 +13858,7 @@ check_flush_protected_err(unsigned paged) if (!pass) { - HDfprintf(stdout, "%s(): failure_mssg = \"%s\".\n", __func__, failure_mssg); + fprintf(stdout, "%s(): failure_mssg = \"%s\".\n", __func__, failure_mssg); } return (unsigned)!pass; @@ -13958,7 +13944,7 @@ check_destroy_pinned_err(unsigned paged) } if (!pass) - HDfprintf(stdout, "%s(): failure_mssg = \"%s\".\n", __func__, failure_mssg); + fprintf(stdout, "%s(): failure_mssg = \"%s\".\n", __func__, failure_mssg); return (unsigned)!pass; @@ -14052,7 +14038,7 @@ check_destroy_protected_err(unsigned paged) } if (!pass) - HDfprintf(stdout, "%s(): failure_mssg = \"%s\".\n", __func__, failure_mssg); + fprintf(stdout, "%s(): failure_mssg = \"%s\".\n", __func__, failure_mssg); return (unsigned)!pass; @@ -14131,7 +14117,7 @@ check_duplicate_insert_err(unsigned paged) if (!pass) { - HDfprintf(stdout, "%s(): failure_mssg = \"%s\".\n", __func__, failure_mssg); + fprintf(stdout, "%s(): failure_mssg = \"%s\".\n", __func__, failure_mssg); } return (unsigned)!pass; @@ -14216,7 +14202,7 @@ check_double_pin_err(unsigned paged) if (!pass) { - HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg); + fprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg); } return (unsigned)!pass; @@ -14310,7 +14296,7 @@ check_double_unpin_err(unsigned paged) if (!pass) { - HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg); + fprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg); } return (unsigned)!pass; @@ -14418,7 +14404,7 @@ check_pin_entry_errs(unsigned paged) if (!pass) { - HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg); + fprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg); } return (unsigned)!pass; @@ -14500,7 +14486,7 @@ check_double_protect_err(unsigned paged) if (!pass) { - HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg); + fprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg); } return (unsigned)!pass; @@ -14578,7 +14564,7 @@ check_double_unprotect_err(unsigned paged) if (!pass) { - HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg); + fprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg); } return (unsigned)!pass; @@ -14660,7 +14646,7 @@ check_mark_entry_dirty_errs(unsigned paged) if (!pass) { - HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg); + fprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg); } return (unsigned)!pass; @@ -14773,7 +14759,7 @@ check_expunge_entry_errs(unsigned paged) if (!pass) { - HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg); + fprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg); } return (unsigned)!pass; @@ -14890,7 +14876,7 @@ check_move_entry_errs(unsigned paged) else { H5_FAILED(); - HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg); + fprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg); } /* end else */ return (unsigned)!pass; @@ -14990,7 +14976,7 @@ check_resize_entry_errs(unsigned paged) if (!pass) { - HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg); + fprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg); } return (unsigned)!pass; @@ -15111,7 +15097,7 @@ check_unprotect_ro_dirty_err(unsigned paged) if (!pass) { - HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg); + fprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg); } return (unsigned)!pass; @@ -15194,7 +15180,7 @@ check_protect_ro_rw_err(unsigned paged) if (!pass) { - HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg); + fprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg); } return (unsigned)!pass; @@ -15276,7 +15262,7 @@ check_protect_retries(unsigned paged) } else { - HDassert((entry_ptr->cache_ptr == NULL) || (entry_ptr->cache_ptr == cache_ptr)); + assert((entry_ptr->cache_ptr == NULL) || (entry_ptr->cache_ptr == cache_ptr)); entry_ptr->cache_ptr = cache_ptr; entry_ptr->file_ptr = file_ptr; @@ -15285,7 +15271,7 @@ check_protect_retries(unsigned paged) entry_ptr->ro_ref_count++; } - HDassert(((entry_ptr->header).type)->id == type); + assert(((entry_ptr->header).type)->id == type); } if (pass) @@ -15323,7 +15309,7 @@ check_protect_retries(unsigned paged) if (!pass) { - HDfprintf(stdout, "%s: failure_msg = \"%s\".\n", __func__, failure_mssg); + fprintf(stdout, "%s: failure_msg = \"%s\".\n", __func__, failure_mssg); } return (unsigned)!pass; @@ -15459,7 +15445,7 @@ check_check_evictions_enabled_err(unsigned paged) if (!pass) { - HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg); + fprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg); } return (unsigned)!pass; @@ -15554,7 +15540,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) pass = TRUE; if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* allocate a cache, enable automatic cache resizing, and then force * the cache through all its operational modes. Verify that all @@ -15585,7 +15571,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* force low hit rate with cache not full -- should result in not * full status. @@ -15610,7 +15596,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* force low hit rate with cache full -- should result in increase * of cache size from .5 to 1 meg. @@ -15636,7 +15622,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* force low hit rate with cache not full -- should result in not * full status. @@ -15662,7 +15648,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* force low hit rate with cache full again -- should result in increase * of cache size from 1 to 2 meg. @@ -15689,7 +15675,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* force low hit rate with cache full again -- should result in increase * of cache size from 2 to 4 meg. @@ -15716,7 +15702,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* force low hit rate with cache full again -- should result in increase * of cache size from 4 to 8 meg. @@ -15743,7 +15729,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* force low hit rate with cache full again -- should result in increase * of cache size from 8 to 12 meg. Note that max increase reduced the @@ -15771,7 +15757,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* force low hit rate with cache full again -- should result in increase * of cache size from 12 to 14 meg. @@ -15798,7 +15784,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* force low hit rate with cache full and at maximum size -- should * in no change in size and a result of at_max_size. @@ -15825,7 +15811,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* force high hit rate with cache full and at maximum size -- should * result in a decrease from 14 to 13 Meg -- note that max decrease @@ -15853,7 +15839,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* the current cache configuration is inconvenient for testing cache * size reduction, so lets change it some something easier to work @@ -15920,7 +15906,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* force high hit rate -- should result in a decrease from ~4 to ~3 * M -- note that max decrease reduces the size of the reduction @@ -15947,7 +15933,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* force high hit rate again -- should result in a decrease from ~3 * to ~2 M -- again note that max decrease reduces the size of the @@ -15975,7 +15961,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* force high hit rate again -- should result in a decrease from ~2 * to ~1 M -- again note that max decrease reduces the size of the @@ -16003,7 +15989,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* force high hit rate again -- should result in a decrease from ~1 * to ~0.5 M -- max decrease is no longer a factor. New size is five @@ -16030,7 +16016,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* force high hit rate again -- should result in a decrease of five * bytes to the minimum cache size. @@ -16056,7 +16042,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* force high hit rate again -- Already at minimum size so no change in * cache size and result should be at_min_size. @@ -16082,7 +16068,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* force in range hit rate -- should be no change in cache size, * and result should be in_spec. @@ -16116,7 +16102,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* force low hit rate with cache full -- should * increase cache size from .5 to 1 M. @@ -16142,7 +16128,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* force high hit rate -- should result in a decrease to the * minimum cache size. @@ -16168,7 +16154,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /****************************************************************** * now do some tests with the maximum increase and decrease sizes @@ -16235,7 +16221,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* force high hit rate -- should result in a decrease to the * minimum cache size. @@ -16261,7 +16247,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* force low hit rate with cache full -- should increase cache size * from 1 to 4 Meg. @@ -16288,7 +16274,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* force low hit rate again with cache full -- should increase cache * size from 4 to 16 Meg. @@ -16315,7 +16301,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* force high hit rate -- should result in a decrease cache size from * 16 to 4 Meg. @@ -16342,7 +16328,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /****************************************************************** * We have tested the threshold increment and decrement modes. @@ -16411,7 +16397,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); if (cork_ageout) cork_entry_type(file_ptr, MEDIUM_ENTRY_TYPE); @@ -16444,7 +16430,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); if (pass) { /* second epoch */ rpt_fcn_called = FALSE; @@ -16467,7 +16453,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); if (pass) { /* third epoch */ rpt_fcn_called = FALSE; @@ -16490,7 +16476,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* fourth epoch -- If the hit rate were above the lower threshold, * we would see cache size reduction now. However, nothing will @@ -16517,7 +16503,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* fifth epoch -- force the hit rate to 100%. We should see cache size * reduction now. @@ -16542,7 +16528,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* sixth epoch -- force the hit rate to 100% again. */ @@ -16566,7 +16552,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* seventh epoch -- force the hit rate to 100% again. */ @@ -16590,7 +16576,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* eighth epoch -- force the hit rate to 100% again -- should be steady * state. @@ -16615,7 +16601,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* now just bang on one entry -- after three epochs, this should * get all entries other than the one evicted, and the cache size @@ -16641,7 +16627,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); if (pass) { /* tenth epoch */ rpt_fcn_called = FALSE; @@ -16663,7 +16649,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); if (pass) { /* eleventh epoch -- cache size reduction */ rpt_fcn_called = FALSE; @@ -16686,7 +16672,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); if (pass) { /* twelfth epoch -- at minimum size so no more ageouts */ rpt_fcn_called = FALSE; @@ -16709,7 +16695,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); if (cork_ageout) uncork_entry_type(file_ptr, MEDIUM_ENTRY_TYPE); @@ -16781,7 +16767,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* fill the cache with 1024 byte entries -- nothing should happen * for three epochs while the markers are inserted into the cache @@ -16812,7 +16798,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); if (pass) { /* second epoch */ @@ -16836,7 +16822,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); if (pass) { /* third epoch */ @@ -16860,7 +16846,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* fourth epoch -- If the hit rate were above the lower threshold, * we would see cache size reduction now. However, nothing will @@ -16888,7 +16874,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* fifth epoch -- force the hit rate to 100%. We should see cache size * reduction now. @@ -16915,7 +16901,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* sixth epoch -- force the hit rate to 100% again. */ @@ -16941,7 +16927,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* seventh epoch -- keep hit rate at 100%, and keep 2K entries active. */ @@ -16967,7 +16953,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* eighth epoch -- still 100% hit rate */ @@ -16993,7 +16979,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* ninth epoch --hit rate at 100%. */ @@ -17019,7 +17005,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* tenth epoch -- still 100% hit rate */ @@ -17045,7 +17031,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* eleventh epoch -- hit rate at 100% -- starting to stableize */ @@ -17070,7 +17056,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* twelfth epoch -- force the hit rate to 100% again -- should be steady * state. @@ -17096,7 +17082,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* now just bang on one entry -- after three epochs, this should * get all entries other than the one evicted, and the cache size @@ -17123,7 +17109,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); if (pass) { /* fourteenth epoch */ @@ -17147,7 +17133,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); if (pass) { /* fifteenth epoch -- cache size reduction */ @@ -17171,7 +17157,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); if (pass) { /* sixteenth epoch -- at minimum size so no more ageouts */ @@ -17195,7 +17181,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* repeat the test yet again, this time with empty reserve enabled. * Again, some structural changes in the test are necessary. @@ -17263,7 +17249,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* fill the cache with 1024 byte entries -- nothing should happen * for three epochs while the markers are inserted into the cache @@ -17294,7 +17280,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); if (pass) { /* second epoch */ @@ -17318,7 +17304,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); if (pass) { /* third epoch */ @@ -17342,7 +17328,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* fourth epoch -- If the hit rate were above the lower threshold, * we would see cache size reduction now. However, nothing will @@ -17370,7 +17356,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* fifth epoch -- force the hit rate to 100%. We should see cache size * reduction now. @@ -17396,7 +17382,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* sixth epoch -- force the hit rate to 100% again. */ @@ -17421,7 +17407,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* seventh epoch -- force the hit rate to 100% again. */ @@ -17446,7 +17432,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* eighth epoch -- force the hit rate to 100% again -- should be steady * state. @@ -17472,7 +17458,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* now just bang on one entry -- after three epochs, this should * get all entries other than the one evicted, and the cache size @@ -17499,7 +17485,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); if (pass) { /* tenth epoch */ @@ -17522,7 +17508,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); if (pass) { /* eleventh epoch -- cache size reduction */ @@ -17546,7 +17532,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); if (pass) { /* twelfth epoch -- at minimum size so no more ageouts */ @@ -17570,7 +17556,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* Repeat the test again, this time using the age out with threshold * mode. To simplify the testing, set epochs to eviction to 1. @@ -17641,7 +17627,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* fill the cache with 4K byte entries -- increment mode is off, * so cache size reduction should kick in as soon as we get the @@ -17669,7 +17655,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); if (pass) { /* second epoch -- hit rate 0 */ @@ -17693,7 +17679,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); if (pass) { /* third epoch -- hit rate 1.0 -- should see decrease */ @@ -17717,7 +17703,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* fourth epoch -- load up the cache again -- hit rate 0 */ if (pass) { @@ -17742,7 +17728,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* fifth epoch -- still loading up the cache -- hit rate 0 */ if (pass) { @@ -17767,7 +17753,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* sixth epoch -- force hit rate to .998 -- should be no reduction */ if (pass) { @@ -17792,7 +17778,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* seventh epoch -- force hit rate to .999 -- should see reduction */ @@ -17818,7 +17804,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* We have now tested all the major ageout modes individually. * Lets try them all together to look for unexpected interactions @@ -17885,7 +17871,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* fill the cache with 4K byte entries -- increment mode is threshold, * so the decrease code will not be executed until the hit rate exceeds @@ -17913,7 +17899,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); if (pass) { /* second epoch -- hit rate 0 */ @@ -17937,7 +17923,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* third epoch -- force the hit rate to 1.0. Should be no change * in the cache size due to the combination of the empty reserve @@ -17970,7 +17956,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* fourth epoch -- hit rate still 1.0. Index size should decrease, * but otherwise no change expected. @@ -17998,7 +17984,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* fifth epoch -- hit rate still 1.0. Index size should decrease, * but otherwise no change expected. @@ -18026,7 +18012,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* sixth epoch -- hit rate still 1.0. Index size should decrease, * but otherwise no change expected. Note that the cache size is @@ -18055,7 +18041,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* seventh epoch -- hit rate still 1.0. No change in index size expected. */ @@ -18082,7 +18068,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* eighth epoch -- start loading 1 KB entries. Hit rate 0 so * decrease code shouldn't be called. @@ -18110,7 +18096,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* ninth epoch -- access the 1 KB entries again, driving the hit rate * to 1.0. Decrease code should be triggered, but the max decrease @@ -18139,7 +18125,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* tenth epoch -- access the 1 KB entries yet again, forcing hit rate * to 1.0. Decrease code should be triggered, and the empty reserve @@ -18168,7 +18154,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* eleventh epoch -- access the 1 KB entries yet again, forcing hit rate * to 1.0. Decrease code should be triggered, and the empty reserve @@ -18197,7 +18183,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* twelfth epoch -- hit rate 1.0 -- decrease as before. */ @@ -18224,7 +18210,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* thirteenth epoch -- hit rate 1.0 -- decrease as before. */ @@ -18251,7 +18237,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* fourteenth epoch -- hit rate 1.0 -- decrease as before. */ @@ -18278,7 +18264,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* fifteenth epoch -- hit rate 1.0 -- decrease as before. */ @@ -18305,7 +18291,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* sixteenth epoch -- hit rate 1.0 -- should be stable now */ @@ -18332,7 +18318,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* now test the flash cache size increment code. At least at present, * there should be no interaction between the regular auto-resize @@ -18346,7 +18332,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) */ if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* Place the cache in a known state via a flush-destroy on the cache * to clear out all entries, and then a reset on all the entries. @@ -18361,7 +18347,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* now repeat the above tests using the add space flash cache size * increment algorithm. @@ -18427,7 +18413,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* Load a huge entry into the cache */ if (pass) { @@ -18447,7 +18433,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* Now load a monster entry. Since a monster entry is larger than * half the size of the cache, and there is not sufficient space @@ -18472,7 +18458,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* Load a second monster entry. Since the monster entry is larger * than half the size of the cache yet again, and there is not @@ -18496,7 +18482,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* Load a third moster entry. Should be no cache size increase this * time. @@ -18518,7 +18504,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* delete existing entries to prepare for next test, and reset * the size of the cache. @@ -18551,7 +18537,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) */ if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* insert a huge entry into the cache */ if (pass) { @@ -18574,7 +18560,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* Now insert a monster entry. Since a monster entry is larger than * half the size of the cache, and there is not sufficient space @@ -18596,7 +18582,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* Insert a second monster entry. Cache size should increase again. */ @@ -18615,7 +18601,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* Insert a third monster entry. Should be no cache size increase this * time. @@ -18637,7 +18623,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* delete existing entries to prepare for next test, and reset * the size of the cache. We must also change the size of the needed @@ -18689,7 +18675,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* Now load the variable entries into the cache */ if (pass) { @@ -18716,7 +18702,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* protect a variable entry, and re-size it to 3K. Should be * no effect on the size of the cache. @@ -18737,7 +18723,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* protect the variable entry again, and re-size it to 10K. Should * resize the cache to 13 KB. Note that cache_accesses will be 0 @@ -18759,7 +18745,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* protect a second variable entry, and re-size it to 10K. Should * resize to 22 KB. @@ -18780,7 +18766,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* protect a third variable entry, and re-size it to 10K. Should * be no change in cache size. @@ -18801,7 +18787,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* re-size the variable entries back down to their initial size, and * restore the cache to its initial size as well, in preparation @@ -18843,7 +18829,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* Now test flash cache resizes with pinned entries... */ @@ -18863,7 +18849,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); if (pass) { @@ -18879,7 +18865,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); if (pass) { @@ -18897,7 +18883,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); if (pass) { @@ -18915,7 +18901,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* Unpin the entries. Note that no entries are evicted as we don't * load any entries. @@ -18941,7 +18927,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* re-size the variable entries back down to their initial size, and * restore the cache to its initial size as well, in preparation @@ -18998,7 +18984,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); if (pass) { @@ -19014,7 +19000,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); if (pass) { @@ -19032,7 +19018,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); if (pass) { @@ -19050,7 +19036,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* Unpin the entries. Note that no entries are evicted as we don't * load any entries. @@ -19095,7 +19081,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* ...and then reconfigure. Note that we change the flash_multiple * and flash_threshold just to make sure that such changed perform @@ -19151,7 +19137,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); if (pass) { @@ -19164,7 +19150,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* protect and unprotect a large entry -- no change in cache size since * a large entry will just fill the available space in the cache. @@ -19186,7 +19172,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* protect and unprotect another a large entry -- should trigger a * flash cache size increase to 12 KB (remember that flash_multiple is @@ -19210,7 +19196,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* protect and unprotect two more large entries -- shouldn't trigger a * flash cache size increase. @@ -19235,7 +19221,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* do many accesses of a single entry to talk the cache into reducing * its size to the minimum. @@ -19261,7 +19247,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* Force another flash increase */ if (pass) { @@ -19283,7 +19269,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* force regular size increase up to maximum */ if (pass) { @@ -19307,7 +19293,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); if (pass) { @@ -19315,7 +19301,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); if (pass) { PASSED(); @@ -19325,7 +19311,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged) } /* end else */ if (!pass) - HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg); + fprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg); return (unsigned)!pass; } /* check_auto_cache_resize() */ @@ -19403,7 +19389,7 @@ check_auto_cache_resize_disable(unsigned paged) pass = TRUE; if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* allocate a cache, enable automatic cache resizing, and then force * the cache through all its operational modes. Verify that all @@ -19448,7 +19434,7 @@ check_auto_cache_resize_disable(unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /****************************************************************** * So far, we have forced the auto cache resize through all modes @@ -19519,7 +19505,7 @@ check_auto_cache_resize_disable(unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* force low hit rate with cache full -- increase disabled so should * be no change in cache size, and result should be increase_disabled. @@ -19547,7 +19533,7 @@ check_auto_cache_resize_disable(unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* force high hit rate -- make sure that we haven't disabled decreases. * should result in a decrease cache size from 4 to 2 Meg. @@ -19575,7 +19561,7 @@ check_auto_cache_resize_disable(unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* force low hit rate again -- increase disabled so should * be no change in cache size, and result should be increase_disabled. @@ -19603,7 +19589,7 @@ check_auto_cache_resize_disable(unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* Repeat the above tests, disabling increase through the lower * threshold instead of the increment. @@ -19670,7 +19656,7 @@ check_auto_cache_resize_disable(unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* force low hit rate with cache full -- increase disabled so should * be no change in cache size, and result should be in_spec. @@ -19698,7 +19684,7 @@ check_auto_cache_resize_disable(unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* force high hit rate -- make sure that we haven't disabled decreases. * should result in a decrease cache size from 4 to 2 Meg. @@ -19726,7 +19712,7 @@ check_auto_cache_resize_disable(unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* force low hit rate again -- increase disabled so should * be no change in cache size, and result should be increase_disabled. @@ -19754,7 +19740,7 @@ check_auto_cache_resize_disable(unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* Repeat the above tests yet again, disabling increase through the * incr_mode. @@ -19822,7 +19808,7 @@ check_auto_cache_resize_disable(unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* force low hit rate with cache full -- increase disabled so should * be no change in cache size, and result should be in_spec. @@ -19850,7 +19836,7 @@ check_auto_cache_resize_disable(unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* force high hit rate -- make sure that we haven't disabled decreases. * should result in a decrease cache size from 4 to 2 Meg. @@ -19878,7 +19864,7 @@ check_auto_cache_resize_disable(unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* force low hit rate again -- increase disabled so should * be no change in cache size, and result should be increase_disabled. @@ -19906,7 +19892,7 @@ check_auto_cache_resize_disable(unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* Now, disable size decreases, and repeat the above tests. */ @@ -19963,7 +19949,7 @@ check_auto_cache_resize_disable(unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); if (pass) { @@ -19976,7 +19962,7 @@ check_auto_cache_resize_disable(unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* force high hit rate -- should be no change in cache size, * and result should be decrease_disabled. @@ -20004,7 +19990,7 @@ check_auto_cache_resize_disable(unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* force low hit rate -- cache size should increase from 4 to 6 Meg. */ @@ -20031,7 +20017,7 @@ check_auto_cache_resize_disable(unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* force high hit rate again -- should be no change in cache size, * and result should be decrease_disabled. @@ -20059,7 +20045,7 @@ check_auto_cache_resize_disable(unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* Repeat the above tests, disabling decrease through the upper * threshold instead of the decrement. @@ -20127,7 +20113,7 @@ check_auto_cache_resize_disable(unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* force high hit rate -- should be no change in cache size, * and result should be in_spec. @@ -20155,7 +20141,7 @@ check_auto_cache_resize_disable(unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* force low hit rate -- cache size should increase from 4 to 6 Meg. */ @@ -20182,7 +20168,7 @@ check_auto_cache_resize_disable(unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* force high hit rate again -- should be no change in cache size, * and result should be in_spec. @@ -20210,7 +20196,7 @@ check_auto_cache_resize_disable(unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* Repeat the above tests, disabling decrease through the decr_mode. */ @@ -20277,7 +20263,7 @@ check_auto_cache_resize_disable(unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* force high hit rate -- should be no change in cache size, * and result should be in_spec. @@ -20305,7 +20291,7 @@ check_auto_cache_resize_disable(unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* force low hit rate -- cache size should increase from 4 to 6 Meg. */ @@ -20332,7 +20318,7 @@ check_auto_cache_resize_disable(unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* force high hit rate again -- should be no change in cache size, * and result should be in_spec. @@ -20360,7 +20346,7 @@ check_auto_cache_resize_disable(unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* Now do tests disabling size decrement in age out mode. * @@ -20429,7 +20415,7 @@ check_auto_cache_resize_disable(unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); if (pass) { @@ -20438,7 +20424,7 @@ check_auto_cache_resize_disable(unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* load up the cache with small entries. Note that it will take an * epoch for the ageout code to initialize itself if it is enabled. @@ -20466,7 +20452,7 @@ check_auto_cache_resize_disable(unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* Load up some more small entries. */ @@ -20493,7 +20479,7 @@ check_auto_cache_resize_disable(unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* Now force a high hit rate so that the size increase code is * is satisfied. We would see a decrease here if decrease were @@ -20522,7 +20508,7 @@ check_auto_cache_resize_disable(unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* force low hit rate -- cache size should increase from 4 to 6 Meg. */ @@ -20549,7 +20535,7 @@ check_auto_cache_resize_disable(unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* just bang on a single entry. This will see to it that there are * many entries that could be aged out were decreases enabled. @@ -20579,7 +20565,7 @@ check_auto_cache_resize_disable(unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* Now disable size decrement in age out mode via the empty reserve. */ @@ -20646,7 +20632,7 @@ check_auto_cache_resize_disable(unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); if (pass) { @@ -20655,7 +20641,7 @@ check_auto_cache_resize_disable(unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* load up the cache with small entries. Note that it will take an * epoch for the ageout code to initialize itself if it is enabled. @@ -20683,7 +20669,7 @@ check_auto_cache_resize_disable(unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* Load up some more small entries. */ @@ -20710,7 +20696,7 @@ check_auto_cache_resize_disable(unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* Now force a high hit rate so that the size increase code is * is satisfied. We would see a decrease here if decrease were @@ -20739,7 +20725,7 @@ check_auto_cache_resize_disable(unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* force low hit rate -- cache size should increase from 4 to 6 Meg. */ @@ -20766,7 +20752,7 @@ check_auto_cache_resize_disable(unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* just bang on a single entry. This will see to it that there are * many entries that could be aged out were decreases enabled. @@ -20796,7 +20782,7 @@ check_auto_cache_resize_disable(unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* Now work with age out with threshold. One can argue that we should * repeat the above age out tests with age out with threshold, but the @@ -20870,7 +20856,7 @@ check_auto_cache_resize_disable(unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); if (pass) { @@ -20879,7 +20865,7 @@ check_auto_cache_resize_disable(unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* load up the cache with small entries. Note that it will take an * epoch for the ageout code to initialize itself if it is enabled. @@ -20907,7 +20893,7 @@ check_auto_cache_resize_disable(unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* Load up some more small entries. */ @@ -20934,7 +20920,7 @@ check_auto_cache_resize_disable(unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* Now force a high hit rate so that the size increase code is * is satisfied. We would see a decrease here if decrease were @@ -20966,7 +20952,7 @@ check_auto_cache_resize_disable(unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* force low hit rate -- cache size should increase from 4 to 6 Meg. */ @@ -20993,7 +20979,7 @@ check_auto_cache_resize_disable(unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* just bang on a single entry. This keeps the hit rate high, and sees * to it that there are many entries that could be aged out were @@ -21025,7 +21011,7 @@ check_auto_cache_resize_disable(unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /********************************************************************* * Finally, use the auto cache resize code to set the size of the @@ -21096,7 +21082,7 @@ check_auto_cache_resize_disable(unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* force low hit rate -- should be no response as the auto-resize * code should be disabled. @@ -21124,7 +21110,7 @@ check_auto_cache_resize_disable(unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* force high hit rate -- should be no response as the auto-resize * code should be disabled. @@ -21152,7 +21138,7 @@ check_auto_cache_resize_disable(unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); if (pass) { @@ -21216,7 +21202,7 @@ check_auto_cache_resize_disable(unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* force low hit rate -- should be no response as the auto-resize * code should be disabled. @@ -21244,7 +21230,7 @@ check_auto_cache_resize_disable(unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* force high hit rate -- should be no response as the auto-resize * code should be disabled. @@ -21272,7 +21258,7 @@ check_auto_cache_resize_disable(unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); if (pass) { @@ -21336,7 +21322,7 @@ check_auto_cache_resize_disable(unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* force low hit rate -- should be no response as the auto-resize * code should be disabled. @@ -21364,7 +21350,7 @@ check_auto_cache_resize_disable(unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* force high hit rate -- should be no response as the auto-resize * code should be disabled. @@ -21392,7 +21378,7 @@ check_auto_cache_resize_disable(unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); if (pass) { @@ -21456,7 +21442,7 @@ check_auto_cache_resize_disable(unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* force low hit rate -- should be no response as the auto-resize * code should be disabled. @@ -21484,7 +21470,7 @@ check_auto_cache_resize_disable(unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* force high hit rate -- should be no response as the auto-resize * code should be disabled. @@ -21512,7 +21498,7 @@ check_auto_cache_resize_disable(unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); if (pass) { @@ -21576,7 +21562,7 @@ check_auto_cache_resize_disable(unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* force low hit rate -- should be no response as the auto-resize * code should be disabled. @@ -21604,7 +21590,7 @@ check_auto_cache_resize_disable(unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* force high hit rate -- should be no response as the auto-resize * code should be disabled. @@ -21632,7 +21618,7 @@ check_auto_cache_resize_disable(unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); if (pass) { @@ -21696,7 +21682,7 @@ check_auto_cache_resize_disable(unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* force low hit rate -- should be no response as the auto-resize * code should be disabled. @@ -21724,7 +21710,7 @@ check_auto_cache_resize_disable(unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* force high hit rate -- should be no response as the auto-resize * code should be disabled. @@ -21752,7 +21738,7 @@ check_auto_cache_resize_disable(unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* Now test the flash cache size increment code to verify that it * is disabled when it should be. @@ -21856,11 +21842,11 @@ check_auto_cache_resize_disable(unsigned paged) (cache_ptr->min_clean_size != (32 * 1024)) || (cache_ptr->index_len != 1) || (cache_ptr->index_size != LARGE_ENTRY_SIZE) || (rpt_fcn_called != FALSE)))) { - HDfprintf(stdout, "\nmax_cache_size = %ld.\n", (long)(cache_ptr->max_cache_size)); - HDfprintf(stdout, "min_clean_size = %ld.\n", (long)(cache_ptr->min_clean_size)); - HDfprintf(stdout, "index_len = %ld.\n", (long)(cache_ptr->index_len)); - HDfprintf(stdout, "index_size = %ld.\n", (long)(cache_ptr->index_size)); - HDfprintf(stdout, "rpt_fcn_called = %ld.\n", (long)(rpt_fcn_called)); + fprintf(stdout, "\nmax_cache_size = %ld.\n", (long)(cache_ptr->max_cache_size)); + fprintf(stdout, "min_clean_size = %ld.\n", (long)(cache_ptr->min_clean_size)); + fprintf(stdout, "index_len = %ld.\n", (long)(cache_ptr->index_len)); + fprintf(stdout, "index_size = %ld.\n", (long)(cache_ptr->index_size)); + fprintf(stdout, "rpt_fcn_called = %ld.\n", (long)(rpt_fcn_called)); pass = FALSE; failure_mssg = "Unexpected cache size change results 46.\n"; @@ -21868,7 +21854,7 @@ check_auto_cache_resize_disable(unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* Now protect and unprotect a monster entry. If the flash cache * size increment code was active, this would trigger an increase. @@ -21888,11 +21874,11 @@ check_auto_cache_resize_disable(unsigned paged) (cache_ptr->min_clean_size != (32 * 1024)) || (cache_ptr->index_len != 1) || (cache_ptr->index_size != MONSTER_ENTRY_SIZE) || (rpt_fcn_called != FALSE)))) { - HDfprintf(stdout, "\nmax_cache_size = %ld.\n", (long)(cache_ptr->max_cache_size)); - HDfprintf(stdout, "min_clean_size = %ld.\n", (long)(cache_ptr->min_clean_size)); - HDfprintf(stdout, "index_len = %ld.\n", (long)(cache_ptr->index_len)); - HDfprintf(stdout, "index_size = %ld.\n", (long)(cache_ptr->index_size)); - HDfprintf(stdout, "rpt_fcn_called = %ld.\n", (long)(rpt_fcn_called)); + fprintf(stdout, "\nmax_cache_size = %ld.\n", (long)(cache_ptr->max_cache_size)); + fprintf(stdout, "min_clean_size = %ld.\n", (long)(cache_ptr->min_clean_size)); + fprintf(stdout, "index_len = %ld.\n", (long)(cache_ptr->index_len)); + fprintf(stdout, "index_size = %ld.\n", (long)(cache_ptr->index_size)); + fprintf(stdout, "rpt_fcn_called = %ld.\n", (long)(rpt_fcn_called)); pass = FALSE; failure_mssg = "Unexpected cache size change results 47.\n"; @@ -21900,7 +21886,7 @@ check_auto_cache_resize_disable(unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); if (pass) { @@ -21908,7 +21894,7 @@ check_auto_cache_resize_disable(unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); if (pass) { PASSED(); @@ -21919,7 +21905,7 @@ check_auto_cache_resize_disable(unsigned paged) if (!pass) { - HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg); + fprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg); } return (unsigned)!pass; @@ -22000,7 +21986,7 @@ check_auto_cache_resize_epoch_markers(unsigned paged) pass = TRUE; if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); if (pass) { @@ -22031,7 +22017,7 @@ check_auto_cache_resize_epoch_markers(unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* Now make sure that we are managing the epoch markers correctly. */ @@ -22098,7 +22084,7 @@ check_auto_cache_resize_epoch_markers(unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* Since we just created the cache, there should be no epoch markers * active. Verify that this is true. @@ -22137,7 +22123,7 @@ check_auto_cache_resize_epoch_markers(unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); if (pass) { @@ -22166,7 +22152,7 @@ check_auto_cache_resize_epoch_markers(unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* we now have a full complement of epoch markers -- see if * we get the expected reduction. @@ -22195,7 +22181,7 @@ check_auto_cache_resize_epoch_markers(unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* now reduce the epochs before eviction, and see if the cache * deletes the extra markers @@ -22262,7 +22248,7 @@ check_auto_cache_resize_epoch_markers(unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* There should be exactly one active epoch marker at present. */ @@ -22302,7 +22288,7 @@ check_auto_cache_resize_epoch_markers(unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* There should be exactly one active epoch marker at present... */ @@ -22391,7 +22377,7 @@ check_auto_cache_resize_epoch_markers(unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* shift the decrement mode to age out with threshold. Set epochs * before eviction to 10 again. @@ -22459,7 +22445,7 @@ check_auto_cache_resize_epoch_markers(unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* build up a full set of epoch markers. */ if (pass) { @@ -22489,7 +22475,7 @@ check_auto_cache_resize_epoch_markers(unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* Verify that there are now 10 active epoch markers. */ @@ -22568,7 +22554,7 @@ check_auto_cache_resize_epoch_markers(unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); /* verify that we still have the expected number of entries in the cache, * and that the cache is of the expected size. @@ -22585,7 +22571,7 @@ check_auto_cache_resize_epoch_markers(unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); if (pass) { @@ -22593,7 +22579,7 @@ check_auto_cache_resize_epoch_markers(unsigned paged) } if (show_progress) - HDfprintf(stderr, "check point %d\n", checkpoint++); + fprintf(stderr, "check point %d\n", checkpoint++); if (pass) { PASSED(); @@ -22604,7 +22590,7 @@ check_auto_cache_resize_epoch_markers(unsigned paged) if (!pass) { - HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg); + fprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg); } return (unsigned)!pass; @@ -24829,7 +24815,7 @@ check_auto_cache_resize_input_errs(unsigned paged) if (!pass) { - HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg); + fprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg); } return (unsigned)!pass; @@ -25318,7 +25304,7 @@ check_auto_cache_resize_aux_fcns(unsigned paged) if (!pass) { - HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg); + fprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg); } return (unsigned)!pass; @@ -25368,7 +25354,7 @@ check_metadata_blizzard_absence(hbool_t fill_via_insertion, unsigned paged) */ hbool_t deserialized = (hbool_t) !(fill_via_insertion); - expected = HDmalloc(150 * sizeof(struct expected_entry_status)); + expected = malloc(150 * sizeof(struct expected_entry_status)); if (expected == NULL) { pass = FALSE; @@ -25392,8 +25378,8 @@ check_metadata_blizzard_absence(hbool_t fill_via_insertion, unsigned paged) expected[i].serialized = FALSE; expected[i].destroyed = FALSE; - HDmemset(expected[i].flush_dep_par_type, 0, sizeof(expected[i].flush_dep_par_type)); - HDmemset(expected[i].flush_dep_par_idx, 0, sizeof(expected[i].flush_dep_par_idx)); + memset(expected[i].flush_dep_par_type, 0, sizeof(expected[i].flush_dep_par_type)); + memset(expected[i].flush_dep_par_idx, 0, sizeof(expected[i].flush_dep_par_idx)); expected[i].flush_dep_npar = 0; expected[i].flush_dep_nchd = 0; @@ -25421,7 +25407,7 @@ check_metadata_blizzard_absence(hbool_t fill_via_insertion, unsigned paged) } /* end else */ if (show_progress) /* 0 */ - HDfprintf(stdout, "\n%s: check point %d -- pass %d\n", __func__, checkpoint++, pass); + fprintf(stdout, "\n%s: check point %d -- pass %d\n", __func__, checkpoint++, pass); if (pass) { @@ -25442,7 +25428,7 @@ check_metadata_blizzard_absence(hbool_t fill_via_insertion, unsigned paged) } if (show_progress) /* 1 */ - HDfprintf(stdout, "%s: check point %d -- pass %d\n", __func__, checkpoint++, pass); + fprintf(stdout, "%s: check point %d -- pass %d\n", __func__, checkpoint++, pass); /* ======================================================================== * ======================================================================== @@ -25505,7 +25491,7 @@ check_metadata_blizzard_absence(hbool_t fill_via_insertion, unsigned paged) } if (show_progress) /* 2 */ - HDfprintf(stdout, "%s: check point %d -- pass %d\n", __func__, checkpoint++, pass); + fprintf(stdout, "%s: check point %d -- pass %d\n", __func__, checkpoint++, pass); /* ======================================================================== * ======================================================================== @@ -25575,7 +25561,7 @@ check_metadata_blizzard_absence(hbool_t fill_via_insertion, unsigned paged) } if (show_progress) /* 3 */ - HDfprintf(stdout, "%s: check point %d -- pass %d\n", __func__, checkpoint++, pass); + fprintf(stdout, "%s: check point %d -- pass %d\n", __func__, checkpoint++, pass); if (pass) { @@ -25629,7 +25615,7 @@ check_metadata_blizzard_absence(hbool_t fill_via_insertion, unsigned paged) } if (show_progress) /* 4 */ - HDfprintf(stdout, "%s: check point %d -- pass %d\n", __func__, checkpoint++, pass); + fprintf(stdout, "%s: check point %d -- pass %d\n", __func__, checkpoint++, pass); if (pass) { @@ -25682,7 +25668,7 @@ check_metadata_blizzard_absence(hbool_t fill_via_insertion, unsigned paged) } if (show_progress) /* 5 */ - HDfprintf(stdout, "%s: check point %d -- pass %d\n", __func__, checkpoint++, pass); + fprintf(stdout, "%s: check point %d -- pass %d\n", __func__, checkpoint++, pass); /* ======================================================================== * ======================================================================== @@ -25757,7 +25743,7 @@ check_metadata_blizzard_absence(hbool_t fill_via_insertion, unsigned paged) } if (show_progress) /* 6 */ - HDfprintf(stdout, "%s: check point %d -- pass %d\n", __func__, checkpoint++, pass); + fprintf(stdout, "%s: check point %d -- pass %d\n", __func__, checkpoint++, pass); if (pass) { @@ -25828,7 +25814,7 @@ check_metadata_blizzard_absence(hbool_t fill_via_insertion, unsigned paged) } if (show_progress) /* 7 */ - HDfprintf(stdout, "%s: check point %d -- pass %d\n", __func__, checkpoint++, pass); + fprintf(stdout, "%s: check point %d -- pass %d\n", __func__, checkpoint++, pass); /* ======================================================================== * ======================================================================== @@ -25887,7 +25873,7 @@ check_metadata_blizzard_absence(hbool_t fill_via_insertion, unsigned paged) } if (show_progress) /* 8 */ - HDfprintf(stdout, "%s: check point %d -- pass %d\n", __func__, checkpoint++, pass); + fprintf(stdout, "%s: check point %d -- pass %d\n", __func__, checkpoint++, pass); if (pass) { @@ -25935,7 +25921,7 @@ check_metadata_blizzard_absence(hbool_t fill_via_insertion, unsigned paged) } if (show_progress) /* 9 */ - HDfprintf(stdout, "%s: check point %d -- pass %d\n", __func__, checkpoint++, pass); + fprintf(stdout, "%s: check point %d -- pass %d\n", __func__, checkpoint++, pass); if (pass) { @@ -25986,7 +25972,7 @@ check_metadata_blizzard_absence(hbool_t fill_via_insertion, unsigned paged) } if (show_progress) /* 10 */ - HDfprintf(stdout, "%s: check point %d -- pass %d\n", __func__, checkpoint++, pass); + fprintf(stdout, "%s: check point %d -- pass %d\n", __func__, checkpoint++, pass); if (pass) { @@ -26032,7 +26018,7 @@ check_metadata_blizzard_absence(hbool_t fill_via_insertion, unsigned paged) } if (show_progress) /* 11 */ - HDfprintf(stdout, "%s: check point %d -- pass %d\n", __func__, checkpoint++, pass); + fprintf(stdout, "%s: check point %d -- pass %d\n", __func__, checkpoint++, pass); if (cache_ptr) { @@ -26042,9 +26028,9 @@ check_metadata_blizzard_absence(hbool_t fill_via_insertion, unsigned paged) } if (show_progress) /* 12 */ - HDfprintf(stdout, "%s: check point %d -- pass %d\n", __func__, checkpoint++, pass); + fprintf(stdout, "%s: check point %d -- pass %d\n", __func__, checkpoint++, pass); - HDfree(expected); + free(expected); if (pass) { PASSED(); @@ -27974,7 +27960,7 @@ done: PASSED(); else { H5_FAILED(); - HDfprintf(stdout, "%s.\n", failure_mssg); + fprintf(stdout, "%s.\n", failure_mssg); } /* end else */ return (unsigned)!pass; @@ -28240,7 +28226,7 @@ done: PASSED(); else { H5_FAILED(); - HDfprintf(stdout, "%s.\n", failure_mssg); + fprintf(stdout, "%s.\n", failure_mssg); } /* end else */ return (unsigned)!pass; @@ -30970,7 +30956,7 @@ done: PASSED(); else { H5_FAILED(); - HDfprintf(stdout, "%s.\n", failure_mssg); + fprintf(stdout, "%s.\n", failure_mssg); } /* end else */ return (unsigned)!pass; @@ -31186,7 +31172,7 @@ done: PASSED(); else { H5_FAILED(); - HDfprintf(stdout, "%s.\n", failure_mssg); + fprintf(stdout, "%s.\n", failure_mssg); } /* end else */ return (unsigned)!pass; @@ -31225,7 +31211,7 @@ check_metadata_cork(hbool_t fill_via_insertion, unsigned paged) */ hbool_t deserialized = (hbool_t) !(fill_via_insertion); - expected = HDmalloc(150 * sizeof(struct expected_entry_status)); + expected = malloc(150 * sizeof(struct expected_entry_status)); if (expected == NULL) { pass = FALSE; @@ -31249,8 +31235,8 @@ check_metadata_cork(hbool_t fill_via_insertion, unsigned paged) expected[i].serialized = FALSE; expected[i].destroyed = FALSE; - HDmemset(expected[i].flush_dep_par_type, 0, sizeof(expected[i].flush_dep_par_type)); - HDmemset(expected[i].flush_dep_par_idx, 0, sizeof(expected[i].flush_dep_par_idx)); + memset(expected[i].flush_dep_par_type, 0, sizeof(expected[i].flush_dep_par_type)); + memset(expected[i].flush_dep_par_idx, 0, sizeof(expected[i].flush_dep_par_idx)); expected[i].flush_dep_npar = 0; expected[i].flush_dep_nchd = 0; @@ -31270,7 +31256,7 @@ check_metadata_cork(hbool_t fill_via_insertion, unsigned paged) TESTING("to ensure cork/uncork metadata on protect/unprotect"); if (show_progress) /* 0 */ - HDfprintf(stdout, "\n%s: check point %d -- pass %d\n", fcn_name, checkpoint++, pass); + fprintf(stdout, "\n%s: check point %d -- pass %d\n", fcn_name, checkpoint++, pass); if (pass) { @@ -31294,7 +31280,7 @@ check_metadata_cork(hbool_t fill_via_insertion, unsigned paged) cork_entry_type(file_ptr, entry_type); if (show_progress) /* 1 */ - HDfprintf(stdout, "%s: check point %d -- pass %d\n", fcn_name, checkpoint++, pass); + fprintf(stdout, "%s: check point %d -- pass %d\n", fcn_name, checkpoint++, pass); /* ======================================================================== * ======================================================================== @@ -31347,7 +31333,7 @@ check_metadata_cork(hbool_t fill_via_insertion, unsigned paged) } if (show_progress) /* 2 */ - HDfprintf(stdout, "%s: check point %d -- pass %d\n", fcn_name, checkpoint++, pass); + fprintf(stdout, "%s: check point %d -- pass %d\n", fcn_name, checkpoint++, pass); /* ======================================================================== * ======================================================================== @@ -31403,7 +31389,7 @@ check_metadata_cork(hbool_t fill_via_insertion, unsigned paged) } if (show_progress) /* 3 */ - HDfprintf(stdout, "%s: check point %d -- pass %d\n", fcn_name, checkpoint++, pass); + fprintf(stdout, "%s: check point %d -- pass %d\n", fcn_name, checkpoint++, pass); if (pass) { @@ -31444,7 +31430,7 @@ check_metadata_cork(hbool_t fill_via_insertion, unsigned paged) } if (show_progress) /* 4 */ - HDfprintf(stdout, "%s: check point %d -- pass %d\n", fcn_name, checkpoint++, pass); + fprintf(stdout, "%s: check point %d -- pass %d\n", fcn_name, checkpoint++, pass); if (pass) { @@ -31493,7 +31479,7 @@ check_metadata_cork(hbool_t fill_via_insertion, unsigned paged) } if (show_progress) /* 5 */ - HDfprintf(stdout, "%s: check point %d -- pass %d\n", fcn_name, checkpoint++, pass); + fprintf(stdout, "%s: check point %d -- pass %d\n", fcn_name, checkpoint++, pass); /* ======================================================================== * ======================================================================== @@ -31506,7 +31492,7 @@ check_metadata_cork(hbool_t fill_via_insertion, unsigned paged) */ if (show_progress) /* 6 */ - HDfprintf(stdout, "%s: check point %d -- pass %d\n", fcn_name, checkpoint++, pass); + fprintf(stdout, "%s: check point %d -- pass %d\n", fcn_name, checkpoint++, pass); if (pass) { @@ -31545,7 +31531,7 @@ check_metadata_cork(hbool_t fill_via_insertion, unsigned paged) } if (show_progress) /* 7 */ - HDfprintf(stdout, "%s: check point %d -- pass %d\n", fcn_name, checkpoint++, pass); + fprintf(stdout, "%s: check point %d -- pass %d\n", fcn_name, checkpoint++, pass); /* ======================================================================== * ======================================================================== @@ -31589,7 +31575,7 @@ check_metadata_cork(hbool_t fill_via_insertion, unsigned paged) } if (show_progress) /* 8 */ - HDfprintf(stdout, "%s: check point %d -- pass %d\n", fcn_name, checkpoint++, pass); + fprintf(stdout, "%s: check point %d -- pass %d\n", fcn_name, checkpoint++, pass); if (pass) { @@ -31632,7 +31618,7 @@ check_metadata_cork(hbool_t fill_via_insertion, unsigned paged) } if (show_progress) /* 9 */ - HDfprintf(stdout, "%s: check point %d -- pass %d\n", fcn_name, checkpoint++, pass); + fprintf(stdout, "%s: check point %d -- pass %d\n", fcn_name, checkpoint++, pass); if (pass) { @@ -31676,7 +31662,7 @@ check_metadata_cork(hbool_t fill_via_insertion, unsigned paged) } if (show_progress) /* 10 */ - HDfprintf(stdout, "%s: check point %d -- pass %d\n", fcn_name, checkpoint++, pass); + fprintf(stdout, "%s: check point %d -- pass %d\n", fcn_name, checkpoint++, pass); if (pass) { @@ -31716,7 +31702,7 @@ check_metadata_cork(hbool_t fill_via_insertion, unsigned paged) } if (show_progress) /* 11 */ - HDfprintf(stdout, "%s: check point %d -- pass %d\n", fcn_name, checkpoint++, pass); + fprintf(stdout, "%s: check point %d -- pass %d\n", fcn_name, checkpoint++, pass); if (pass) { @@ -31760,16 +31746,16 @@ check_metadata_cork(hbool_t fill_via_insertion, unsigned paged) } if (show_progress) /* 12 */ - HDfprintf(stdout, "%s: check point %d -- pass %d\n", fcn_name, checkpoint++, pass); + fprintf(stdout, "%s: check point %d -- pass %d\n", fcn_name, checkpoint++, pass); /* We're done with testing. We can take down the cache. */ takedown_cache(file_ptr, FALSE, FALSE); reset_entries(); if (show_progress) /* 13 */ - HDfprintf(stdout, "%s: check point %d -- pass %d\n", fcn_name, checkpoint++, pass); + fprintf(stdout, "%s: check point %d -- pass %d\n", fcn_name, checkpoint++, pass); - HDfree(expected); + free(expected); if (pass) { PASSED(); @@ -31869,7 +31855,7 @@ check_entry_deletions_during_scans(unsigned paged) if (!pass) { - HDfprintf(stdout, "%s(): failure_mssg = \"%s\".\n", __func__, failure_mssg); + fprintf(stdout, "%s(): failure_mssg = \"%s\".\n", __func__, failure_mssg); } return (unsigned)!pass; @@ -31909,7 +31895,7 @@ cedds__expunge_dirty_entry_in_flush_test(H5F_t *file_ptr) H5C_t *cache_ptr = file_ptr->shared->cache; int i; - expected = HDmalloc(36 * sizeof(struct expected_entry_status)); + expected = malloc(36 * sizeof(struct expected_entry_status)); if (expected == NULL) { pass = FALSE; @@ -32103,7 +32089,7 @@ cedds__expunge_dirty_entry_in_flush_test(H5F_t *file_ptr) /* reset cache min clean size to its expected value */ cache_ptr->min_clean_size = (1 * 1024 * 1024); - HDfree(expected); + free(expected); } /* cedds__expunge_dirty_entry_in_flush_test() */ @@ -32143,7 +32129,7 @@ cedds__H5C_make_space_in_cache(H5F_t *file_ptr) const int num_huge_entries = 4; const int num_monster_entries = 32; - expected = HDmalloc(36 * sizeof(struct expected_entry_status)); + expected = malloc(36 * sizeof(struct expected_entry_status)); if (expected == NULL) { pass = FALSE; @@ -32457,7 +32443,7 @@ cedds__H5C_make_space_in_cache(H5F_t *file_ptr) /* reset cache min clean size to its expected value */ cache_ptr->min_clean_size = (1 * 1024 * 1024); - HDfree(expected); + free(expected); } /* cedds__H5C_make_space_in_cache() */ @@ -32538,7 +32524,7 @@ cedds__H5C__autoadjust__ageout__evict_aged_out_entries(H5F_t *file_ptr) /* hbool_t apply_empty_reserve = */ TRUE, /* double empty_reserve = */ 0.05}; - expected = HDmalloc(36 * sizeof(struct expected_entry_status)); + expected = malloc(36 * sizeof(struct expected_entry_status)); if (expected == NULL) { pass = FALSE; @@ -32848,7 +32834,7 @@ cedds__H5C__autoadjust__ageout__evict_aged_out_entries(H5F_t *file_ptr) /* reset cache min clean size to its expected value */ cache_ptr->min_clean_size = (1 * 1024 * 1024); - HDfree(expected); + free(expected); } /* cedds__H5C__autoadjust__ageout__evict_aged_out_entries() */ @@ -33027,7 +33013,7 @@ cedds__H5C_flush_invalidate_cache__bucket_scan(H5F_t *file_ptr) entry_ptr = &(base_addr[0]); entry_addr = entry_ptr->header.addr; - HDassert(entry_addr == entry_ptr->addr); + assert(entry_addr == entry_ptr->addr); expected_hash_bucket = H5C__HASH_FCN(entry_addr); @@ -33281,14 +33267,14 @@ check_stats(unsigned paged) if (!pass) { - HDfprintf(stdout, "%s(): failure_mssg = \"%s\".\n", __func__, failure_mssg); + fprintf(stdout, "%s(): failure_mssg = \"%s\".\n", __func__, failure_mssg); } #else /* H5C_COLLECT_CACHE_STATS */ SKIPPED(); - HDfprintf(stdout, " Statistics collection disabled.\n"); + fprintf(stdout, " Statistics collection disabled.\n"); #endif /* H5C_COLLECT_CACHE_STATS */ @@ -33694,7 +33680,7 @@ check_stats__smoke_check_1(H5F_t *file_ptr) static herr_t check_write_permitted(const H5F_t H5_ATTR_UNUSED *f, hbool_t *write_permitted_ptr) { - HDassert(write_permitted_ptr); + assert(write_permitted_ptr); *write_permitted_ptr = write_permitted; @@ -33749,7 +33735,7 @@ setup_cache(size_t max_cache_size, size_t min_clean_size, unsigned paged) hid_t fcpl_id = H5P_DEFAULT; if (show_progress) /* 1 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); saved_fid = -1; @@ -33792,7 +33778,7 @@ setup_cache(size_t max_cache_size, size_t min_clean_size, unsigned paged) } if (show_progress) /* 2 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); if (pass && try_core_file_driver) { if ((fapl_id = H5Pcreate(H5P_FILE_ACCESS)) == FAIL) { @@ -33809,7 +33795,7 @@ setup_cache(size_t max_cache_size, size_t min_clean_size, unsigned paged) core_file_driver_failed = TRUE; if (verbose) - HDfprintf(stdout, "%s: H5Fcreate() with CFD failed.\n", __func__); + fprintf(stdout, "%s: H5Fcreate() with CFD failed.\n", __func__); } else { saved_fapl_id = fapl_id; @@ -33817,7 +33803,7 @@ setup_cache(size_t max_cache_size, size_t min_clean_size, unsigned paged) } if (show_progress) /* 3 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); /* if we either aren't using the core file driver, or a create * with the core file driver failed, try again with a regular file. @@ -33832,7 +33818,7 @@ setup_cache(size_t max_cache_size, size_t min_clean_size, unsigned paged) failure_mssg = "H5Fcreate() failed."; if (verbose) - HDfprintf(stdout, "%s: H5Fcreate() failed.\n", __func__); + fprintf(stdout, "%s: H5Fcreate() failed.\n", __func__); } /* end if */ } /* end if */ @@ -33840,17 +33826,17 @@ setup_cache(size_t max_cache_size, size_t min_clean_size, unsigned paged) H5CX_push(); if (show_progress) /* 4 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); if (pass) { - HDassert(fid >= 0); + assert(fid >= 0); saved_fid = fid; if (H5Fflush(fid, H5F_SCOPE_GLOBAL) < 0) { pass = FALSE; failure_mssg = "H5Fflush() failed."; if (verbose) - HDfprintf(stdout, "%s: H5Fflush() failed.\n", __func__); + fprintf(stdout, "%s: H5Fflush() failed.\n", __func__); } else { file_ptr = (H5F_t *)H5VL_object_verify(fid, H5I_FILE); @@ -33859,13 +33845,13 @@ setup_cache(size_t max_cache_size, size_t min_clean_size, unsigned paged) failure_mssg = "Can't get file_ptr."; if (verbose) - HDfprintf(stdout, "%s: H5Fflush() failed.\n", __func__); + fprintf(stdout, "%s: H5Fflush() failed.\n", __func__); } } } if (show_progress) /* 5 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); if (pass) { @@ -33897,7 +33883,7 @@ setup_cache(size_t max_cache_size, size_t min_clean_size, unsigned paged) * instance, and then close the file normally. */ - HDassert(saved_cache == NULL); + assert(saved_cache == NULL); saved_cache = file_ptr->shared->cache; file_ptr->shared->cache = NULL; @@ -33908,7 +33894,7 @@ setup_cache(size_t max_cache_size, size_t min_clean_size, unsigned paged) } if (show_progress) /* 6 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); if (pass) { if (cache_ptr == NULL) { @@ -33916,19 +33902,19 @@ setup_cache(size_t max_cache_size, size_t min_clean_size, unsigned paged) failure_mssg = "H5C_create() failed."; if (verbose) - HDfprintf(stdout, "%s: H5C_create() failed.\n", __func__); + fprintf(stdout, "%s: H5C_create() failed.\n", __func__); } else if (cache_ptr->magic != H5C__H5C_T_MAGIC) { pass = FALSE; failure_mssg = "Bad cache_ptr magic."; if (verbose) - HDfprintf(stdout, "%s: Bad cache_ptr magic.\n", __func__); + fprintf(stdout, "%s: Bad cache_ptr magic.\n", __func__); } } if (show_progress) /* 7 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); if (pass) { /* allocate space for test entries */ actual_base_addr = H5MF_alloc(file_ptr, H5FD_MEM_DEFAULT, (hsize_t)(ADDR_SPACE_SIZE + BASE_ADDR)); @@ -33938,7 +33924,7 @@ setup_cache(size_t max_cache_size, size_t min_clean_size, unsigned paged) failure_mssg = "H5MF_alloc() failed."; if (verbose) - HDfprintf(stdout, "%s: H5MF_alloc() failed.\n", __func__); + fprintf(stdout, "%s: H5MF_alloc() failed.\n", __func__); } else if (actual_base_addr > BASE_ADDR) { /* If this happens, must increase BASE_ADDR so that the @@ -33949,14 +33935,14 @@ setup_cache(size_t max_cache_size, size_t min_clean_size, unsigned paged) failure_mssg = "actual_base_addr > BASE_ADDR"; if (verbose) - HDfprintf(stdout, "%s: actual_base_addr > BASE_ADDR.\n", __func__); + fprintf(stdout, "%s: actual_base_addr > BASE_ADDR.\n", __func__); } saved_actual_base_addr = actual_base_addr; } if (show_progress) /* 8 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); if (pass) { /* Need to set this else all cache tests will fail */ @@ -33967,7 +33953,7 @@ setup_cache(size_t max_cache_size, size_t min_clean_size, unsigned paged) } if (show_progress) /* 9 */ - HDfprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); + fprintf(stdout, "%s() - %0d -- pass = %d\n", __func__, mile_stone++, (int)pass); return (ret_val); } /* setup_cache() */ @@ -34036,7 +34022,7 @@ takedown_cache(H5F_t *file_ptr, hbool_t dump_stats, hbool_t dump_detailed_stats) if (NULL == file_ptr) { file_ptr = (H5F_t *)H5VL_object_verify(saved_fid, H5I_FILE); - HDassert(file_ptr); + assert(file_ptr); } H5MF_xfree(file_ptr, H5FD_MEM_DEFAULT, saved_actual_base_addr, @@ -34097,19 +34083,19 @@ main(void) express_test = GetTestExpress(); - HDprintf("=========================================\n"); - HDprintf("Internal cache tests\n"); - HDprintf(" express_test = %d\n", express_test); - HDprintf("=========================================\n"); + printf("=========================================\n"); + printf("Internal cache tests\n"); + printf(" express_test = %d\n", express_test); + printf("=========================================\n"); if (!h5_using_default_driver(NULL)) { HDputs(" -- SKIPPED for incompatible VFD --"); - HDexit(EXIT_SUCCESS); + exit(EXIT_SUCCESS); } if (create_entry_arrays() < 0) { - HDprintf("ERROR: Unable to create entries arrays. Aborting.\n"); + printf("ERROR: Unable to create entries arrays. Aborting.\n"); return EXIT_FAILURE; } /* end if */ @@ -34119,12 +34105,12 @@ main(void) if (paged) { - HDfprintf(stdout, "\n\nRe-running tests with paged aggregation:\n"); + fprintf(stdout, "\n\nRe-running tests with paged aggregation:\n"); if (express_test > 0) - HDfprintf(stdout, " Skipping smoke checks.\n"); + fprintf(stdout, " Skipping smoke checks.\n"); - HDfprintf(stdout, "\n"); + fprintf(stdout, "\n"); } nerrs += smoke_check_1(express_test, paged); diff --git a/test/cache_api.c b/test/cache_api.c index a34a6ca..184a879 100644 --- a/test/cache_api.c +++ b/test/cache_api.c @@ -477,7 +477,7 @@ check_fapl_mdc_api_calls(unsigned paged, hid_t fcpl_id) if (!pass) { - HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg); + fprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg); } return pass; @@ -802,7 +802,7 @@ check_file_mdc_api_calls(unsigned paged, hid_t fcpl_id) if (!pass) { - HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg); + fprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg); } return pass; @@ -966,7 +966,7 @@ mdc_api_call_smoke_check(int express_test, unsigned paged, hid_t fcpl_id) SKIPPED(); - HDfprintf(stdout, " Long tests disabled.\n"); + fprintf(stdout, " Long tests disabled.\n"); return pass; } @@ -1420,7 +1420,7 @@ mdc_api_call_smoke_check(int express_test, unsigned paged, hid_t fcpl_id) if (!pass) { - HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg); + fprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg); } return pass; @@ -1457,8 +1457,7 @@ init_invalid_configs(void) H5AC_cache_config_t *configs = NULL; /* Allocate memory */ - if (NULL == - (configs = (H5AC_cache_config_t *)HDcalloc(NUM_INVALID_CONFIGS, sizeof(H5AC_cache_config_t)))) { + if (NULL == (configs = (H5AC_cache_config_t *)calloc(NUM_INVALID_CONFIGS, sizeof(H5AC_cache_config_t)))) { return NULL; } @@ -1798,7 +1797,7 @@ check_fapl_mdc_api_errs(void) if (!pass) { - HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg); + fprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg); } return pass; @@ -1851,7 +1850,7 @@ check_file_mdc_api_errs(unsigned paged, hid_t fcpl_id) if (show_progress) { - HDfprintf(stdout, "%s: calling h5_fixname().\n", __func__); + fprintf(stdout, "%s: calling h5_fixname().\n", __func__); } if (h5_fixname(FILENAME[0], H5P_DEFAULT, filename, sizeof(filename)) == NULL) { @@ -1865,7 +1864,7 @@ check_file_mdc_api_errs(unsigned paged, hid_t fcpl_id) if (show_progress) { - HDfprintf(stdout, "%s: calling H5Fcreate().\n", __func__); + fprintf(stdout, "%s: calling H5Fcreate().\n", __func__); } file_id = H5Fcreate(filename, H5F_ACC_TRUNC, fcpl_id, H5P_DEFAULT); @@ -1886,7 +1885,7 @@ check_file_mdc_api_errs(unsigned paged, hid_t fcpl_id) if (show_progress) { - HDfprintf(stdout, "%s: testing H5Fget_mdc_config() 1.\n", __func__); + fprintf(stdout, "%s: testing H5Fget_mdc_config() 1.\n", __func__); } H5E_BEGIN_TRY @@ -1906,7 +1905,7 @@ check_file_mdc_api_errs(unsigned paged, hid_t fcpl_id) if (show_progress) { - HDfprintf(stdout, "%s: testing H5Fget_mdc_config() 2.\n", __func__); + fprintf(stdout, "%s: testing H5Fget_mdc_config() 2.\n", __func__); } H5E_BEGIN_TRY @@ -1927,7 +1926,7 @@ check_file_mdc_api_errs(unsigned paged, hid_t fcpl_id) if (show_progress) { - HDfprintf(stdout, "%s: testing H5Fget_mdc_config() 3.\n", __func__); + fprintf(stdout, "%s: testing H5Fget_mdc_config() 3.\n", __func__); } H5E_BEGIN_TRY @@ -1950,7 +1949,7 @@ check_file_mdc_api_errs(unsigned paged, hid_t fcpl_id) if (show_progress) { - HDfprintf(stdout, "%s: testing H5Fset_mdc_config() 1.\n", __func__); + fprintf(stdout, "%s: testing H5Fset_mdc_config() 1.\n", __func__); } H5E_BEGIN_TRY @@ -1970,7 +1969,7 @@ check_file_mdc_api_errs(unsigned paged, hid_t fcpl_id) if (show_progress) { - HDfprintf(stdout, "%s: testing H5Fset_mdc_config() 2.\n", __func__); + fprintf(stdout, "%s: testing H5Fset_mdc_config() 2.\n", __func__); } H5E_BEGIN_TRY @@ -1990,7 +1989,7 @@ check_file_mdc_api_errs(unsigned paged, hid_t fcpl_id) while ((pass) && (i < NUM_INVALID_CONFIGS)) { if (show_progress) { - HDfprintf(stdout, "%s: testing H5Fset_mdc_config() with invalid config %d.\n", __func__, i); + fprintf(stdout, "%s: testing H5Fset_mdc_config() with invalid config %d.\n", __func__, i); } H5E_BEGIN_TRY @@ -2018,7 +2017,7 @@ check_file_mdc_api_errs(unsigned paged, hid_t fcpl_id) if (show_progress) { - HDfprintf(stdout, "%s: testing H5Fget_mdc_hit_rate() 1.\n", __func__); + fprintf(stdout, "%s: testing H5Fget_mdc_hit_rate() 1.\n", __func__); } H5E_BEGIN_TRY @@ -2038,7 +2037,7 @@ check_file_mdc_api_errs(unsigned paged, hid_t fcpl_id) if (show_progress) { - HDfprintf(stdout, "%s: testing H5Fget_mdc_hit_rate() 2.\n", __func__); + fprintf(stdout, "%s: testing H5Fget_mdc_hit_rate() 2.\n", __func__); } H5E_BEGIN_TRY @@ -2059,7 +2058,7 @@ check_file_mdc_api_errs(unsigned paged, hid_t fcpl_id) if (show_progress) { - HDfprintf(stdout, "%s: testing H5Freset_mdc_hit_rate_stats().\n", __func__); + fprintf(stdout, "%s: testing H5Freset_mdc_hit_rate_stats().\n", __func__); } H5E_BEGIN_TRY @@ -2080,7 +2079,7 @@ check_file_mdc_api_errs(unsigned paged, hid_t fcpl_id) if (show_progress) { - HDfprintf(stdout, "%s: testing H5Fget_mdc_size() 1.\n", __func__); + fprintf(stdout, "%s: testing H5Fget_mdc_size() 1.\n", __func__); } H5E_BEGIN_TRY @@ -2100,7 +2099,7 @@ check_file_mdc_api_errs(unsigned paged, hid_t fcpl_id) if (show_progress) { - HDfprintf(stdout, "%s: testing H5Fget_mdc_size() 2.\n", __func__); + fprintf(stdout, "%s: testing H5Fget_mdc_size() 2.\n", __func__); } if ((H5Fget_mdc_size(file_id, &max_size, NULL, NULL, NULL) < 0) || @@ -2119,7 +2118,7 @@ check_file_mdc_api_errs(unsigned paged, hid_t fcpl_id) if (show_progress) { - HDfprintf(stdout, "%s: cleaning up from tests.\n", __func__); + fprintf(stdout, "%s: cleaning up from tests.\n", __func__); } if (H5Fclose(file_id) < 0) { @@ -2145,7 +2144,7 @@ check_file_mdc_api_errs(unsigned paged, hid_t fcpl_id) if (!pass) { - HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg); + fprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg); } return pass; @@ -2177,36 +2176,36 @@ main(void) express_test = GetTestExpress(); - HDprintf("===================================\n"); - HDprintf("Cache API tests\n"); - HDprintf(" express_test = %d\n", express_test); - HDprintf("===================================\n"); + printf("===================================\n"); + printf("Cache API tests\n"); + printf(" express_test = %d\n", express_test); + printf("===================================\n"); /* Initialize invalid configurations. */ invalid_configs = init_invalid_configs(); if (NULL == invalid_configs) { failure_mssg = "Unable to allocate memory for invalid configs."; - HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg); + fprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg); return EXIT_FAILURE; } /* end if */ if ((fcpl_id = H5Pcreate(H5P_FILE_CREATE)) < 0) { failure_mssg = "H5Pcreate(H5P_FILE_CREATE) failed.\n"; - HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg); + fprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg); return EXIT_FAILURE; } /* end if */ /* Set file space strategy to default or paged aggregation strategy */ if ((fcpl2_id = H5Pcopy(fcpl_id)) < 0) { failure_mssg = "H5Pcreate(H5P_FILE_CREATE) failed.\n"; - HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg); + fprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg); return EXIT_FAILURE; } /* end if */ if (H5Pset_file_space_strategy(fcpl2_id, H5F_FSPACE_STRATEGY_PAGE, 1, (hsize_t)1) < 0) { failure_mssg = "H5Pset_file_space_strategy() failed.\n"; - HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg); + fprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg); return EXIT_FAILURE; } /* end if */ @@ -2240,11 +2239,11 @@ main(void) nerrs += 1; if (invalid_configs) - HDfree(invalid_configs); + free(invalid_configs); if (H5Pclose(fcpl_id) < 0) { failure_mssg = "H5Pclose() failed.\n"; - HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg); + fprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg); return EXIT_FAILURE; } /* end if */ diff --git a/test/cache_common.c b/test/cache_common.c index e647abf..aaf42f1 100644 --- a/test/cache_common.c +++ b/test/cache_common.c @@ -389,8 +389,8 @@ addr_to_type_and_index(haddr_t addr, int32_t *type_ptr, int32_t *index_ptr) int32_t type; int32_t idx; - HDassert(type_ptr); - HDassert(index_ptr); + assert(type_ptr); + assert(index_ptr); /* we only have a small number of entry types, so just do a * linear search. If NUMBER_OF_ENTRY_TYPES grows, we may want @@ -412,24 +412,24 @@ addr_to_type_and_index(haddr_t addr, int32_t *type_ptr, int32_t *index_ptr) type = i - 1; - HDassert((type >= 0) && (type < NUMBER_OF_ENTRY_TYPES)); + assert((type >= 0) && (type < NUMBER_OF_ENTRY_TYPES)); if (addr >= PICO_ALT_BASE_ADDR) { idx = (int32_t)((addr - alt_base_addrs[type]) / entry_sizes[type]); - HDassert((idx >= 0) && (idx <= max_indices[type])); - HDassert(!((entries[type])[idx].at_main_addr)); - HDassert(addr == (entries[type])[idx].alt_addr); + assert((idx >= 0) && (idx <= max_indices[type])); + assert(!((entries[type])[idx].at_main_addr)); + assert(addr == (entries[type])[idx].alt_addr); } else { idx = (int32_t)((addr - base_addrs[type]) / entry_sizes[type]); - HDassert((idx >= 0) && (idx <= max_indices[type])); - HDassert((entries[type])[idx].at_main_addr); - HDassert(addr == (entries[type])[idx].main_addr); + assert((idx >= 0) && (idx <= max_indices[type])); + assert((entries[type])[idx].at_main_addr); + assert(addr == (entries[type])[idx].main_addr); } - HDassert(addr == (entries[type])[idx].addr); + assert(addr == (entries[type])[idx].addr); *type_ptr = type; *index_ptr = idx; @@ -465,15 +465,15 @@ get_initial_load_size(void *udata, size_t *image_length, int32_t H5_ATTR_NDEBUG_ base_addr = entries[type]; entry = &(base_addr[idx]); - HDassert(entry->type >= 0); - HDassert(entry->type == type); - HDassert(entry->type == entry_type); - HDassert(entry->type < NUMBER_OF_ENTRY_TYPES); - HDassert(entry->index == idx); - HDassert(entry->index >= 0); - HDassert(entry->index <= max_indices[type]); - HDassert(entry == entry->self); - HDassert(entry->addr == addr); + assert(entry->type >= 0); + assert(entry->type == type); + assert(entry->type == entry_type); + assert(entry->type < NUMBER_OF_ENTRY_TYPES); + assert(entry->index == idx); + assert(entry->index >= 0); + assert(entry->index <= max_indices[type]); + assert(entry == entry->self); + assert(entry->addr == addr); *image_length = entry->size; @@ -574,16 +574,16 @@ get_final_load_size(const void H5_ATTR_UNUSED *image, size_t H5_ATTR_UNUSED imag base_addr = entries[type]; entry = &(base_addr[idx]); - HDassert(entry->type >= 0); - HDassert(entry->type == type); - HDassert(entry->type == entry_type); - HDassert(entry->type < NUMBER_OF_ENTRY_TYPES); - HDassert(entry->index == idx); - HDassert(entry->index >= 0); - HDassert(entry->index <= max_indices[type]); - HDassert(entry == entry->self); - HDassert(entry->addr == addr); - HDassert(type == VARIABLE_ENTRY_TYPE); + assert(entry->type >= 0); + assert(entry->type == type); + assert(entry->type == entry_type); + assert(entry->type < NUMBER_OF_ENTRY_TYPES); + assert(entry->index == idx); + assert(entry->index >= 0); + assert(entry->index <= max_indices[type]); + assert(entry == entry->self); + assert(entry->addr == addr); + assert(type == VARIABLE_ENTRY_TYPE); /* Simulate SPECULATIVE read with a specified actual_len */ if (entry->actual_len) { @@ -633,16 +633,16 @@ verify_chksum(const void H5_ATTR_UNUSED *image, size_t H5_ATTR_UNUSED len, void base_addr = entries[type]; entry = &(base_addr[idx]); - HDassert(entry->type >= 0); - HDassert(entry->type == type); - HDassert(entry->type == entry_type); - HDassert(entry->type < NUMBER_OF_ENTRY_TYPES); - HDassert(type == VARIABLE_ENTRY_TYPE); - HDassert(entry->index == idx); - HDassert(entry->index >= 0); - HDassert(entry->index <= max_indices[type]); - HDassert(entry == entry->self); - HDassert(entry->addr == addr); + assert(entry->type >= 0); + assert(entry->type == type); + assert(entry->type == entry_type); + assert(entry->type < NUMBER_OF_ENTRY_TYPES); + assert(type == VARIABLE_ENTRY_TYPE); + assert(entry->index == idx); + assert(entry->index >= 0); + assert(entry->index <= max_indices[type]); + assert(entry == entry->self); + assert(entry->addr == addr); if (++entry->verify_ct >= entry->max_verify_ct) return (TRUE); @@ -686,48 +686,48 @@ deserialize(const void *image, size_t H5_ATTR_NDEBUG_UNUSED len, void *udata, hb base_addr = entries[type]; entry = &(base_addr[idx]); - HDassert(entry->type >= 0); - HDassert(entry->type == type); - HDassert(entry->type == entry_type); - HDassert(entry->type < NUMBER_OF_ENTRY_TYPES); - HDassert(entry->index == idx); - HDassert(entry->index >= 0); - HDassert(entry->index <= max_indices[type]); - HDassert(entry == entry->self); - HDassert(entry->addr == addr); - HDassert(entry->size == len); - HDassert((entry->type == VARIABLE_ENTRY_TYPE) || (entry->size == entry_sizes[type])); - HDassert(dirty != NULL); - HDassert(entry->flush_dep_npar == 0); - HDassert(entry->flush_dep_nchd == 0); + assert(entry->type >= 0); + assert(entry->type == type); + assert(entry->type == entry_type); + assert(entry->type < NUMBER_OF_ENTRY_TYPES); + assert(entry->index == idx); + assert(entry->index >= 0); + assert(entry->index <= max_indices[type]); + assert(entry == entry->self); + assert(entry->addr == addr); + assert(entry->size == len); + assert((entry->type == VARIABLE_ENTRY_TYPE) || (entry->size == entry_sizes[type])); + assert(dirty != NULL); + assert(entry->flush_dep_npar == 0); + assert(entry->flush_dep_nchd == 0); /* for now *dirty will always be FALSE */ *dirty = FALSE; /* verify that the image contains the expected data. */ - HDassert(image != NULL); + assert(image != NULL); if ((entry->at_main_addr && entry->written_to_main_addr) || (!entry->at_main_addr && entry->written_to_alt_addr)) { if ((type == PICO_ENTRY_TYPE) || (type == VARIABLE_ENTRY_TYPE) || (type == NOTIFY_ENTRY_TYPE)) { if ((*((const char *)image)) != (char)(idx & 0xFF)) { - HDfprintf(stdout, "type = %d, idx = %d, addr = 0x%lx.\n", type, idx, (long)addr); - HDfprintf(stdout, "*image = 0x%x\n", (int)(*((const char *)image))); - HDfprintf(stdout, "expected *image = 0x%x\n", (int)(idx & 0xFF)); + fprintf(stdout, "type = %d, idx = %d, addr = 0x%lx.\n", type, idx, (long)addr); + fprintf(stdout, "*image = 0x%x\n", (int)(*((const char *)image))); + fprintf(stdout, "expected *image = 0x%x\n", (int)(idx & 0xFF)); } /* end if */ - HDassert((*((const char *)image)) == (char)(idx & 0xFF)); + assert((*((const char *)image)) == (char)(idx & 0xFF)); } /* end if */ else { if ((*(((const char *)image) + 2)) != (char)(idx & 0xFF)) { - HDfprintf(stdout, "type = %d, idx = %d, addr = 0x%lx.\n", type, idx, (long)addr); - HDfprintf(stdout, "*image = 0x%" PRIx8 " 0x%" PRIx8 " 0x%" PRIx8 "\n", - (*((const uint8_t *)image)), (*(((const uint8_t *)image) + 1)), - (*(((const uint8_t *)image) + 2))); - HDfprintf(stdout, "expected *image = 0x%02" PRIx32 "%02" PRIx32 "\n", (uint32_t)idx & 0xFF, - (((uint32_t)idx & 0xFF00) >> 8)); + fprintf(stdout, "type = %d, idx = %d, addr = 0x%lx.\n", type, idx, (long)addr); + fprintf(stdout, "*image = 0x%" PRIx8 " 0x%" PRIx8 " 0x%" PRIx8 "\n", + (*((const uint8_t *)image)), (*(((const uint8_t *)image) + 1)), + (*(((const uint8_t *)image) + 2))); + fprintf(stdout, "expected *image = 0x%02" PRIx32 "%02" PRIx32 "\n", (uint32_t)idx & 0xFF, + (((uint32_t)idx & 0xFF00) >> 8)); } /* end if */ - HDassert((*((const char *)image)) == (char)(type & 0xFF)); - HDassert((*(((const char *)image) + 1)) == (char)((idx & 0xFF00) >> 8)); - HDassert((*(((const char *)image) + 2)) == (char)(idx & 0xFF)); + assert((*((const char *)image)) == (char)(type & 0xFF)); + assert((*(((const char *)image) + 1)) == (char)((idx & 0xFF00) >> 8)); + assert((*(((const char *)image) + 2)) == (char)(idx & 0xFF)); } /* end else */ } /* end if */ @@ -826,26 +826,26 @@ image_len(const void *thing, size_t *image_length, int32_t H5_ATTR_NDEBUG_UNUSED const test_entry_t *entry; int32_t type; - HDassert(thing); - HDassert(image_length); + assert(thing); + assert(image_length); entry = (const test_entry_t *)thing; - HDassert(entry->self == entry); + assert(entry->self == entry); type = entry->type; - HDassert((type >= 0) && (type < NUMBER_OF_ENTRY_TYPES)); - HDassert(type == entry_type); - HDassert((entry->index >= 0) && (entry->index <= max_indices[type])); + assert((type >= 0) && (type < NUMBER_OF_ENTRY_TYPES)); + assert(type == entry_type); + assert((entry->index >= 0) && (entry->index <= max_indices[type])); - HDassert(entry == &(entries[type][entry->index])); + assert(entry == &(entries[type][entry->index])); if (type != VARIABLE_ENTRY_TYPE) - HDassert(entry->size == entry_sizes[type]); + assert(entry->size == entry_sizes[type]); else { - HDassert(entry->size <= entry_sizes[type]); - HDassert(entry->size > 0); + assert(entry->size <= entry_sizes[type]); + assert(entry->size > 0); } /* end else */ *image_length = entry->size; @@ -945,32 +945,32 @@ pre_serialize(H5F_t H5_ATTR_NDEBUG_UNUSED *f, void *thing, haddr_t H5_ATTR_NDEBU test_entry_t *entry; int32_t i; - HDassert(f); - HDassert(thing); - HDassert(flags_ptr); + assert(f); + assert(thing); + assert(flags_ptr); *flags_ptr = H5C__SERIALIZE_NO_FLAGS_SET; - HDassert(new_addr_ptr); - HDassert(new_len_ptr); + assert(new_addr_ptr); + assert(new_len_ptr); entry = (test_entry_t *)thing; - HDassert(entry->self == entry); - HDassert(entry->addr == addr); - HDassert(entry->size == len); + assert(entry->self == entry); + assert(entry->addr == addr); + assert(entry->size == len); /* shouldn't serialize the entry unless it is dirty */ - HDassert(entry->is_dirty); - HDassert((entry->type >= 0) && (entry->type < NUMBER_OF_ENTRY_TYPES)); - HDassert((entry->index >= 0) && (entry->index <= max_indices[entry->type])); - HDassert(entry == &(entries[entry->type][entry->index])); - HDassert(entry->num_flush_ops >= 0); - HDassert(entry->num_flush_ops < MAX_FLUSH_OPS); + assert(entry->is_dirty); + assert((entry->type >= 0) && (entry->type < NUMBER_OF_ENTRY_TYPES)); + assert((entry->index >= 0) && (entry->index <= max_indices[entry->type])); + assert(entry == &(entries[entry->type][entry->index])); + assert(entry->num_flush_ops >= 0); + assert(entry->num_flush_ops < MAX_FLUSH_OPS); if (entry->num_flush_ops > 0) { for (i = 0; i < entry->num_flush_ops; i++) { - HDassert(entry->file_ptr); + assert(entry->file_ptr); execute_flush_op(entry->file_ptr, entry, &((entry->flush_ops)[i]), flags_ptr); } /* end for */ @@ -986,16 +986,16 @@ pre_serialize(H5F_t H5_ATTR_NDEBUG_UNUSED *f, void *thing, haddr_t H5_ATTR_NDEBU /* set *new_len_ptr to the new length. */ - HDassert(entry->type == VARIABLE_ENTRY_TYPE); - HDassert(entry->size > 0); - HDassert(entry->size <= VARIABLE_ENTRY_SIZE); + assert(entry->type == VARIABLE_ENTRY_TYPE); + assert(entry->size > 0); + assert(entry->size <= VARIABLE_ENTRY_SIZE); *new_len_ptr = entry->size; } /* end if */ if (((*flags_ptr) & H5C__SERIALIZE_MOVED_FLAG) != 0) { - HDassert(((*flags_ptr) | H5C__SERIALIZE_RESIZED_FLAG) != 0); + assert(((*flags_ptr) | H5C__SERIALIZE_RESIZED_FLAG) != 0); /* place the new address in *new_addr */ *new_addr_ptr = entry->addr; @@ -1109,35 +1109,35 @@ serialize(const H5F_t H5_ATTR_UNUSED *f, void *image_ptr, size_t len, void *thin test_entry_t *entry; int32_t type; - HDassert(image_ptr); - HDassert(thing); + assert(image_ptr); + assert(thing); entry = (test_entry_t *)thing; - HDassert(entry->self == entry); - HDassert(entry->size == len); + assert(entry->self == entry); + assert(entry->size == len); /* shouldn't serialize the entry unless it is dirty */ - HDassert(entry->is_dirty); + assert(entry->is_dirty); type = entry->type; - HDassert((type >= 0) && (type < NUMBER_OF_ENTRY_TYPES)); - HDassert((entry->index >= 0) && (entry->index <= max_indices[type])); + assert((type >= 0) && (type < NUMBER_OF_ENTRY_TYPES)); + assert((entry->index >= 0) && (entry->index <= max_indices[type])); - HDassert(entry == &(entries[type][entry->index])); - HDassert(entry->num_flush_ops >= 0); - HDassert(entry->num_flush_ops < MAX_FLUSH_OPS); + assert(entry == &(entries[type][entry->index])); + assert(entry->num_flush_ops >= 0); + assert(entry->num_flush_ops < MAX_FLUSH_OPS); /* null out the image to avoid spurious failures */ - HDmemset(image_ptr, 0, len); + memset(image_ptr, 0, len); if ((type == PICO_ENTRY_TYPE) || (type == VARIABLE_ENTRY_TYPE) || (type == NOTIFY_ENTRY_TYPE)) { - HDassert(entry->size >= PICO_ENTRY_SIZE); + assert(entry->size >= PICO_ENTRY_SIZE); *((char *)image_ptr) = (char)((entry->index) & 0xFF); } /* end if */ else { - HDassert(entry->size >= NANO_ENTRY_SIZE); + assert(entry->size >= NANO_ENTRY_SIZE); *((char *)image_ptr) = (char)((entry->type) & 0xFF); *(((char *)image_ptr) + 1) = (char)(((entry->index) & 0xFF00) >> 8); *(((char *)image_ptr) + 2) = (char)((entry->index) & 0xFF); @@ -1150,7 +1150,7 @@ serialize(const H5F_t H5_ATTR_UNUSED *f, void *image_ptr, size_t len, void *thin entry->is_dirty = FALSE; if (entry->flush_dep_npar > 0) { - HDassert(entry->flush_dep_ndirty_chd == 0); + assert(entry->flush_dep_ndirty_chd == 0); mark_flush_dep_clean(entry); } /* end if */ @@ -1254,19 +1254,19 @@ notify(H5C_notify_action_t action, void *thing, int32_t H5_ATTR_NDEBUG_UNUSED en { test_entry_t *entry; - HDassert(thing); + assert(thing); entry = (test_entry_t *)thing; - HDassert(entry->index >= 0); - HDassert(entry->index <= max_indices[entry->type]); - HDassert((entry->type >= 0) && (entry->type < NUMBER_OF_ENTRY_TYPES)); - HDassert(entry->type == entry_type); - HDassert(entry == &(entries[entry->type][entry->index])); - HDassert(entry == entry->self); + assert(entry->index >= 0); + assert(entry->index <= max_indices[entry->type]); + assert((entry->type >= 0) && (entry->type < NUMBER_OF_ENTRY_TYPES)); + assert(entry->type == entry_type); + assert(entry == &(entries[entry->type][entry->index])); + assert(entry == entry->self); if (!(action == H5C_NOTIFY_ACTION_ENTRY_DIRTIED && entry->action == TEST_ENTRY_ACTION_MOVE)) - HDassert(entry->header.addr == entry->addr); - HDassert((entry->type == VARIABLE_ENTRY_TYPE) || (entry->size == entry_sizes[entry->type])); + assert(entry->header.addr == entry->addr); + assert((entry->type == VARIABLE_ENTRY_TYPE) || (entry->size == entry_sizes[entry->type])); /* Increment count for appropriate action */ switch (action) { @@ -1290,7 +1290,7 @@ notify(H5C_notify_action_t action, void *thing, int32_t H5_ATTR_NDEBUG_UNUSED en break; default: - HDassert(0 && "Unknown notify action!?!"); + assert(0 && "Unknown notify action!?!"); } /* end switch */ return (SUCCEED); @@ -1327,21 +1327,21 @@ notify_notify(H5C_notify_action_t action, void *thing) herr_t free_icr(test_entry_t *entry, int32_t H5_ATTR_NDEBUG_UNUSED entry_type) { - HDassert(entry); - - HDassert(entry->type == entry_type); - HDassert(entry->index >= 0); - HDassert(entry->index <= max_indices[entry->type]); - HDassert(entry == &(entries[entry->type][entry->index])); - HDassert(entry == entry->self); - HDassert(entry->cache_ptr != NULL); - HDassert(entry->cache_ptr->magic == H5C__H5C_T_MAGIC); - HDassert((entry->header.destroy_in_progress) || (entry->header.addr == entry->addr)); - HDassert(entry->header.magic == H5C__H5C_CACHE_ENTRY_T_BAD_MAGIC); - HDassert(entry->header.size == entry->size); - HDassert((entry->type == VARIABLE_ENTRY_TYPE) || (entry->size == entry_sizes[entry->type])); - HDassert(entry->header.tl_next == NULL); - HDassert(entry->header.tl_prev == NULL); + assert(entry); + + assert(entry->type == entry_type); + assert(entry->index >= 0); + assert(entry->index <= max_indices[entry->type]); + assert(entry == &(entries[entry->type][entry->index])); + assert(entry == entry->self); + assert(entry->cache_ptr != NULL); + assert(entry->cache_ptr->magic == H5C__H5C_T_MAGIC); + assert((entry->header.destroy_in_progress) || (entry->header.addr == entry->addr)); + assert(entry->header.magic == H5C__H5C_CACHE_ENTRY_T_BAD_MAGIC); + assert(entry->header.size == entry->size); + assert((entry->type == VARIABLE_ENTRY_TYPE) || (entry->size == entry_sizes[entry->type])); + assert(entry->header.tl_next == NULL); + assert(entry->header.tl_prev == NULL); if (entry->num_pins > 0) { int i; @@ -1353,21 +1353,21 @@ free_icr(test_entry_t *entry, int32_t H5_ATTR_NDEBUG_UNUSED entry_type) pinned_base_addr = entries[entry->pin_type[i]]; pinned_entry = &(pinned_base_addr[entry->pin_idx[i]]); - HDassert(0 <= pinned_entry->type); - HDassert(pinned_entry->type < NUMBER_OF_ENTRY_TYPES); - HDassert(pinned_entry->type == entry->pin_type[i]); - HDassert(pinned_entry->index >= 0); - HDassert(pinned_entry->index <= max_indices[pinned_entry->type]); - HDassert(pinned_entry->index == entry->pin_idx[i]); - HDassert(pinned_entry == pinned_entry->self); - HDassert(pinned_entry->header.is_pinned); - HDassert(pinned_entry->is_pinned); - HDassert(pinned_entry->pinning_ref_count > 0); + assert(0 <= pinned_entry->type); + assert(pinned_entry->type < NUMBER_OF_ENTRY_TYPES); + assert(pinned_entry->type == entry->pin_type[i]); + assert(pinned_entry->index >= 0); + assert(pinned_entry->index <= max_indices[pinned_entry->type]); + assert(pinned_entry->index == entry->pin_idx[i]); + assert(pinned_entry == pinned_entry->self); + assert(pinned_entry->header.is_pinned); + assert(pinned_entry->is_pinned); + assert(pinned_entry->pinning_ref_count > 0); pinned_entry->pinning_ref_count--; if (pinned_entry->pinning_ref_count <= 0) { - HDassert(pinned_entry->file_ptr); + assert(pinned_entry->file_ptr); unpin_entry(pinned_entry->type, pinned_entry->index); } /* end if */ @@ -1480,23 +1480,23 @@ add_flush_op(int target_type, int target_idx, int op_code, int type, int idx, hb test_entry_t *target_base_addr; test_entry_t *target_entry_ptr; - HDassert((0 <= target_type) && (target_type < NUMBER_OF_ENTRY_TYPES)); - HDassert((0 <= target_idx) && (target_idx <= max_indices[target_type])); - HDassert((0 <= op_code) && (op_code <= FLUSH_OP__MAX_OP)); - HDassert((op_code != FLUSH_OP__RESIZE) || (type == VARIABLE_ENTRY_TYPE)); - HDassert((0 <= type) && (type < NUMBER_OF_ENTRY_TYPES)); - HDassert((0 <= idx) && (idx <= max_indices[type])); - HDassert(new_size <= VARIABLE_ENTRY_SIZE); + assert((0 <= target_type) && (target_type < NUMBER_OF_ENTRY_TYPES)); + assert((0 <= target_idx) && (target_idx <= max_indices[target_type])); + assert((0 <= op_code) && (op_code <= FLUSH_OP__MAX_OP)); + assert((op_code != FLUSH_OP__RESIZE) || (type == VARIABLE_ENTRY_TYPE)); + assert((0 <= type) && (type < NUMBER_OF_ENTRY_TYPES)); + assert((0 <= idx) && (idx <= max_indices[type])); + assert(new_size <= VARIABLE_ENTRY_SIZE); if (pass) { target_base_addr = entries[target_type]; target_entry_ptr = &(target_base_addr[target_idx]); - HDassert(target_entry_ptr->index == target_idx); - HDassert(target_entry_ptr->type == target_type); - HDassert(target_entry_ptr == target_entry_ptr->self); - HDassert(target_entry_ptr->num_flush_ops < MAX_FLUSH_OPS); + assert(target_entry_ptr->index == target_idx); + assert(target_entry_ptr->type == target_type); + assert(target_entry_ptr == target_entry_ptr->self); + assert(target_entry_ptr->num_flush_ops < MAX_FLUSH_OPS); i = (target_entry_ptr->num_flush_ops)++; (target_entry_ptr->flush_ops)[i].op_code = op_code; @@ -1542,10 +1542,10 @@ create_pinned_entry_dependency(H5F_t *file_ptr, int pinning_type, int pinning_id if (pass) { - HDassert((0 <= pinning_type) && (pinning_type < NUMBER_OF_ENTRY_TYPES)); - HDassert((0 <= pinning_idx) && (pinning_idx <= max_indices[pinning_type])); - HDassert((0 <= pinned_type) && (pinned_type < NUMBER_OF_ENTRY_TYPES)); - HDassert((0 <= pinned_idx) && (pinned_idx <= max_indices[pinned_type])); + assert((0 <= pinning_type) && (pinning_type < NUMBER_OF_ENTRY_TYPES)); + assert((0 <= pinning_idx) && (pinning_idx <= max_indices[pinning_type])); + assert((0 <= pinned_type) && (pinned_type < NUMBER_OF_ENTRY_TYPES)); + assert((0 <= pinned_idx) && (pinned_idx <= max_indices[pinned_type])); pinning_base_addr = entries[pinning_type]; pinning_entry_ptr = &(pinning_base_addr[pinning_idx]); @@ -1553,15 +1553,15 @@ create_pinned_entry_dependency(H5F_t *file_ptr, int pinning_type, int pinning_id pinned_base_addr = entries[pinned_type]; pinned_entry_ptr = &(pinned_base_addr[pinned_idx]); - HDassert(pinning_entry_ptr->index == pinning_idx); - HDassert(pinning_entry_ptr->type == pinning_type); - HDassert(pinning_entry_ptr == pinning_entry_ptr->self); - HDassert(pinning_entry_ptr->num_pins < MAX_PINS); + assert(pinning_entry_ptr->index == pinning_idx); + assert(pinning_entry_ptr->type == pinning_type); + assert(pinning_entry_ptr == pinning_entry_ptr->self); + assert(pinning_entry_ptr->num_pins < MAX_PINS); - HDassert(pinning_entry_ptr->index == pinning_idx); - HDassert(pinning_entry_ptr->type == pinning_type); - HDassert(pinning_entry_ptr == pinning_entry_ptr->self); - HDassert(!(pinning_entry_ptr->is_protected)); + assert(pinning_entry_ptr->index == pinning_idx); + assert(pinning_entry_ptr->type == pinning_type); + assert(pinning_entry_ptr == pinning_entry_ptr->self); + assert(!(pinning_entry_ptr->is_protected)); pinning_entry_ptr->pin_type[pinning_entry_ptr->num_pins] = pinned_type; pinning_entry_ptr->pin_idx[pinning_entry_ptr->num_pins] = pinned_idx; @@ -1605,16 +1605,16 @@ dirty_entry(H5F_t *file_ptr, int32_t type, int32_t idx, hbool_t dirty_pin) test_entry_t *base_addr; test_entry_t *entry_ptr; - HDassert(file_ptr); - HDassert((0 <= type) && (type < NUMBER_OF_ENTRY_TYPES)); - HDassert((0 <= idx) && (idx <= max_indices[type])); + assert(file_ptr); + assert((0 <= type) && (type < NUMBER_OF_ENTRY_TYPES)); + assert((0 <= idx) && (idx <= max_indices[type])); if (pass) { if (dirty_pin) { H5C_t *cache_ptr = file_ptr->shared->cache; - HDassert(cache_ptr); + assert(cache_ptr); if (!entry_in_cache(cache_ptr, type, idx)) { @@ -1626,9 +1626,9 @@ dirty_entry(H5F_t *file_ptr, int32_t type, int32_t idx, hbool_t dirty_pin) base_addr = entries[type]; entry_ptr = &(base_addr[idx]); - HDassert(entry_ptr->index == idx); - HDassert(entry_ptr->type == type); - HDassert(entry_ptr == entry_ptr->self); + assert(entry_ptr->index == idx); + assert(entry_ptr->type == type); + assert(entry_ptr == entry_ptr->self); if (!((entry_ptr->header).is_pinned)) { @@ -1672,20 +1672,20 @@ execute_flush_op(H5F_t *file_ptr, struct test_entry_t *entry_ptr, struct flush_o { H5C_t *cache_ptr; - HDassert(file_ptr); + assert(file_ptr); cache_ptr = file_ptr->shared->cache; - HDassert(cache_ptr != NULL); - HDassert(cache_ptr->magic == H5C__H5C_T_MAGIC); - HDassert(entry_ptr != NULL); - HDassert(entry_ptr == entry_ptr->self); - HDassert(entry_ptr->header.addr == entry_ptr->addr); - HDassert((entry_ptr->flush_op_self_resize_in_progress) || (entry_ptr->header.size == entry_ptr->size)); - HDassert(op_ptr != NULL); - HDassert((0 <= entry_ptr->type) && (entry_ptr->type < NUMBER_OF_ENTRY_TYPES)); - HDassert((0 <= entry_ptr->index) && (entry_ptr->index <= max_indices[entry_ptr->type])); - HDassert((0 <= op_ptr->type) && (op_ptr->type < NUMBER_OF_ENTRY_TYPES)); - HDassert((0 <= op_ptr->idx) && (op_ptr->idx <= max_indices[op_ptr->type])); - HDassert(flags_ptr != NULL); + assert(cache_ptr != NULL); + assert(cache_ptr->magic == H5C__H5C_T_MAGIC); + assert(entry_ptr != NULL); + assert(entry_ptr == entry_ptr->self); + assert(entry_ptr->header.addr == entry_ptr->addr); + assert((entry_ptr->flush_op_self_resize_in_progress) || (entry_ptr->header.size == entry_ptr->size)); + assert(op_ptr != NULL); + assert((0 <= entry_ptr->type) && (entry_ptr->type < NUMBER_OF_ENTRY_TYPES)); + assert((0 <= entry_ptr->index) && (entry_ptr->index <= max_indices[entry_ptr->type])); + assert((0 <= op_ptr->type) && (op_ptr->type < NUMBER_OF_ENTRY_TYPES)); + assert((0 <= op_ptr->idx) && (op_ptr->idx <= max_indices[op_ptr->type])); + assert(flags_ptr != NULL); if (pass) { @@ -1694,7 +1694,7 @@ execute_flush_op(H5F_t *file_ptr, struct test_entry_t *entry_ptr, struct flush_o break; case FLUSH_OP__DIRTY: - HDassert((entry_ptr->type != op_ptr->type) || (entry_ptr->index != op_ptr->idx)); + assert((entry_ptr->type != op_ptr->type) || (entry_ptr->index != op_ptr->idx)); dirty_entry(file_ptr, op_ptr->type, op_ptr->idx, op_ptr->flag); break; @@ -1705,9 +1705,9 @@ execute_flush_op(H5F_t *file_ptr, struct test_entry_t *entry_ptr, struct flush_o /* the flush operation is acting on the entry to * which it is attached. Handle this here: */ - HDassert(entry_ptr->type == VARIABLE_ENTRY_TYPE); - HDassert(op_ptr->size > 0); - HDassert(op_ptr->size <= VARIABLE_ENTRY_SIZE); + assert(entry_ptr->type == VARIABLE_ENTRY_TYPE); + assert(op_ptr->size > 0); + assert(op_ptr->size <= VARIABLE_ENTRY_SIZE); entry_ptr->size = op_ptr->size; @@ -1730,16 +1730,16 @@ execute_flush_op(H5F_t *file_ptr, struct test_entry_t *entry_ptr, struct flush_o * which it is attached. Handle this here: */ - HDassert(((*flags_ptr) & H5C__SERIALIZE_RESIZED_FLAG) != 0); + assert(((*flags_ptr) & H5C__SERIALIZE_RESIZED_FLAG) != 0); (*flags_ptr) |= H5C__SERIALIZE_MOVED_FLAG; if (op_ptr->flag) { - HDassert(entry_ptr->addr == entry_ptr->alt_addr); + assert(entry_ptr->addr == entry_ptr->alt_addr); entry_ptr->addr = entry_ptr->main_addr; entry_ptr->at_main_addr = TRUE; } /* end if */ else { - HDassert(entry_ptr->addr == entry_ptr->main_addr); + assert(entry_ptr->addr == entry_ptr->main_addr); entry_ptr->addr = entry_ptr->alt_addr; entry_ptr->at_main_addr = FALSE; } /* end else */ @@ -1749,7 +1749,7 @@ execute_flush_op(H5F_t *file_ptr, struct test_entry_t *entry_ptr, struct flush_o break; case FLUSH_OP__ORDER: - HDassert(op_ptr->order_ptr); + assert(op_ptr->order_ptr); entry_ptr->flush_order = *op_ptr->order_ptr; (*op_ptr->order_ptr)++; break; @@ -1769,12 +1769,12 @@ execute_flush_op(H5F_t *file_ptr, struct test_entry_t *entry_ptr, struct flush_o * must always be executed on an entry other than the * entry being flushed. */ - HDassert((entry_ptr->type != op_ptr->type) || (entry_ptr->index != op_ptr->idx)); + assert((entry_ptr->type != op_ptr->type) || (entry_ptr->index != op_ptr->idx)); expunge_entry(file_ptr, op_ptr->type, op_ptr->idx); break; case FLUSH_OP__DEST_FLUSH_DEP: - HDassert((entry_ptr->type != op_ptr->type) || (entry_ptr->index != op_ptr->idx)); + assert((entry_ptr->type != op_ptr->type) || (entry_ptr->index != op_ptr->idx)); destroy_flush_dependency(op_ptr->type, op_ptr->idx, entry_ptr->type, entry_ptr->index); break; @@ -1809,24 +1809,24 @@ entry_in_cache(H5C_t *cache_ptr, int32_t type, int32_t idx) test_entry_t *entry_ptr; H5C_cache_entry_t *test_ptr = NULL; - HDassert(cache_ptr); - HDassert((0 <= type) && (type < NUMBER_OF_ENTRY_TYPES)); - HDassert((0 <= idx) && (idx <= max_indices[type])); + assert(cache_ptr); + assert((0 <= type) && (type < NUMBER_OF_ENTRY_TYPES)); + assert((0 <= idx) && (idx <= max_indices[type])); base_addr = entries[type]; entry_ptr = &(base_addr[idx]); - HDassert(entry_ptr->index == idx); - HDassert(entry_ptr->type == type); - HDassert(entry_ptr == entry_ptr->self); + assert(entry_ptr->index == idx); + assert(entry_ptr->type == type); + assert(entry_ptr == entry_ptr->self); H5C_TEST__SEARCH_INDEX(cache_ptr, entry_ptr->addr, test_ptr) if (test_ptr != NULL) { in_cache = TRUE; - HDassert(test_ptr == (H5C_cache_entry_t *)entry_ptr); - HDassert(entry_ptr->addr == entry_ptr->header.addr); + assert(test_ptr == (H5C_cache_entry_t *)entry_ptr); + assert(entry_ptr->addr == entry_ptr->header.addr); } return (in_cache); @@ -1851,70 +1851,69 @@ create_entry_arrays(void) { /* pico entries */ - if (NULL == (pico_entries = (test_entry_t *)HDcalloc(NUM_PICO_ENTRIES, sizeof(test_entry_t)))) + if (NULL == (pico_entries = (test_entry_t *)calloc(NUM_PICO_ENTRIES, sizeof(test_entry_t)))) goto error; - if (NULL == (orig_pico_entries = (test_entry_t *)HDcalloc(NUM_PICO_ENTRIES, sizeof(test_entry_t)))) + if (NULL == (orig_pico_entries = (test_entry_t *)calloc(NUM_PICO_ENTRIES, sizeof(test_entry_t)))) goto error; /* nano entries */ - if (NULL == (nano_entries = (test_entry_t *)HDcalloc(NUM_NANO_ENTRIES, sizeof(test_entry_t)))) + if (NULL == (nano_entries = (test_entry_t *)calloc(NUM_NANO_ENTRIES, sizeof(test_entry_t)))) goto error; - if (NULL == (orig_nano_entries = (test_entry_t *)HDcalloc(NUM_NANO_ENTRIES, sizeof(test_entry_t)))) + if (NULL == (orig_nano_entries = (test_entry_t *)calloc(NUM_NANO_ENTRIES, sizeof(test_entry_t)))) goto error; /* micro entries */ - if (NULL == (micro_entries = (test_entry_t *)HDcalloc(NUM_MICRO_ENTRIES, sizeof(test_entry_t)))) + if (NULL == (micro_entries = (test_entry_t *)calloc(NUM_MICRO_ENTRIES, sizeof(test_entry_t)))) goto error; - if (NULL == (orig_micro_entries = (test_entry_t *)HDcalloc(NUM_MICRO_ENTRIES, sizeof(test_entry_t)))) + if (NULL == (orig_micro_entries = (test_entry_t *)calloc(NUM_MICRO_ENTRIES, sizeof(test_entry_t)))) goto error; /* tiny entries */ - if (NULL == (tiny_entries = (test_entry_t *)HDcalloc(NUM_TINY_ENTRIES, sizeof(test_entry_t)))) + if (NULL == (tiny_entries = (test_entry_t *)calloc(NUM_TINY_ENTRIES, sizeof(test_entry_t)))) goto error; - if (NULL == (orig_tiny_entries = (test_entry_t *)HDcalloc(NUM_TINY_ENTRIES, sizeof(test_entry_t)))) + if (NULL == (orig_tiny_entries = (test_entry_t *)calloc(NUM_TINY_ENTRIES, sizeof(test_entry_t)))) goto error; /* small entries */ - if (NULL == (small_entries = (test_entry_t *)HDcalloc(NUM_SMALL_ENTRIES, sizeof(test_entry_t)))) + if (NULL == (small_entries = (test_entry_t *)calloc(NUM_SMALL_ENTRIES, sizeof(test_entry_t)))) goto error; - if (NULL == (orig_small_entries = (test_entry_t *)HDcalloc(NUM_SMALL_ENTRIES, sizeof(test_entry_t)))) + if (NULL == (orig_small_entries = (test_entry_t *)calloc(NUM_SMALL_ENTRIES, sizeof(test_entry_t)))) goto error; /* medium entries */ - if (NULL == (medium_entries = (test_entry_t *)HDcalloc(NUM_MEDIUM_ENTRIES, sizeof(test_entry_t)))) + if (NULL == (medium_entries = (test_entry_t *)calloc(NUM_MEDIUM_ENTRIES, sizeof(test_entry_t)))) goto error; - if (NULL == (orig_medium_entries = (test_entry_t *)HDcalloc(NUM_MEDIUM_ENTRIES, sizeof(test_entry_t)))) + if (NULL == (orig_medium_entries = (test_entry_t *)calloc(NUM_MEDIUM_ENTRIES, sizeof(test_entry_t)))) goto error; /* large entries */ - if (NULL == (large_entries = (test_entry_t *)HDcalloc(NUM_LARGE_ENTRIES, sizeof(test_entry_t)))) + if (NULL == (large_entries = (test_entry_t *)calloc(NUM_LARGE_ENTRIES, sizeof(test_entry_t)))) goto error; - if (NULL == (orig_large_entries = (test_entry_t *)HDcalloc(NUM_LARGE_ENTRIES, sizeof(test_entry_t)))) + if (NULL == (orig_large_entries = (test_entry_t *)calloc(NUM_LARGE_ENTRIES, sizeof(test_entry_t)))) goto error; /* huge entries */ - if (NULL == (huge_entries = (test_entry_t *)HDcalloc(NUM_HUGE_ENTRIES, sizeof(test_entry_t)))) + if (NULL == (huge_entries = (test_entry_t *)calloc(NUM_HUGE_ENTRIES, sizeof(test_entry_t)))) goto error; - if (NULL == (orig_huge_entries = (test_entry_t *)HDcalloc(NUM_HUGE_ENTRIES, sizeof(test_entry_t)))) + if (NULL == (orig_huge_entries = (test_entry_t *)calloc(NUM_HUGE_ENTRIES, sizeof(test_entry_t)))) goto error; /* monster entries */ - if (NULL == (monster_entries = (test_entry_t *)HDcalloc(NUM_MONSTER_ENTRIES, sizeof(test_entry_t)))) + if (NULL == (monster_entries = (test_entry_t *)calloc(NUM_MONSTER_ENTRIES, sizeof(test_entry_t)))) goto error; - if (NULL == (orig_monster_entries = (test_entry_t *)HDcalloc(NUM_MONSTER_ENTRIES, sizeof(test_entry_t)))) + if (NULL == (orig_monster_entries = (test_entry_t *)calloc(NUM_MONSTER_ENTRIES, sizeof(test_entry_t)))) goto error; /* variable entries */ - if (NULL == (variable_entries = (test_entry_t *)HDcalloc(NUM_VARIABLE_ENTRIES, sizeof(test_entry_t)))) + if (NULL == (variable_entries = (test_entry_t *)calloc(NUM_VARIABLE_ENTRIES, sizeof(test_entry_t)))) goto error; - if (NULL == - (orig_variable_entries = (test_entry_t *)HDcalloc(NUM_VARIABLE_ENTRIES, sizeof(test_entry_t)))) + if (NULL == (orig_variable_entries = (test_entry_t *)calloc(NUM_VARIABLE_ENTRIES, sizeof(test_entry_t)))) goto error; /* notify entries */ - if (NULL == (notify_entries = (test_entry_t *)HDcalloc(NUM_NOTIFY_ENTRIES, sizeof(test_entry_t)))) + if (NULL == (notify_entries = (test_entry_t *)calloc(NUM_NOTIFY_ENTRIES, sizeof(test_entry_t)))) goto error; - if (NULL == (orig_notify_entries = (test_entry_t *)HDcalloc(NUM_NOTIFY_ENTRIES, sizeof(test_entry_t)))) + if (NULL == (orig_notify_entries = (test_entry_t *)calloc(NUM_NOTIFY_ENTRIES, sizeof(test_entry_t)))) goto error; entries[0] = pico_entries; @@ -1967,48 +1966,48 @@ free_entry_arrays(void) { /* pico entries */ - HDfree(pico_entries); - HDfree(orig_pico_entries); + free(pico_entries); + free(orig_pico_entries); /* nano entries */ - HDfree(nano_entries); - HDfree(orig_nano_entries); + free(nano_entries); + free(orig_nano_entries); /* micro entries */ - HDfree(micro_entries); - HDfree(orig_micro_entries); + free(micro_entries); + free(orig_micro_entries); /* tiny entries */ - HDfree(tiny_entries); - HDfree(orig_tiny_entries); + free(tiny_entries); + free(orig_tiny_entries); /* small entries */ - HDfree(small_entries); - HDfree(orig_small_entries); + free(small_entries); + free(orig_small_entries); /* medium entries */ - HDfree(medium_entries); - HDfree(orig_medium_entries); + free(medium_entries); + free(orig_medium_entries); /* large entries */ - HDfree(large_entries); - HDfree(orig_large_entries); + free(large_entries); + free(orig_large_entries); /* huge entries */ - HDfree(huge_entries); - HDfree(orig_huge_entries); + free(huge_entries); + free(orig_huge_entries); /* monster entries */ - HDfree(monster_entries); - HDfree(orig_monster_entries); + free(monster_entries); + free(orig_monster_entries); /* variable entries */ - HDfree(variable_entries); - HDfree(orig_variable_entries); + free(variable_entries); + free(orig_variable_entries); /* notify entries */ - HDfree(notify_entries); - HDfree(orig_notify_entries); + free(notify_entries); + free(orig_notify_entries); } /* free_entry_arrays() */ @@ -2047,8 +2046,8 @@ reset_entries(void) base_addr = entries[i]; orig_base_addr = orig_entries[i]; - HDassert(base_addr); - HDassert(orig_base_addr); + assert(base_addr); + assert(orig_base_addr); for (j = 0; j <= max_index; j++) { int k; @@ -2136,7 +2135,7 @@ reset_entries(void) } /* end for */ /* Make copy of entries in base_addr for later */ - HDmemcpy(orig_base_addr, base_addr, (size_t)(max_index + 1) * sizeof(*base_addr)); + memcpy(orig_base_addr, base_addr, (size_t)(max_index + 1) * sizeof(*base_addr)); } /* end for */ /* Indicate that we've made a copy for later */ @@ -2149,7 +2148,7 @@ reset_entries(void) orig_base_addr = orig_entries[i]; /* Make copy of entries in base_addr for later */ - HDmemcpy(base_addr, orig_base_addr, (size_t)(max_index + 1) * sizeof(*base_addr)); + memcpy(base_addr, orig_base_addr, (size_t)(max_index + 1) * sizeof(*base_addr)); } /* end for */ } /* end else */ @@ -2181,17 +2180,17 @@ resize_entry(H5F_t *file_ptr, int32_t type, int32_t idx, size_t new_size, hbool_ test_entry_t *entry_ptr; herr_t result; - HDassert((0 <= type) && (type < NUMBER_OF_ENTRY_TYPES)); - HDassert(type == VARIABLE_ENTRY_TYPE); - HDassert((0 <= idx) && (idx <= max_indices[type])); - HDassert((0 < new_size) && (new_size <= entry_sizes[type])); + assert((0 <= type) && (type < NUMBER_OF_ENTRY_TYPES)); + assert(type == VARIABLE_ENTRY_TYPE); + assert((0 <= idx) && (idx <= max_indices[type])); + assert((0 < new_size) && (new_size <= entry_sizes[type])); if (pass) { if (in_cache) { H5C_t *cache_ptr = file_ptr->shared->cache; - HDassert(cache_ptr); + assert(cache_ptr); if (!entry_in_cache(cache_ptr, type, idx)) { @@ -2203,10 +2202,10 @@ resize_entry(H5F_t *file_ptr, int32_t type, int32_t idx, size_t new_size, hbool_ base_addr = entries[type]; entry_ptr = &(base_addr[idx]); - HDassert(entry_ptr->index == idx); - HDassert(entry_ptr->type == type); - HDassert(entry_ptr->cache_ptr == cache_ptr); - HDassert(entry_ptr == entry_ptr->self); + assert(entry_ptr->index == idx); + assert(entry_ptr->type == type); + assert(entry_ptr->cache_ptr == cache_ptr); + assert(entry_ptr == entry_ptr->self); if (!(entry_ptr->header.is_pinned || entry_ptr->header.is_protected)) { @@ -2231,7 +2230,7 @@ resize_entry(H5F_t *file_ptr, int32_t type, int32_t idx, size_t new_size, hbool_ } else { - HDassert(entry_ptr->size == (entry_ptr->header).size); + assert(entry_ptr->size == (entry_ptr->header).size); } } } @@ -2278,7 +2277,7 @@ verify_clean(void) max_index = max_indices[i]; base_addr = entries[i]; - HDassert(base_addr); + assert(base_addr); for (j = 0; j <= max_index; j++) { if ((base_addr[j].header.is_dirty) || (base_addr[j].is_dirty)) { @@ -2645,10 +2644,10 @@ verify_unprotected(void) max_index = max_indices[i]; base_addr = entries[i]; - HDassert(base_addr); + assert(base_addr); for (j = 0; j <= max_index; j++) { - HDassert(base_addr[j].header.is_protected == base_addr[j].is_protected); + assert(base_addr[j].header.is_protected == base_addr[j].is_protected); if ((base_addr[j].header.is_protected) || (base_addr[j].is_protected)) { @@ -2691,23 +2690,23 @@ expunge_entry(H5F_t *file_ptr, int32_t type, int32_t idx) #ifndef NDEBUG H5C_t *cache_ptr = file_ptr->shared->cache; - HDassert(cache_ptr); + assert(cache_ptr); #endif /* NDEBUG */ - HDassert((0 <= type) && (type < NUMBER_OF_ENTRY_TYPES)); - HDassert((0 <= idx) && (idx <= max_indices[type])); + assert((0 <= type) && (type < NUMBER_OF_ENTRY_TYPES)); + assert((0 <= idx) && (idx <= max_indices[type])); base_addr = entries[type]; entry_ptr = &(base_addr[idx]); - HDassert(entry_ptr->index == idx); - HDassert(entry_ptr->type == type); - HDassert(entry_ptr == entry_ptr->self); - HDassert(entry_ptr->cache_ptr == cache_ptr); - HDassert(!(entry_ptr->header.is_protected)); - HDassert(!(entry_ptr->is_protected)); - HDassert(!(entry_ptr->header.is_pinned)); - HDassert(!(entry_ptr->is_pinned)); + assert(entry_ptr->index == idx); + assert(entry_ptr->type == type); + assert(entry_ptr == entry_ptr->self); + assert(entry_ptr->cache_ptr == cache_ptr); + assert(!(entry_ptr->header.is_protected)); + assert(!(entry_ptr->is_protected)); + assert(!(entry_ptr->header.is_pinned)); + assert(!(entry_ptr->is_pinned)); result = H5C_expunge_entry(file_ptr, types[type], entry_ptr->addr, H5C__NO_FLAGS_SET); @@ -2748,7 +2747,7 @@ flush_cache(H5F_t *file_ptr, hbool_t destroy_entries, hbool_t dump_stats, hbool_ if (pass) { H5C_t *cache_ptr; - HDassert(file_ptr); + assert(file_ptr); cache_ptr = file_ptr->shared->cache; @@ -2772,9 +2771,9 @@ flush_cache(H5F_t *file_ptr, hbool_t destroy_entries, hbool_t dump_stats, hbool_ if (verbose) { - HDfprintf(stdout, "%s: unexpected il/is/cis/dis = %lld/%lld/%lld/%lld.\n", __func__, - (long long)(cache_ptr->index_len), (long long)(cache_ptr->index_size), - (long long)(cache_ptr->clean_index_size), (long long)(cache_ptr->dirty_index_size)); + fprintf(stdout, "%s: unexpected il/is/cis/dis = %lld/%lld/%lld/%lld.\n", __func__, + (long long)(cache_ptr->index_len), (long long)(cache_ptr->index_size), + (long long)(cache_ptr->clean_index_size), (long long)(cache_ptr->dirty_index_size)); } pass = FALSE; failure_mssg = "non zero index len/sizes after H5C_flush_cache() with invalidate."; @@ -2806,8 +2805,8 @@ cork_entry_type(H5F_t *file_ptr, int32_t type) cache_ptr = file_ptr->shared->cache; - HDassert(cache_ptr); - HDassert((0 <= type) && (type < NUMBER_OF_ENTRY_TYPES)); + assert(cache_ptr); + assert((0 <= type) && (type < NUMBER_OF_ENTRY_TYPES)); baddrs = base_addrs[type]; if (H5C_cork(cache_ptr, baddrs, H5C__SET_CORK, NULL) < 0) { @@ -2841,8 +2840,8 @@ uncork_entry_type(H5F_t *file_ptr, int32_t type) cache_ptr = file_ptr->shared->cache; - HDassert(cache_ptr); - HDassert((0 <= type) && (type < NUMBER_OF_ENTRY_TYPES)); + assert(cache_ptr); + assert((0 <= type) && (type < NUMBER_OF_ENTRY_TYPES)); baddrs = base_addrs[type]; if (H5C_cork(cache_ptr, baddrs, H5C__UNCORK, NULL) < 0) { @@ -2882,20 +2881,20 @@ insert_entry(H5F_t *file_ptr, int32_t type, int32_t idx, unsigned int flags) cache_ptr = file_ptr->shared->cache; - HDassert(cache_ptr); - HDassert((0 <= type) && (type < NUMBER_OF_ENTRY_TYPES)); - HDassert((0 <= idx) && (idx <= max_indices[type])); + assert(cache_ptr); + assert((0 <= type) && (type < NUMBER_OF_ENTRY_TYPES)); + assert((0 <= idx) && (idx <= max_indices[type])); base_addr = entries[type]; entry_ptr = &(base_addr[idx]); baddrs = base_addrs[type]; - HDassert(entry_ptr->index == idx); - HDassert(entry_ptr->type == type); - HDassert(entry_ptr == entry_ptr->self); - HDassert(!(entry_ptr->is_protected)); - HDassert(entry_ptr->flush_dep_npar == 0); - HDassert(entry_ptr->flush_dep_nchd == 0); + assert(entry_ptr->index == idx); + assert(entry_ptr->type == type); + assert(entry_ptr == entry_ptr->self); + assert(!(entry_ptr->is_protected)); + assert(entry_ptr->flush_dep_npar == 0); + assert(entry_ptr->flush_dep_nchd == 0); insert_pinned = (hbool_t)((flags & H5C__PIN_ENTRY_FLAG) != 0); @@ -2915,37 +2914,37 @@ insert_entry(H5F_t *file_ptr, int32_t type, int32_t idx, unsigned int flags) #if 0 /* This is useful debugging code. Lets keep it around. */ - HDfprintf(stdout, "result = %d\n", (int)result); - HDfprintf(stdout, "entry_ptr->header.is_protected = %d\n", + fprintf(stdout, "result = %d\n", (int)result); + fprintf(stdout, "entry_ptr->header.is_protected = %d\n", (int)(entry_ptr->header.is_protected)); - HDfprintf(stdout, + fprintf(stdout, "entry_ptr->header.type != types[type] = %d\n", (int)(entry_ptr->header.type != types[type])); - HDfprintf(stdout, + fprintf(stdout, "entry_ptr->size != entry_ptr->header.size = %d\n", (int)(entry_ptr->size != entry_ptr->header.size)); - HDfprintf(stdout, + fprintf(stdout, "entry_ptr->addr != entry_ptr->header.addr = %d\n", (int)(entry_ptr->addr != entry_ptr->header.addr)); #endif } /* end if */ - HDassert(entry_ptr->cache_ptr == NULL); + assert(entry_ptr->cache_ptr == NULL); entry_ptr->file_ptr = file_ptr; entry_ptr->cache_ptr = cache_ptr; if (insert_pinned) - HDassert(entry_ptr->header.is_pinned); + assert(entry_ptr->header.is_pinned); else - HDassert(!(entry_ptr->header.is_pinned)); + assert(!(entry_ptr->header.is_pinned)); entry_ptr->is_pinned = insert_pinned; entry_ptr->pinned_from_client = insert_pinned; if (entry_ptr->header.tag_info && entry_ptr->header.tag_info->corked) entry_ptr->is_corked = TRUE; - HDassert(entry_ptr->header.is_dirty); - HDassert(((entry_ptr->header).type)->id == type); + assert(entry_ptr->header.is_dirty); + assert(((entry_ptr->header).type)->id == type); } /* end if */ } /* insert_entry() */ @@ -2975,16 +2974,16 @@ mark_entry_dirty(int32_t type, int32_t idx) if (pass) { - HDassert((0 <= type) && (type < NUMBER_OF_ENTRY_TYPES)); - HDassert((0 <= idx) && (idx <= max_indices[type])); + assert((0 <= type) && (type < NUMBER_OF_ENTRY_TYPES)); + assert((0 <= idx) && (idx <= max_indices[type])); base_addr = entries[type]; entry_ptr = &(base_addr[idx]); - HDassert(entry_ptr->index == idx); - HDassert(entry_ptr->type == type); - HDassert(entry_ptr == entry_ptr->self); - HDassert(entry_ptr->header.is_protected || entry_ptr->header.is_pinned); + assert(entry_ptr->index == idx); + assert(entry_ptr->type == type); + assert(entry_ptr == entry_ptr->self); + assert(entry_ptr->header.is_protected || entry_ptr->header.is_pinned); was_dirty = entry_ptr->is_dirty; entry_ptr->is_dirty = TRUE; @@ -3004,7 +3003,7 @@ mark_entry_dirty(int32_t type, int32_t idx) failure_mssg = "error in H5C_mark_entry_dirty()."; } - HDassert(((entry_ptr->header).type)->id == type); + assert(((entry_ptr->header).type)->id == type); } } /* mark_entry_dirty() */ @@ -3036,25 +3035,25 @@ move_entry(H5C_t *cache_ptr, int32_t type, int32_t idx, hbool_t main_addr) if (pass) { - HDassert(cache_ptr); - HDassert((0 <= type) && (type < NUMBER_OF_ENTRY_TYPES)); - HDassert((0 <= idx) && (idx <= max_indices[type])); + assert(cache_ptr); + assert((0 <= type) && (type < NUMBER_OF_ENTRY_TYPES)); + assert((0 <= idx) && (idx <= max_indices[type])); base_addr = entries[type]; entry_ptr = &(base_addr[idx]); - HDassert(entry_ptr->index == idx); - HDassert(entry_ptr->type == type); - HDassert(entry_ptr == entry_ptr->self); - HDassert(entry_ptr->cache_ptr == cache_ptr); - HDassert(!entry_ptr->is_read_only); - HDassert(!entry_ptr->header.is_read_only); + assert(entry_ptr->index == idx); + assert(entry_ptr->type == type); + assert(entry_ptr == entry_ptr->self); + assert(entry_ptr->cache_ptr == cache_ptr); + assert(!entry_ptr->is_read_only); + assert(!entry_ptr->header.is_read_only); if (entry_ptr->at_main_addr && !main_addr) { /* move to alt addr */ - HDassert(entry_ptr->addr == entry_ptr->main_addr); + assert(entry_ptr->addr == entry_ptr->main_addr); done = FALSE; old_addr = entry_ptr->addr; @@ -3064,7 +3063,7 @@ move_entry(H5C_t *cache_ptr, int32_t type, int32_t idx, hbool_t main_addr) /* move to main addr */ - HDassert(entry_ptr->addr == entry_ptr->alt_addr); + assert(entry_ptr->addr == entry_ptr->alt_addr); done = FALSE; old_addr = entry_ptr->addr; @@ -3099,10 +3098,10 @@ move_entry(H5C_t *cache_ptr, int32_t type, int32_t idx, hbool_t main_addr) } } - HDassert(((entry_ptr->header).type)->id == type); + assert(((entry_ptr->header).type)->id == type); - HDassert(entry_ptr->header.is_dirty); - HDassert(entry_ptr->is_dirty); + assert(entry_ptr->header.is_dirty); + assert(entry_ptr->is_dirty); } } /* move_entry() */ @@ -3133,18 +3132,18 @@ protect_entry(H5F_t *file_ptr, int32_t type, int32_t idx) if (pass) { cache_ptr = file_ptr->shared->cache; - HDassert(cache_ptr); - HDassert((0 <= type) && (type < NUMBER_OF_ENTRY_TYPES)); - HDassert((0 <= idx) && (idx <= max_indices[type])); + assert(cache_ptr); + assert((0 <= type) && (type < NUMBER_OF_ENTRY_TYPES)); + assert((0 <= idx) && (idx <= max_indices[type])); base_addr = entries[type]; entry_ptr = &(base_addr[idx]); baddrs = base_addrs[type]; - HDassert(entry_ptr->index == idx); - HDassert(entry_ptr->type == type); - HDassert(entry_ptr == entry_ptr->self); - HDassert(!(entry_ptr->is_protected)); + assert(entry_ptr->index == idx); + assert(entry_ptr->type == type); + assert(entry_ptr == entry_ptr->self); + assert(!(entry_ptr->is_protected)); /* Set the base address of the entry type into the property list as tag */ /* Use to cork entries for the object */ @@ -3163,22 +3162,22 @@ protect_entry(H5F_t *file_ptr, int32_t type, int32_t idx) * again. * - JRM */ - HDfprintf(stdout, "( cache_entry_ptr != (void *)entry_ptr ) = %d\n", + fprintf(stdout, "( cache_entry_ptr != (void *)entry_ptr ) = %d\n", (int)( cache_entry_ptr != (void *)entry_ptr )); - HDfprintf(stdout, "cache_entry_ptr = 0x%lx, entry_ptr = 0x%lx\n", + fprintf(stdout, "cache_entry_ptr = 0x%lx, entry_ptr = 0x%lx\n", (long)cache_entry_ptr, (long)entry_ptr); - HDfprintf(stdout, "entry_ptr->header.is_protected = %d\n", + fprintf(stdout, "entry_ptr->header.is_protected = %d\n", (int)(entry_ptr->header.is_protected)); - HDfprintf(stdout, + fprintf(stdout, "( entry_ptr->header.type != types[type] ) = %d\n", (int)( entry_ptr->header.type != types[type] )); - HDfprintf(stdout, + fprintf(stdout, "entry_ptr->size = %d, entry_ptr->header.size = %d\n", (int)(entry_ptr->size), (int)(entry_ptr->header.size)); - HDfprintf(stdout, + fprintf(stdout, "entry_ptr->addr = %d, entry_ptr->header.addr = %d\n", (int)(entry_ptr->addr), (int)(entry_ptr->header.addr)); - HDfprintf(stdout, + fprintf(stdout, "entry_ptr->verify_ct = %d, entry_ptr->max_verify_ct = %d\n", entry_ptr->verify_ct, entry_ptr->max_verify_ct); H5Eprint2(H5E_DEFAULT, stdout); @@ -3189,7 +3188,7 @@ protect_entry(H5F_t *file_ptr, int32_t type, int32_t idx) } /* end if */ else { - HDassert((entry_ptr->cache_ptr == NULL) || (entry_ptr->cache_ptr == cache_ptr)); + assert((entry_ptr->cache_ptr == NULL) || (entry_ptr->cache_ptr == cache_ptr)); entry_ptr->cache_ptr = cache_ptr; entry_ptr->file_ptr = file_ptr; @@ -3200,7 +3199,7 @@ protect_entry(H5F_t *file_ptr, int32_t type, int32_t idx) if (entry_ptr->header.tag_info && entry_ptr->header.tag_info->corked) entry_ptr->is_corked = TRUE; - HDassert(((entry_ptr->header).type)->id == type); + assert(((entry_ptr->header).type)->id == type); } /* end if */ } /* protect_entry() */ @@ -3233,18 +3232,17 @@ protect_entry_ro(H5F_t *file_ptr, int32_t type, int32_t idx) cache_ptr = file_ptr->shared->cache; - HDassert(cache_ptr); - HDassert((0 <= type) && (type < NUMBER_OF_ENTRY_TYPES)); - HDassert((0 <= idx) && (idx <= max_indices[type])); + assert(cache_ptr); + assert((0 <= type) && (type < NUMBER_OF_ENTRY_TYPES)); + assert((0 <= idx) && (idx <= max_indices[type])); base_addr = entries[type]; entry_ptr = &(base_addr[idx]); - HDassert(entry_ptr->index == idx); - HDassert(entry_ptr->type == type); - HDassert(entry_ptr == entry_ptr->self); - HDassert((!(entry_ptr->is_protected)) || - ((entry_ptr->is_read_only) && (entry_ptr->ro_ref_count > 0))); + assert(entry_ptr->index == idx); + assert(entry_ptr->type == type); + assert(entry_ptr == entry_ptr->self); + assert((!(entry_ptr->is_protected)) || ((entry_ptr->is_read_only) && (entry_ptr->ro_ref_count > 0))); cache_entry_ptr = (H5C_cache_entry_t *)H5C_protect(file_ptr, types[type], entry_ptr->addr, &entry_ptr->addr, H5C__READ_ONLY_FLAG); @@ -3259,7 +3257,7 @@ protect_entry_ro(H5F_t *file_ptr, int32_t type, int32_t idx) } else { - HDassert((entry_ptr->cache_ptr == NULL) || (entry_ptr->cache_ptr == cache_ptr)); + assert((entry_ptr->cache_ptr == NULL) || (entry_ptr->cache_ptr == cache_ptr)); entry_ptr->cache_ptr = cache_ptr; entry_ptr->file_ptr = file_ptr; @@ -3268,7 +3266,7 @@ protect_entry_ro(H5F_t *file_ptr, int32_t type, int32_t idx) entry_ptr->ro_ref_count++; } - HDassert(((entry_ptr->header).type)->id == type); + assert(((entry_ptr->header).type)->id == type); } } /* protect_entry_ro() */ @@ -3291,8 +3289,8 @@ protect_entry_ro(H5F_t *file_ptr, int32_t type, int32_t idx) void pin_entry(int32_t type, int32_t idx) { - HDassert((0 <= type) && (type < NUMBER_OF_ENTRY_TYPES)); - HDassert((0 <= idx) && (idx <= max_indices[type])); + assert((0 <= type) && (type < NUMBER_OF_ENTRY_TYPES)); + assert((0 <= idx) && (idx <= max_indices[type])); if (pass) { test_entry_t *base_addr; @@ -3302,11 +3300,11 @@ pin_entry(int32_t type, int32_t idx) base_addr = entries[type]; entry_ptr = &(base_addr[idx]); - HDassert(entry_ptr->index == idx); - HDassert(entry_ptr->type == type); - HDassert(entry_ptr == entry_ptr->self); - HDassert(entry_ptr->is_protected); - HDassert(!(entry_ptr->pinned_from_client)); + assert(entry_ptr->index == idx); + assert(entry_ptr->type == type); + assert(entry_ptr == entry_ptr->self); + assert(entry_ptr->is_protected); + assert(!(entry_ptr->pinned_from_client)); result = H5C_pin_protected_entry((void *)entry_ptr); @@ -3352,19 +3350,19 @@ unpin_entry(int32_t type, int32_t idx) test_entry_t *entry_ptr; if (pass) { - HDassert((0 <= type) && (type < NUMBER_OF_ENTRY_TYPES)); - HDassert((0 <= idx) && (idx <= max_indices[type])); + assert((0 <= type) && (type < NUMBER_OF_ENTRY_TYPES)); + assert((0 <= idx) && (idx <= max_indices[type])); base_addr = entries[type]; entry_ptr = &(base_addr[idx]); - HDassert(entry_ptr->index == idx); - HDassert(entry_ptr->type == type); - HDassert(entry_ptr == entry_ptr->self); - HDassert(entry_ptr->header.is_pinned); - HDassert(entry_ptr->header.pinned_from_client); - HDassert(entry_ptr->is_pinned); - HDassert(entry_ptr->pinned_from_client); + assert(entry_ptr->index == idx); + assert(entry_ptr->type == type); + assert(entry_ptr == entry_ptr->self); + assert(entry_ptr->header.is_pinned); + assert(entry_ptr->header.pinned_from_client); + assert(entry_ptr->is_pinned); + assert(entry_ptr->pinned_from_client); result = H5C_unpin_entry(entry_ptr); @@ -3381,7 +3379,7 @@ unpin_entry(int32_t type, int32_t idx) entry_ptr->is_pinned = entry_ptr->pinned_from_cache; - HDassert(((entry_ptr->header).type)->id == type); + assert(((entry_ptr->header).type)->id == type); } } /* unpin_entry() */ @@ -3411,24 +3409,24 @@ unprotect_entry(H5F_t *file_ptr, int32_t type, int32_t idx, unsigned int flags) test_entry_t *entry_ptr; if (pass) { - HDassert((0 <= type) && (type < NUMBER_OF_ENTRY_TYPES)); - HDassert((0 <= idx) && (idx <= max_indices[type])); + assert((0 <= type) && (type < NUMBER_OF_ENTRY_TYPES)); + assert((0 <= idx) && (idx <= max_indices[type])); base_addr = entries[type]; entry_ptr = &(base_addr[idx]); - HDassert(entry_ptr->index == idx); - HDassert(entry_ptr->type == type); - HDassert(entry_ptr == entry_ptr->self); - HDassert(entry_ptr->header.is_protected); - HDassert(entry_ptr->is_protected); + assert(entry_ptr->index == idx); + assert(entry_ptr->type == type); + assert(entry_ptr == entry_ptr->self); + assert(entry_ptr->header.is_protected); + assert(entry_ptr->is_protected); pin_flag_set = (hbool_t)((flags & H5C__PIN_ENTRY_FLAG) != 0); unpin_flag_set = (hbool_t)((flags & H5C__UNPIN_ENTRY_FLAG) != 0); - HDassert(!(pin_flag_set && unpin_flag_set)); - HDassert((!pin_flag_set) || (!(entry_ptr->is_pinned))); - HDassert((!unpin_flag_set) || (entry_ptr->is_pinned)); + assert(!(pin_flag_set && unpin_flag_set)); + assert((!pin_flag_set) || (!(entry_ptr->is_pinned))); + assert((!unpin_flag_set) || (entry_ptr->is_pinned)); if (flags & H5C__DIRTIED_FLAG) { hbool_t was_dirty = entry_ptr->is_dirty; @@ -3468,29 +3466,29 @@ unprotect_entry(H5F_t *file_ptr, int32_t type, int32_t idx, unsigned int flags) if (pin_flag_set) { - HDassert(entry_ptr->header.is_pinned); + assert(entry_ptr->header.is_pinned); entry_ptr->pinned_from_client = TRUE; entry_ptr->is_pinned = TRUE; } else if (unpin_flag_set) { - HDassert(entry_ptr->header.is_pinned == entry_ptr->header.pinned_from_cache); + assert(entry_ptr->header.is_pinned == entry_ptr->header.pinned_from_cache); entry_ptr->pinned_from_client = FALSE; entry_ptr->is_pinned = entry_ptr->pinned_from_cache; } } - HDassert(((entry_ptr->header).type)->id == type); + assert(((entry_ptr->header).type)->id == type); if ((flags & H5C__DIRTIED_FLAG) != 0 && ((flags & H5C__DELETED_FLAG) == 0)) { - HDassert(entry_ptr->header.is_dirty); - HDassert(entry_ptr->is_dirty); + assert(entry_ptr->header.is_dirty); + assert(entry_ptr->is_dirty); } - HDassert(entry_ptr->header.is_protected == entry_ptr->is_protected); - HDassert(entry_ptr->header.is_read_only == entry_ptr->is_read_only); - HDassert(entry_ptr->header.ro_ref_count == entry_ptr->ro_ref_count); + assert(entry_ptr->header.is_protected == entry_ptr->is_protected); + assert(entry_ptr->header.is_read_only == entry_ptr->is_read_only); + assert(entry_ptr->header.ro_ref_count == entry_ptr->ro_ref_count); } } /* unprotect_entry() */ @@ -3521,12 +3519,12 @@ row_major_scan_forward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t int32_t local_max_index; if (verbose) - HDfprintf(stdout, "%s(): entering.\n", __func__); + fprintf(stdout, "%s(): entering.\n", __func__); if (pass) { cache_ptr = file_ptr->shared->cache; - HDassert(cache_ptr != NULL); - HDassert(lag >= 10); + assert(cache_ptr != NULL); + assert(lag >= 10); if (reset_stats) H5C_stats__reset(cache_ptr); @@ -3540,79 +3538,73 @@ row_major_scan_forward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t int32_t tmp_idx; if (verbose) - HDfprintf(stdout, "%d:%d: ", type, idx); + fprintf(stdout, "%d:%d: ", type, idx); tmp_idx = idx + lag; if (pass && do_inserts && (tmp_idx >= 0) && (tmp_idx <= local_max_index) && ((tmp_idx % 2) == 0) && !entry_in_cache(cache_ptr, type, tmp_idx)) { if (verbose) - HDfprintf(stdout, "1(i, %d, %d) ", type, tmp_idx); + fprintf(stdout, "1(i, %d, %d) ", type, tmp_idx); insert_entry(file_ptr, type, tmp_idx, H5C__NO_FLAGS_SET); - HDassert((!cache_ptr->slist_enabled) || - (cache_ptr->slist_size == cache_ptr->dirty_index_size)); + assert((!cache_ptr->slist_enabled) || (cache_ptr->slist_size == cache_ptr->dirty_index_size)); } /* end if */ tmp_idx--; if (pass && (tmp_idx >= 0) && (tmp_idx <= local_max_index) && (tmp_idx % 3) == 0) { if (verbose) - HDfprintf(stdout, "2(p, %d, %d) ", type, tmp_idx); + fprintf(stdout, "2(p, %d, %d) ", type, tmp_idx); protect_entry(file_ptr, type, tmp_idx); - HDassert((!cache_ptr->slist_enabled) || - (cache_ptr->slist_size == cache_ptr->dirty_index_size)); + assert((!cache_ptr->slist_enabled) || (cache_ptr->slist_size == cache_ptr->dirty_index_size)); } /* end if */ tmp_idx--; if (pass && (tmp_idx >= 0) && (tmp_idx <= local_max_index) && (tmp_idx % 3) == 0) { if (verbose) - HDfprintf(stdout, "3(u, %d, %d) ", type, tmp_idx); + fprintf(stdout, "3(u, %d, %d) ", type, tmp_idx); unprotect_entry(file_ptr, type, tmp_idx, H5C__NO_FLAGS_SET); - HDassert((!cache_ptr->slist_enabled) || - (cache_ptr->slist_size == cache_ptr->dirty_index_size)); + assert((!cache_ptr->slist_enabled) || (cache_ptr->slist_size == cache_ptr->dirty_index_size)); } /* end if */ /* (don't decrement tmp_idx) */ if (pass && do_moves && (tmp_idx >= 0) && (tmp_idx <= local_max_index) && (tmp_idx % 3) == 0) { if (verbose) - HDfprintf(stdout, "4(r, %d, %d, %d) ", type, tmp_idx, (int)move_to_main_addr); + fprintf(stdout, "4(r, %d, %d, %d) ", type, tmp_idx, (int)move_to_main_addr); move_entry(cache_ptr, type, tmp_idx, move_to_main_addr); - HDassert((!cache_ptr->slist_enabled) || - (cache_ptr->slist_size == cache_ptr->dirty_index_size)); + assert((!cache_ptr->slist_enabled) || (cache_ptr->slist_size == cache_ptr->dirty_index_size)); } /* end if */ tmp_idx--; if (pass && (tmp_idx >= 0) && (tmp_idx <= local_max_index) && (tmp_idx % 5) == 0) { if (verbose) - HDfprintf(stdout, "5(p, %d, %d) ", type, tmp_idx); + fprintf(stdout, "5(p, %d, %d) ", type, tmp_idx); protect_entry(file_ptr, type, tmp_idx); - HDassert((!cache_ptr->slist_enabled) || - (cache_ptr->slist_size == cache_ptr->dirty_index_size)); + assert((!cache_ptr->slist_enabled) || (cache_ptr->slist_size == cache_ptr->dirty_index_size)); } /* end if */ tmp_idx -= 2; if (pass && (tmp_idx >= 0) && (tmp_idx <= local_max_index) && (tmp_idx % 5) == 0) { if (verbose) - HDfprintf(stdout, "6(u, %d, %d) ", type, tmp_idx); + fprintf(stdout, "6(u, %d, %d) ", type, tmp_idx); unprotect_entry(file_ptr, type, tmp_idx, H5C__NO_FLAGS_SET); - HDassert((!cache_ptr->slist_enabled) || - (cache_ptr->slist_size == cache_ptr->dirty_index_size)); + assert((!cache_ptr->slist_enabled) || (cache_ptr->slist_size == cache_ptr->dirty_index_size)); } /* end if */ if (do_mult_ro_protects) { @@ -3620,107 +3612,104 @@ row_major_scan_forward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t if (pass && (tmp_idx >= 0) && (tmp_idx < local_max_index) && (tmp_idx % 9) == 0) { if (verbose) - HDfprintf(stdout, "7(p-ro, %d, %d) ", type, tmp_idx); + fprintf(stdout, "7(p-ro, %d, %d) ", type, tmp_idx); protect_entry_ro(file_ptr, type, tmp_idx); - HDassert((!cache_ptr->slist_enabled) || - (cache_ptr->slist_size == cache_ptr->dirty_index_size)); + assert((!cache_ptr->slist_enabled) || + (cache_ptr->slist_size == cache_ptr->dirty_index_size)); } /* end if */ tmp_idx--; if (pass && (tmp_idx >= 0) && (tmp_idx < local_max_index) && (tmp_idx % 11) == 0) { if (verbose) - HDfprintf(stdout, "8(p-ro, %d, %d) ", type, tmp_idx); + fprintf(stdout, "8(p-ro, %d, %d) ", type, tmp_idx); protect_entry_ro(file_ptr, type, tmp_idx); - HDassert((!cache_ptr->slist_enabled) || - (cache_ptr->slist_size == cache_ptr->dirty_index_size)); + assert((!cache_ptr->slist_enabled) || + (cache_ptr->slist_size == cache_ptr->dirty_index_size)); } /* end if */ tmp_idx--; if (pass && (tmp_idx >= 0) && (tmp_idx < local_max_index) && (tmp_idx % 13) == 0) { if (verbose) - HDfprintf(stdout, "9(p-ro, %d, %d) ", type, tmp_idx); + fprintf(stdout, "9(p-ro, %d, %d) ", type, tmp_idx); protect_entry_ro(file_ptr, type, tmp_idx); - HDassert((!cache_ptr->slist_enabled) || - (cache_ptr->slist_size == cache_ptr->dirty_index_size)); + assert((!cache_ptr->slist_enabled) || + (cache_ptr->slist_size == cache_ptr->dirty_index_size)); } /* end if */ /* (don't decrement tmp_idx) */ if (pass && (tmp_idx >= 0) && (tmp_idx < local_max_index) && (tmp_idx % 9) == 0) { if (verbose) - HDfprintf(stdout, "10(u-ro, %d, %d) ", type, tmp_idx); + fprintf(stdout, "10(u-ro, %d, %d) ", type, tmp_idx); unprotect_entry(file_ptr, type, tmp_idx, H5C__NO_FLAGS_SET); - HDassert((!cache_ptr->slist_enabled) || - (cache_ptr->slist_size == cache_ptr->dirty_index_size)); + assert((!cache_ptr->slist_enabled) || + (cache_ptr->slist_size == cache_ptr->dirty_index_size)); } /* end if */ tmp_idx--; if (pass && (tmp_idx >= 0) && (tmp_idx < local_max_index) && (tmp_idx % 11) == 0) { if (verbose) - HDfprintf(stdout, "11(u-ro, %d, %d) ", type, tmp_idx); + fprintf(stdout, "11(u-ro, %d, %d) ", type, tmp_idx); unprotect_entry(file_ptr, type, tmp_idx, H5C__NO_FLAGS_SET); - HDassert((!cache_ptr->slist_enabled) || - (cache_ptr->slist_size == cache_ptr->dirty_index_size)); + assert((!cache_ptr->slist_enabled) || + (cache_ptr->slist_size == cache_ptr->dirty_index_size)); } /* end if */ tmp_idx--; if (pass && (tmp_idx >= 0) && (tmp_idx < local_max_index) && (tmp_idx % 13) == 0) { if (verbose) - HDfprintf(stdout, "12(u-ro, %d, %d) ", type, tmp_idx); + fprintf(stdout, "12(u-ro, %d, %d) ", type, tmp_idx); unprotect_entry(file_ptr, type, tmp_idx, H5C__NO_FLAGS_SET); - HDassert((!cache_ptr->slist_enabled) || - (cache_ptr->slist_size == cache_ptr->dirty_index_size)); + assert((!cache_ptr->slist_enabled) || + (cache_ptr->slist_size == cache_ptr->dirty_index_size)); } /* end if */ } /* if ( do_mult_ro_protects ) */ if (pass && (idx >= 0) && (idx <= local_max_index)) { if (verbose) - HDfprintf(stdout, "13(p, %d, %d) ", type, idx); + fprintf(stdout, "13(p, %d, %d) ", type, idx); protect_entry(file_ptr, type, idx); - HDassert((!cache_ptr->slist_enabled) || - (cache_ptr->slist_size == cache_ptr->dirty_index_size)); + assert((!cache_ptr->slist_enabled) || (cache_ptr->slist_size == cache_ptr->dirty_index_size)); } /* end if */ tmp_idx = idx - lag + 2; if (pass && (tmp_idx >= 0) && (tmp_idx <= local_max_index) && (tmp_idx % 7) == 0) { if (verbose) - HDfprintf(stdout, "14(u, %d, %d) ", type, tmp_idx); + fprintf(stdout, "14(u, %d, %d) ", type, tmp_idx); unprotect_entry(file_ptr, type, tmp_idx, H5C__NO_FLAGS_SET); - HDassert((!cache_ptr->slist_enabled) || - (cache_ptr->slist_size == cache_ptr->dirty_index_size)); + assert((!cache_ptr->slist_enabled) || (cache_ptr->slist_size == cache_ptr->dirty_index_size)); } /* end if */ tmp_idx--; if (pass && (tmp_idx >= 0) && (tmp_idx <= local_max_index) && (tmp_idx % 7) == 0) { if (verbose) - HDfprintf(stdout, "15(p, %d, %d) ", type, tmp_idx); + fprintf(stdout, "15(p, %d, %d) ", type, tmp_idx); protect_entry(file_ptr, type, tmp_idx); - HDassert((!cache_ptr->slist_enabled) || - (cache_ptr->slist_size == cache_ptr->dirty_index_size)); + assert((!cache_ptr->slist_enabled) || (cache_ptr->slist_size == cache_ptr->dirty_index_size)); } /* end if */ if (do_destroys) { @@ -3729,71 +3718,71 @@ row_major_scan_forward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t switch (tmp_idx % 4) { case 0: /* we just did an insert */ if (verbose) - HDfprintf(stdout, "16(u, %d, %d) ", type, tmp_idx); + fprintf(stdout, "16(u, %d, %d) ", type, tmp_idx); unprotect_entry(file_ptr, type, tmp_idx, H5C__NO_FLAGS_SET); - HDassert((!cache_ptr->slist_enabled) || - (cache_ptr->slist_size == cache_ptr->dirty_index_size)); + assert((!cache_ptr->slist_enabled) || + (cache_ptr->slist_size == cache_ptr->dirty_index_size)); break; case 1: if ((entries[type])[tmp_idx].is_dirty) { if (verbose) - HDfprintf(stdout, "17(u, %d, %d) ", type, tmp_idx); + fprintf(stdout, "17(u, %d, %d) ", type, tmp_idx); unprotect_entry(file_ptr, type, tmp_idx, H5C__NO_FLAGS_SET); - HDassert((!cache_ptr->slist_enabled) || - (cache_ptr->slist_size == cache_ptr->dirty_index_size)); + assert((!cache_ptr->slist_enabled) || + (cache_ptr->slist_size == cache_ptr->dirty_index_size)); } /* end if */ else { if (verbose) - HDfprintf(stdout, "18(u, %d, %d) ", type, tmp_idx); + fprintf(stdout, "18(u, %d, %d) ", type, tmp_idx); unprotect_entry(file_ptr, type, tmp_idx, (dirty_unprotects ? H5C__DIRTIED_FLAG : H5C__NO_FLAGS_SET)); - HDassert((!cache_ptr->slist_enabled) || - (cache_ptr->slist_size == cache_ptr->dirty_index_size)); + assert((!cache_ptr->slist_enabled) || + (cache_ptr->slist_size == cache_ptr->dirty_index_size)); } /* end else */ break; case 2: /* we just did an insert */ if (verbose) - HDfprintf(stdout, "19(u-del, %d, %d) ", type, tmp_idx); + fprintf(stdout, "19(u-del, %d, %d) ", type, tmp_idx); unprotect_entry(file_ptr, type, tmp_idx, H5C__DELETED_FLAG); - HDassert((!cache_ptr->slist_enabled) || - (cache_ptr->slist_size == cache_ptr->dirty_index_size)); + assert((!cache_ptr->slist_enabled) || + (cache_ptr->slist_size == cache_ptr->dirty_index_size)); break; case 3: if ((entries[type])[tmp_idx].is_dirty) { if (verbose) - HDfprintf(stdout, "20(u-del, %d, %d) ", type, tmp_idx); + fprintf(stdout, "20(u-del, %d, %d) ", type, tmp_idx); unprotect_entry(file_ptr, type, tmp_idx, H5C__DELETED_FLAG); - HDassert((!cache_ptr->slist_enabled) || - (cache_ptr->slist_size == cache_ptr->dirty_index_size)); + assert((!cache_ptr->slist_enabled) || + (cache_ptr->slist_size == cache_ptr->dirty_index_size)); } /* end if */ else { if (verbose) - HDfprintf(stdout, "21(u-del, %d, %d) ", type, tmp_idx); + fprintf(stdout, "21(u-del, %d, %d) ", type, tmp_idx); unprotect_entry(file_ptr, type, tmp_idx, (dirty_destroys ? H5C__DIRTIED_FLAG : H5C__NO_FLAGS_SET) | H5C__DELETED_FLAG); - HDassert((!cache_ptr->slist_enabled) || - (cache_ptr->slist_size == cache_ptr->dirty_index_size)); + assert((!cache_ptr->slist_enabled) || + (cache_ptr->slist_size == cache_ptr->dirty_index_size)); } /* end else */ break; default: - HDassert(0); /* this can't happen... */ + assert(0); /* this can't happen... */ break; } /* end switch */ } /* end if */ @@ -3802,18 +3791,18 @@ row_major_scan_forward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t tmp_idx = idx - lag; if (pass && (tmp_idx >= 0) && (tmp_idx <= local_max_index)) { if (verbose) - HDfprintf(stdout, "22(u, %d, %d) ", type, tmp_idx); + fprintf(stdout, "22(u, %d, %d) ", type, tmp_idx); unprotect_entry(file_ptr, type, tmp_idx, (dirty_unprotects ? H5C__DIRTIED_FLAG : H5C__NO_FLAGS_SET)); - HDassert((!cache_ptr->slist_enabled) || - (cache_ptr->slist_size == cache_ptr->dirty_index_size)); + assert((!cache_ptr->slist_enabled) || + (cache_ptr->slist_size == cache_ptr->dirty_index_size)); } /* end if */ } /* end elseif */ if (verbose) - HDfprintf(stdout, "\n"); + fprintf(stdout, "\n"); idx++; } /* end while */ @@ -3853,16 +3842,16 @@ hl_row_major_scan_forward(H5F_t *file_ptr, int32_t max_index, hbool_t verbose, h int32_t local_max_index; if (verbose) - HDfprintf(stdout, "%s(): entering.\n", __func__); + fprintf(stdout, "%s(): entering.\n", __func__); if (pass) { cache_ptr = file_ptr->shared->cache; - HDassert(cache_ptr != NULL); - HDassert(lag > 5); - HDassert(max_index >= 200); - HDassert(max_index <= MAX_ENTRIES); + assert(cache_ptr != NULL); + assert(lag > 5); + assert(max_index >= 200); + assert(max_index <= MAX_ENTRIES); if (reset_stats) { @@ -3880,7 +3869,7 @@ hl_row_major_scan_forward(H5F_t *file_ptr, int32_t max_index, hbool_t verbose, h (((idx + lag) % 2) == 0) && (!entry_in_cache(cache_ptr, type, (idx + lag)))) { if (verbose) - HDfprintf(stdout, "(i, %d, %d) ", type, (idx + lag)); + fprintf(stdout, "(i, %d, %d) ", type, (idx + lag)); insert_entry(file_ptr, type, (idx + lag), H5C__NO_FLAGS_SET); } @@ -3891,12 +3880,12 @@ hl_row_major_scan_forward(H5F_t *file_ptr, int32_t max_index, hbool_t verbose, h if ((pass) && (i >= 0) && (i <= local_max_index)) { if (verbose) - HDfprintf(stdout, "(p, %d, %d) ", type, i); + fprintf(stdout, "(p, %d, %d) ", type, i); protect_entry(file_ptr, type, i); if (verbose) - HDfprintf(stdout, "(u, %d, %d) ", type, i); + fprintf(stdout, "(u, %d, %d) ", type, i); unprotect_entry(file_ptr, type, i, H5C__NO_FLAGS_SET); } @@ -3904,7 +3893,7 @@ hl_row_major_scan_forward(H5F_t *file_ptr, int32_t max_index, hbool_t verbose, h } if (verbose) - HDfprintf(stdout, "\n"); + fprintf(stdout, "\n"); idx++; } @@ -3945,14 +3934,14 @@ row_major_scan_backward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t int32_t local_max_index; if (verbose) - HDfprintf(stdout, "%s(): Entering.\n", __func__); + fprintf(stdout, "%s(): Entering.\n", __func__); if (pass) { cache_ptr = file_ptr->shared->cache; - HDassert(cache_ptr != NULL); - HDassert(lag >= 10); + assert(cache_ptr != NULL); + assert(lag >= 10); if (reset_stats) { @@ -3973,7 +3962,7 @@ row_major_scan_backward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t ((tmp_idx % 2) == 1) && (!entry_in_cache(cache_ptr, type, tmp_idx))) { if (verbose) - HDfprintf(stdout, "(i, %d, %d) ", type, tmp_idx); + fprintf(stdout, "(i, %d, %d) ", type, tmp_idx); insert_entry(file_ptr, type, tmp_idx, H5C__NO_FLAGS_SET); } @@ -3982,7 +3971,7 @@ row_major_scan_backward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t if ((pass) && (tmp_idx >= 0) && (tmp_idx <= local_max_index) && ((tmp_idx % 3) == 0)) { if (verbose) - HDfprintf(stdout, "(p, %d, %d) ", type, tmp_idx); + fprintf(stdout, "(p, %d, %d) ", type, tmp_idx); protect_entry(file_ptr, type, tmp_idx); } @@ -3991,7 +3980,7 @@ row_major_scan_backward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t if ((pass) && (tmp_idx >= 0) && (tmp_idx <= local_max_index) && ((tmp_idx % 3) == 0)) { if (verbose) - HDfprintf(stdout, "(u, %d, %d) ", type, tmp_idx); + fprintf(stdout, "(u, %d, %d) ", type, tmp_idx); unprotect_entry(file_ptr, type, tmp_idx, H5C__NO_FLAGS_SET); } @@ -4001,7 +3990,7 @@ row_major_scan_backward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t ((tmp_idx % 3) == 0)) { if (verbose) - HDfprintf(stdout, "(r, %d, %d, %d) ", type, tmp_idx, (int)move_to_main_addr); + fprintf(stdout, "(r, %d, %d, %d) ", type, tmp_idx, (int)move_to_main_addr); move_entry(cache_ptr, type, tmp_idx, move_to_main_addr); } @@ -4010,7 +3999,7 @@ row_major_scan_backward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t if ((pass) && (tmp_idx >= 0) && (tmp_idx <= local_max_index) && ((tmp_idx % 5) == 0)) { if (verbose) - HDfprintf(stdout, "(p, %d, %d) ", type, tmp_idx); + fprintf(stdout, "(p, %d, %d) ", type, tmp_idx); protect_entry(file_ptr, type, (idx - lag + 3)); } @@ -4019,7 +4008,7 @@ row_major_scan_backward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t if ((pass) && (tmp_idx >= 0) && (tmp_idx <= local_max_index) && ((tmp_idx % 5) == 0)) { if (verbose) - HDfprintf(stdout, "(u, %d, %d) ", type, tmp_idx); + fprintf(stdout, "(u, %d, %d) ", type, tmp_idx); unprotect_entry(file_ptr, type, tmp_idx, H5C__NO_FLAGS_SET); } @@ -4029,7 +4018,7 @@ row_major_scan_backward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t if ((pass) && (tmp_idx >= 0) && (tmp_idx < local_max_index) && (tmp_idx % 9 == 0)) { if (verbose) - HDfprintf(stdout, "(p-ro, %d, %d) ", type, tmp_idx); + fprintf(stdout, "(p-ro, %d, %d) ", type, tmp_idx); protect_entry_ro(file_ptr, type, tmp_idx); } @@ -4038,7 +4027,7 @@ row_major_scan_backward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t if ((pass) && (tmp_idx >= 0) && (tmp_idx < local_max_index) && (tmp_idx % 11 == 0)) { if (verbose) - HDfprintf(stdout, "(p-ro, %d, %d) ", type, tmp_idx); + fprintf(stdout, "(p-ro, %d, %d) ", type, tmp_idx); protect_entry_ro(file_ptr, type, tmp_idx); } @@ -4047,7 +4036,7 @@ row_major_scan_backward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t if ((pass) && (tmp_idx >= 0) && (tmp_idx < local_max_index) && (tmp_idx % 13 == 0)) { if (verbose) - HDfprintf(stdout, "(p-ro, %d, %d) ", type, tmp_idx); + fprintf(stdout, "(p-ro, %d, %d) ", type, tmp_idx); protect_entry_ro(file_ptr, type, tmp_idx); } @@ -4056,7 +4045,7 @@ row_major_scan_backward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t if ((pass) && (tmp_idx >= 0) && (tmp_idx < local_max_index) && (tmp_idx % 9 == 0)) { if (verbose) - HDfprintf(stdout, "(u-ro, %d, %d) ", type, tmp_idx); + fprintf(stdout, "(u-ro, %d, %d) ", type, tmp_idx); unprotect_entry(file_ptr, type, tmp_idx, H5C__NO_FLAGS_SET); } @@ -4065,7 +4054,7 @@ row_major_scan_backward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t if ((pass) && (tmp_idx >= 0) && (tmp_idx < local_max_index) && (tmp_idx % 11 == 0)) { if (verbose) - HDfprintf(stdout, "(u-ro, %d, %d) ", type, tmp_idx); + fprintf(stdout, "(u-ro, %d, %d) ", type, tmp_idx); unprotect_entry(file_ptr, type, tmp_idx, H5C__NO_FLAGS_SET); } @@ -4074,7 +4063,7 @@ row_major_scan_backward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t if ((pass) && (tmp_idx >= 0) && (tmp_idx < local_max_index) && (tmp_idx % 13 == 0)) { if (verbose) - HDfprintf(stdout, "(u-ro, %d, %d) ", type, tmp_idx); + fprintf(stdout, "(u-ro, %d, %d) ", type, tmp_idx); unprotect_entry(file_ptr, type, tmp_idx, H5C__NO_FLAGS_SET); } @@ -4083,7 +4072,7 @@ row_major_scan_backward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t if ((pass) && (idx >= 0) && (idx <= local_max_index)) { if (verbose) - HDfprintf(stdout, "(p, %d, %d) ", type, idx); + fprintf(stdout, "(p, %d, %d) ", type, idx); protect_entry(file_ptr, type, idx); } @@ -4092,7 +4081,7 @@ row_major_scan_backward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t if ((pass) && (tmp_idx >= 0) && (tmp_idx <= local_max_index) && ((tmp_idx % 7) == 0)) { if (verbose) - HDfprintf(stdout, "(u, %d, %d) ", type, tmp_idx); + fprintf(stdout, "(u, %d, %d) ", type, tmp_idx); unprotect_entry(file_ptr, type, tmp_idx, H5C__NO_FLAGS_SET); } @@ -4101,7 +4090,7 @@ row_major_scan_backward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t if ((pass) && (tmp_idx >= 0) && (tmp_idx <= local_max_index) && ((tmp_idx % 7) == 0)) { if (verbose) - HDfprintf(stdout, "(p, %d, %d) ", type, tmp_idx); + fprintf(stdout, "(p, %d, %d) ", type, tmp_idx); protect_entry(file_ptr, type, tmp_idx); } @@ -4146,7 +4135,7 @@ row_major_scan_backward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t break; default: - HDassert(0); /* this can't happen... */ + assert(0); /* this can't happen... */ break; } } @@ -4156,7 +4145,7 @@ row_major_scan_backward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t if ((pass) && ((idx + lag) >= 0) && ((idx + lag) <= local_max_index)) { if (verbose) - HDfprintf(stdout, "(u, %d, %d) ", type, (idx + lag)); + fprintf(stdout, "(u, %d, %d) ", type, (idx + lag)); unprotect_entry(file_ptr, type, idx + lag, (dirty_unprotects ? H5C__DIRTIED_FLAG : H5C__NO_FLAGS_SET)); @@ -4164,7 +4153,7 @@ row_major_scan_backward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t } if (verbose) - HDfprintf(stdout, "\n"); + fprintf(stdout, "\n"); idx--; } @@ -4205,16 +4194,16 @@ hl_row_major_scan_backward(H5F_t *file_ptr, int32_t max_index, hbool_t verbose, int32_t local_max_index; if (verbose) - HDfprintf(stdout, "%s(): entering.\n", __func__); + fprintf(stdout, "%s(): entering.\n", __func__); if (pass) { cache_ptr = file_ptr->shared->cache; - HDassert(cache_ptr != NULL); - HDassert(lag > 5); - HDassert(max_index >= 200); - HDassert(max_index <= MAX_ENTRIES); + assert(cache_ptr != NULL); + assert(lag > 5); + assert(max_index >= 200); + assert(max_index <= MAX_ENTRIES); if (reset_stats) { @@ -4232,7 +4221,7 @@ hl_row_major_scan_backward(H5F_t *file_ptr, int32_t max_index, hbool_t verbose, (((idx + lag) % 2) == 0) && (!entry_in_cache(cache_ptr, type, (idx + lag)))) { if (verbose) - HDfprintf(stdout, "(i, %d, %d) ", type, (idx + lag)); + fprintf(stdout, "(i, %d, %d) ", type, (idx + lag)); insert_entry(file_ptr, type, (idx + lag), H5C__NO_FLAGS_SET); } @@ -4243,12 +4232,12 @@ hl_row_major_scan_backward(H5F_t *file_ptr, int32_t max_index, hbool_t verbose, if ((pass) && (i >= 0) && (i <= local_max_index)) { if (verbose) - HDfprintf(stdout, "(p, %d, %d) ", type, i); + fprintf(stdout, "(p, %d, %d) ", type, i); protect_entry(file_ptr, type, i); if (verbose) - HDfprintf(stdout, "(u, %d, %d) ", type, i); + fprintf(stdout, "(u, %d, %d) ", type, i); unprotect_entry(file_ptr, type, i, H5C__NO_FLAGS_SET); } @@ -4256,7 +4245,7 @@ hl_row_major_scan_backward(H5F_t *file_ptr, int32_t max_index, hbool_t verbose, } if (verbose) - HDfprintf(stdout, "\n"); + fprintf(stdout, "\n"); idx--; } @@ -4296,7 +4285,7 @@ col_major_scan_forward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t int32_t local_max_index[NUMBER_OF_ENTRY_TYPES]; if (verbose) - HDfprintf(stdout, "%s: entering.\n", __func__); + fprintf(stdout, "%s: entering.\n", __func__); if (pass) { int i; @@ -4306,7 +4295,7 @@ col_major_scan_forward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t for (i = 0; i < NUMBER_OF_ENTRY_TYPES; i++) local_max_index[i] = MIN(max_index, max_indices[i]); - HDassert(lag > 5); + assert(lag > 5); if (reset_stats) { @@ -4324,7 +4313,7 @@ col_major_scan_forward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t (((idx + lag) % 3) == 0) && (!entry_in_cache(cache_ptr, type, (idx + lag)))) { if (verbose) - HDfprintf(stdout, "(i, %d, %d) ", type, (idx + lag)); + fprintf(stdout, "(i, %d, %d) ", type, (idx + lag)); insert_entry(file_ptr, type, (idx + lag), H5C__NO_FLAGS_SET); } @@ -4332,7 +4321,7 @@ col_major_scan_forward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t if ((pass) && (idx >= 0) && (idx <= local_max_index[type])) { if (verbose) - HDfprintf(stdout, "(p, %d, %d) ", type, idx); + fprintf(stdout, "(p, %d, %d) ", type, idx); protect_entry(file_ptr, type, idx); } @@ -4340,14 +4329,14 @@ col_major_scan_forward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t if ((pass) && ((idx - lag) >= 0) && ((idx - lag) <= local_max_index[type])) { if (verbose) - HDfprintf(stdout, "(u, %d, %d) ", type, (idx - lag)); + fprintf(stdout, "(u, %d, %d) ", type, (idx - lag)); unprotect_entry(file_ptr, type, idx - lag, (dirty_unprotects ? H5C__DIRTIED_FLAG : H5C__NO_FLAGS_SET)); } if (verbose) - HDfprintf(stdout, "\n"); + fprintf(stdout, "\n"); type++; } @@ -4390,16 +4379,16 @@ hl_col_major_scan_forward(H5F_t *file_ptr, int32_t max_index, hbool_t verbose, h int32_t local_max_index; if (verbose) - HDfprintf(stdout, "%s: entering.\n", __func__); + fprintf(stdout, "%s: entering.\n", __func__); if (pass) { cache_ptr = file_ptr->shared->cache; - HDassert(cache_ptr != NULL); - HDassert(lag > 5); - HDassert(max_index >= 500); - HDassert(max_index <= MAX_ENTRIES); + assert(cache_ptr != NULL); + assert(lag > 5); + assert(max_index >= 500); + assert(max_index <= MAX_ENTRIES); if (reset_stats) { @@ -4424,7 +4413,7 @@ hl_col_major_scan_forward(H5F_t *file_ptr, int32_t max_index, hbool_t verbose, h (!entry_in_cache(cache_ptr, type, i))) { if (verbose) - HDfprintf(stdout, "(i, %d, %d) ", type, i); + fprintf(stdout, "(i, %d, %d) ", type, i); insert_entry(file_ptr, type, i, H5C__NO_FLAGS_SET); } @@ -4432,7 +4421,7 @@ hl_col_major_scan_forward(H5F_t *file_ptr, int32_t max_index, hbool_t verbose, h if ((pass) && (i >= 0) && (i <= local_max_index)) { if (verbose) - HDfprintf(stdout, "(p, %d, %d) ", type, i); + fprintf(stdout, "(p, %d, %d) ", type, i); protect_entry(file_ptr, type, i); } @@ -4440,14 +4429,14 @@ hl_col_major_scan_forward(H5F_t *file_ptr, int32_t max_index, hbool_t verbose, h if ((pass) && (i >= 0) && (i <= local_max_index)) { if (verbose) - HDfprintf(stdout, "(u, %d, %d) ", type, i); + fprintf(stdout, "(u, %d, %d) ", type, i); unprotect_entry(file_ptr, type, i, (dirty_unprotects ? H5C__DIRTIED_FLAG : H5C__NO_FLAGS_SET)); } if (verbose) - HDfprintf(stdout, "\n"); + fprintf(stdout, "\n"); type++; } @@ -4492,19 +4481,19 @@ col_major_scan_backward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t int32_t local_max_index[NUMBER_OF_ENTRY_TYPES] = {0}; if (verbose) - HDfprintf(stdout, "%s: entering.\n", __func__); + fprintf(stdout, "%s: entering.\n", __func__); if (pass) { int i; cache_ptr = file_ptr->shared->cache; - HDassert(cache_ptr != NULL); + assert(cache_ptr != NULL); for (i = 0; i < NUMBER_OF_ENTRY_TYPES; i++) local_max_index[i] = MIN(max_index, max_indices[i]); - HDassert(lag > 5); + assert(lag > 5); if (reset_stats) { @@ -4515,7 +4504,7 @@ col_major_scan_backward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t idx = local_max_index[NUMBER_OF_ENTRY_TYPES - 1] + lag; if (verbose) /* 1 */ - HDfprintf(stdout, "%s: point %d.\n", __func__, mile_stone++); + fprintf(stdout, "%s: point %d.\n", __func__, mile_stone++); while ((pass) && ((idx + lag) >= 0)) { type = NUMBER_OF_ENTRY_TYPES - 1; @@ -4525,7 +4514,7 @@ col_major_scan_backward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t (((idx - lag) % 3) == 0) && (!entry_in_cache(cache_ptr, type, (idx - lag)))) { if (verbose) - HDfprintf(stdout, "(i, %d, %d) ", type, (idx - lag)); + fprintf(stdout, "(i, %d, %d) ", type, (idx - lag)); insert_entry(file_ptr, type, (idx - lag), H5C__NO_FLAGS_SET); } @@ -4533,7 +4522,7 @@ col_major_scan_backward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t if ((pass) && (idx >= 0) && (idx <= local_max_index[type])) { if (verbose) - HDfprintf(stdout, "(p, %d, %d) ", type, idx); + fprintf(stdout, "(p, %d, %d) ", type, idx); protect_entry(file_ptr, type, idx); } @@ -4541,14 +4530,14 @@ col_major_scan_backward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t if ((pass) && ((idx + lag) >= 0) && ((idx + lag) <= local_max_index[type])) { if (verbose) - HDfprintf(stdout, "(u, %d, %d) ", type, (idx + lag)); + fprintf(stdout, "(u, %d, %d) ", type, (idx + lag)); unprotect_entry(file_ptr, type, idx + lag, (dirty_unprotects ? H5C__DIRTIED_FLAG : H5C__NO_FLAGS_SET)); } if (verbose) - HDfprintf(stdout, "\n"); + fprintf(stdout, "\n"); type--; } @@ -4557,7 +4546,7 @@ col_major_scan_backward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t } if (verbose) /* 2 */ - HDfprintf(stdout, "%s: point %d.\n", __func__, mile_stone++); + fprintf(stdout, "%s: point %d.\n", __func__, mile_stone++); if ((pass) && (display_stats)) { @@ -4565,7 +4554,7 @@ col_major_scan_backward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t } if (verbose) - HDfprintf(stdout, "%s: exiting.\n", __func__); + fprintf(stdout, "%s: exiting.\n", __func__); } /* col_major_scan_backward() */ @@ -4597,16 +4586,16 @@ hl_col_major_scan_backward(H5F_t *file_ptr, int32_t max_index, hbool_t verbose, int32_t local_max_index = -1; if (verbose) - HDfprintf(stdout, "%s: entering.\n", __func__); + fprintf(stdout, "%s: entering.\n", __func__); if (pass) { cache_ptr = file_ptr->shared->cache; - HDassert(cache_ptr != NULL); - HDassert(lag > 5); - HDassert(max_index >= 500); - HDassert(max_index <= MAX_ENTRIES); + assert(cache_ptr != NULL); + assert(lag > 5); + assert(max_index >= 500); + assert(max_index <= MAX_ENTRIES); local_max_index = MIN(max_index, MAX_ENTRIES); @@ -4631,7 +4620,7 @@ hl_col_major_scan_backward(H5F_t *file_ptr, int32_t max_index, hbool_t verbose, (!entry_in_cache(cache_ptr, type, i))) { if (verbose) - HDfprintf(stdout, "(i, %d, %d) ", type, i); + fprintf(stdout, "(i, %d, %d) ", type, i); insert_entry(file_ptr, type, i, H5C__NO_FLAGS_SET); } @@ -4639,7 +4628,7 @@ hl_col_major_scan_backward(H5F_t *file_ptr, int32_t max_index, hbool_t verbose, if ((pass) && (i >= 0) && (i <= local_max_index)) { if (verbose) - HDfprintf(stdout, "(p, %d, %d) ", type, i); + fprintf(stdout, "(p, %d, %d) ", type, i); protect_entry(file_ptr, type, i); } @@ -4647,14 +4636,14 @@ hl_col_major_scan_backward(H5F_t *file_ptr, int32_t max_index, hbool_t verbose, if ((pass) && (i >= 0) && (i <= local_max_index)) { if (verbose) - HDfprintf(stdout, "(u, %d, %d) ", type, i); + fprintf(stdout, "(u, %d, %d) ", type, i); unprotect_entry(file_ptr, type, i, (dirty_unprotects ? H5C__DIRTIED_FLAG : H5C__NO_FLAGS_SET)); } if (verbose) - HDfprintf(stdout, "\n"); + fprintf(stdout, "\n"); type++; } @@ -4690,10 +4679,10 @@ hl_col_major_scan_backward(H5F_t *file_ptr, int32_t max_index, hbool_t verbose, void create_flush_dependency(int32_t par_type, int32_t par_idx, int32_t chd_type, int32_t chd_idx) { - HDassert((0 <= par_type) && (par_type < NUMBER_OF_ENTRY_TYPES)); - HDassert((0 <= par_idx) && (par_idx <= max_indices[par_type])); - HDassert((0 <= chd_type) && (chd_type < NUMBER_OF_ENTRY_TYPES)); - HDassert((0 <= chd_idx) && (chd_idx <= max_indices[chd_type])); + assert((0 <= par_type) && (par_type < NUMBER_OF_ENTRY_TYPES)); + assert((0 <= par_idx) && (par_idx <= max_indices[par_type])); + assert((0 <= chd_type) && (chd_type < NUMBER_OF_ENTRY_TYPES)); + assert((0 <= chd_idx) && (chd_idx <= max_indices[chd_type])); if (pass) { test_entry_t *par_base_addr; /* Base entry of parent's entry array */ @@ -4709,19 +4698,19 @@ create_flush_dependency(int32_t par_type, int32_t par_idx, int32_t chd_type, int par_is_pinned = par_entry_ptr->header.is_pinned; /* Sanity check parent entry */ - HDassert(par_entry_ptr->index == par_idx); - HDassert(par_entry_ptr->type == par_type); - HDassert(par_entry_ptr->header.is_protected); - HDassert(par_entry_ptr == par_entry_ptr->self); + assert(par_entry_ptr->index == par_idx); + assert(par_entry_ptr->type == par_type); + assert(par_entry_ptr->header.is_protected); + assert(par_entry_ptr == par_entry_ptr->self); /* Get parent entry */ chd_base_addr = entries[chd_type]; chd_entry_ptr = &(chd_base_addr[chd_idx]); /* Sanity check child entry */ - HDassert(chd_entry_ptr->index == chd_idx); - HDassert(chd_entry_ptr->type == chd_type); - HDassert(chd_entry_ptr == chd_entry_ptr->self); + assert(chd_entry_ptr->index == chd_idx); + assert(chd_entry_ptr->type == chd_type); + assert(chd_entry_ptr == chd_entry_ptr->self); result = H5C_create_flush_dependency(par_entry_ptr, chd_entry_ptr); @@ -4733,13 +4722,13 @@ create_flush_dependency(int32_t par_type, int32_t par_idx, int32_t chd_type, int } /* end if */ /* Update information about entries */ - HDassert(chd_entry_ptr->flush_dep_npar < MAX_FLUSH_DEP_PARS); + assert(chd_entry_ptr->flush_dep_npar < MAX_FLUSH_DEP_PARS); chd_entry_ptr->flush_dep_par_type[chd_entry_ptr->flush_dep_npar] = par_type; chd_entry_ptr->flush_dep_par_idx[chd_entry_ptr->flush_dep_npar] = par_idx; chd_entry_ptr->flush_dep_npar++; par_entry_ptr->flush_dep_nchd++; if (chd_entry_ptr->is_dirty || chd_entry_ptr->flush_dep_ndirty_chd > 0) { - HDassert(par_entry_ptr->flush_dep_ndirty_chd < par_entry_ptr->flush_dep_nchd); + assert(par_entry_ptr->flush_dep_ndirty_chd < par_entry_ptr->flush_dep_nchd); par_entry_ptr->flush_dep_ndirty_chd++; } /* end if */ par_entry_ptr->pinned_from_cache = TRUE; @@ -4766,10 +4755,10 @@ create_flush_dependency(int32_t par_type, int32_t par_idx, int32_t chd_type, int void destroy_flush_dependency(int32_t par_type, int32_t par_idx, int32_t chd_type, int32_t chd_idx) { - HDassert((0 <= par_type) && (par_type < NUMBER_OF_ENTRY_TYPES)); - HDassert((0 <= par_idx) && (par_idx <= max_indices[par_type])); - HDassert((0 <= chd_type) && (chd_type < NUMBER_OF_ENTRY_TYPES)); - HDassert((0 <= chd_idx) && (chd_idx <= max_indices[chd_type])); + assert((0 <= par_type) && (par_type < NUMBER_OF_ENTRY_TYPES)); + assert((0 <= par_idx) && (par_idx <= max_indices[par_type])); + assert((0 <= chd_type) && (chd_type < NUMBER_OF_ENTRY_TYPES)); + assert((0 <= chd_idx) && (chd_idx <= max_indices[chd_type])); if (pass) { test_entry_t *par_base_addr; /* Base entry of parent's entry array */ @@ -4783,20 +4772,20 @@ destroy_flush_dependency(int32_t par_type, int32_t par_idx, int32_t chd_type, in par_entry_ptr = &(par_base_addr[par_idx]); /* Sanity check parent entry */ - HDassert(par_entry_ptr->is_pinned); - HDassert(par_entry_ptr->pinned_from_cache); - HDassert(par_entry_ptr->flush_dep_nchd > 0); - HDassert(par_entry_ptr == par_entry_ptr->self); + assert(par_entry_ptr->is_pinned); + assert(par_entry_ptr->pinned_from_cache); + assert(par_entry_ptr->flush_dep_nchd > 0); + assert(par_entry_ptr == par_entry_ptr->self); /* Get parent entry */ chd_base_addr = entries[chd_type]; chd_entry_ptr = &(chd_base_addr[chd_idx]); /* Sanity check child entry */ - HDassert(chd_entry_ptr->index == chd_idx); - HDassert(chd_entry_ptr->type == chd_type); - HDassert(chd_entry_ptr->flush_dep_npar > 0); - HDassert(chd_entry_ptr == chd_entry_ptr->self); + assert(chd_entry_ptr->index == chd_idx); + assert(chd_entry_ptr->type == chd_type); + assert(chd_entry_ptr->flush_dep_npar > 0); + assert(chd_entry_ptr == chd_entry_ptr->self); if (H5C_destroy_flush_dependency(par_entry_ptr, chd_entry_ptr) < 0) { pass = FALSE; @@ -4808,7 +4797,7 @@ destroy_flush_dependency(int32_t par_type, int32_t par_idx, int32_t chd_type, in if (chd_entry_ptr->flush_dep_par_type[i] == par_type && chd_entry_ptr->flush_dep_par_idx[i] == par_idx) break; - HDassert(i < chd_entry_ptr->flush_dep_npar); + assert(i < chd_entry_ptr->flush_dep_npar); if (i < chd_entry_ptr->flush_dep_npar - 1) HDmemmove(&chd_entry_ptr->flush_dep_par_type[i], &chd_entry_ptr->flush_dep_par_type[i + 1], (chd_entry_ptr->flush_dep_npar - i - 1) * sizeof(chd_entry_ptr->flush_dep_par_type[0])); @@ -4822,7 +4811,7 @@ destroy_flush_dependency(int32_t par_type, int32_t par_idx, int32_t chd_type, in par_entry_ptr->is_pinned = par_entry_ptr->pinned_from_client; } /* end if */ if (chd_entry_ptr->is_dirty || chd_entry_ptr->flush_dep_ndirty_chd > 0) { - HDassert(par_entry_ptr->flush_dep_ndirty_chd > 0); + assert(par_entry_ptr->flush_dep_ndirty_chd > 0); par_entry_ptr->flush_dep_ndirty_chd--; if (!par_entry_ptr->is_dirty && par_entry_ptr->flush_dep_ndirty_chd == 0) mark_flush_dep_clean(par_entry_ptr); @@ -4849,7 +4838,7 @@ static void mark_flush_dep_dirty(test_entry_t *entry_ptr) { /* Sanity checks */ - HDassert(entry_ptr); + assert(entry_ptr); /* Iterate over the parent entries */ if (entry_ptr->flush_dep_npar) { @@ -4863,7 +4852,7 @@ mark_flush_dep_dirty(test_entry_t *entry_ptr) par_entry_ptr = &(par_base_addr[entry_ptr->flush_dep_par_idx[u]]); /* Sanity check */ - HDassert(par_entry_ptr->flush_dep_ndirty_chd < par_entry_ptr->flush_dep_nchd); + assert(par_entry_ptr->flush_dep_ndirty_chd < par_entry_ptr->flush_dep_nchd); /* Adjust the parent's number of dirty children */ par_entry_ptr->flush_dep_ndirty_chd++; @@ -4890,8 +4879,8 @@ static void mark_flush_dep_clean(test_entry_t *entry_ptr) { /* Sanity checks */ - HDassert(entry_ptr); - HDassert(!entry_ptr->is_dirty && entry_ptr->flush_dep_ndirty_chd == 0); + assert(entry_ptr); + assert(!entry_ptr->is_dirty && entry_ptr->flush_dep_ndirty_chd == 0); /* Iterate over the parent entries */ if (entry_ptr->flush_dep_npar) { @@ -4905,7 +4894,7 @@ mark_flush_dep_clean(test_entry_t *entry_ptr) par_entry_ptr = &(par_base_addr[entry_ptr->flush_dep_par_idx[u]]); /* Sanity check */ - HDassert(par_entry_ptr->flush_dep_ndirty_chd > 0); + assert(par_entry_ptr->flush_dep_ndirty_chd > 0); /* Adjust the parent's number of dirty children */ par_entry_ptr->flush_dep_ndirty_chd--; @@ -5032,8 +5021,8 @@ check_and_validate_cache_hit_rate(hid_t file_id, double *hit_rate_ptr, hbool_t d /* dump data to stdout if requested */ if ((pass) && (dump_data)) { - HDfprintf(stdout, "cache_hits: %ld, cache_accesses: %ld, hit_rate: %lf\n", (long)cache_hits, - (long)cache_accesses, hit_rate); + fprintf(stdout, "cache_hits: %ld, cache_accesses: %ld, hit_rate: %lf\n", (long)cache_hits, + (long)cache_accesses, hit_rate); } if ((pass) && (cache_accesses > min_accesses) && (hit_rate < min_hit_rate)) { @@ -5159,8 +5148,8 @@ check_and_validate_cache_size(hid_t file_id, size_t *max_size_ptr, size_t *min_c /* dump data to stdout if requested */ if ((pass) && (dump_data)) { - HDfprintf(stdout, "max_sz: %ld, min_clean_sz: %ld, cur_sz: %ld, cur_ent: %ld\n", (long)max_size, - (long)min_clean_size, (long)cur_size, (long)cur_num_entries); + fprintf(stdout, "max_sz: %ld, min_clean_sz: %ld, cur_sz: %ld, cur_ent: %ld\n", (long)max_size, + (long)min_clean_size, (long)cur_size, (long)cur_num_entries); } } /* check_and_validate_cache_size() */ @@ -5351,27 +5340,27 @@ dump_LRU(H5F_t * file_ptr) H5C_cache_entry_t * entry_ptr = NULL; H5C_t *cache_ptr = file_ptr->shared->cache; - HDassert(cache_ptr); - HDassert(cache_ptr->magic == H5C__H5C_T_MAGIC); + assert(cache_ptr); + assert(cache_ptr->magic == H5C__H5C_T_MAGIC); entry_ptr = cache_ptr->LRU_head_ptr; - HDfprintf(stdout, + fprintf(stdout, "\n\nIndex len/size/clean size/dirty size = %u/%lld/%lld/%lld\n", cache_ptr->index_len, (long long)(cache_ptr->index_size), (long long)(cache_ptr->clean_index_size), (long long)(cache_ptr->dirty_index_size)); - HDfprintf(stdout, "\nLRU len/size = %d/%lld.\n\n", + fprintf(stdout, "\nLRU len/size = %d/%lld.\n\n", cache_ptr->LRU_list_len, (long long)(cache_ptr->LRU_list_size)); if ( entry_ptr != NULL ) { - HDfprintf(stdout, "%s%s%s", hdr_0, hdr_1, hdr_2); + fprintf(stdout, "%s%s%s", hdr_0, hdr_1, hdr_2); } while ( entry_ptr != NULL ) { - HDfprintf(stdout, + fprintf(stdout, " %3d %d %10lld 0x%010llx %s(%d)\n", i, (int)(entry_ptr->is_dirty), @@ -5385,7 +5374,7 @@ dump_LRU(H5F_t * file_ptr) if ( cache_ptr->LRU_list_len > 0 ) { - HDfprintf(stdout, "%s\n", hdr_2); + fprintf(stdout, "%s\n", hdr_2); } return; diff --git a/test/cache_common.h b/test/cache_common.h index bdeeded..c8c3d16 100644 --- a/test/cache_common.h +++ b/test/cache_common.h @@ -448,7 +448,7 @@ typedef struct test_entry_t { if (entry_ptr != ((cache_ptr)->index)[k]) { \ if ((entry_ptr)->ht_next) \ (entry_ptr)->ht_next->ht_prev = (entry_ptr)->ht_prev; \ - HDassert((entry_ptr)->ht_prev != NULL); \ + assert((entry_ptr)->ht_prev != NULL); \ (entry_ptr)->ht_prev->ht_next = (entry_ptr)->ht_next; \ ((cache_ptr)->index)[k]->ht_prev = (entry_ptr); \ (entry_ptr)->ht_next = ((cache_ptr)->index)[k]; \ diff --git a/test/cache_image.c b/test/cache_image.c index 8c996d5..1ab5008 100644 --- a/test/cache_image.c +++ b/test/cache_image.c @@ -110,11 +110,11 @@ create_datasets(hid_t file_id, int min_dset, int max_dset) hsize_t chunk_size[2]; if (show_progress) - HDfprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++); + fprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++); - HDassert(0 <= min_dset); - HDassert(min_dset <= max_dset); - HDassert(max_dset < MAX_NUM_DSETS); + assert(0 <= min_dset); + assert(min_dset <= max_dset); + assert(max_dset < MAX_NUM_DSETS); /* create the datasets */ @@ -191,7 +191,7 @@ create_datasets(hid_t file_id, int min_dset, int max_dset) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++); + fprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++); /* create the mem space to be used to read and write chunks */ if (pass) { @@ -208,7 +208,7 @@ create_datasets(hid_t file_id, int min_dset, int max_dset) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++); + fprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++); /* select in memory hyperslab */ if (pass) { @@ -227,7 +227,7 @@ create_datasets(hid_t file_id, int min_dset, int max_dset) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++); + fprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++); /* initialize all datasets on a round robin basis */ i = 0; @@ -274,7 +274,7 @@ create_datasets(hid_t file_id, int min_dset, int max_dset) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++); + fprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++); /* read data from datasets and validate it */ i = 0; @@ -323,11 +323,11 @@ create_datasets(hid_t file_id, int min_dset, int max_dset) if (verbose) { - HDfprintf(stdout, "data_chunk[%0d][%0d] = %0d, expect %0d.\n", k, l, - data_chunk[k][l], - ((DSET_SIZE * DSET_SIZE * m) + (DSET_SIZE * (i + k)) + j + l)); - HDfprintf(stdout, "m = %d, i = %d, j = %d, k = %d, l = %d\n", m, i, j, k, - l); + fprintf(stdout, "data_chunk[%0d][%0d] = %0d, expect %0d.\n", k, l, + data_chunk[k][l], + ((DSET_SIZE * DSET_SIZE * m) + (DSET_SIZE * (i + k)) + j + l)); + fprintf(stdout, "m = %d, i = %d, j = %d, k = %d, l = %d\n", m, i, j, k, + l); } } } @@ -340,7 +340,7 @@ create_datasets(hid_t file_id, int min_dset, int max_dset) if (verbose) { - HDfprintf(stdout, "Chunk (%0d, %0d) in /dset%03d is invalid.\n", i, j, m); + fprintf(stdout, "Chunk (%0d, %0d) in /dset%03d is invalid.\n", i, j, m); } } } @@ -352,7 +352,7 @@ create_datasets(hid_t file_id, int min_dset, int max_dset) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++); + fprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++); /* close the file spaces */ i = min_dset; @@ -421,20 +421,20 @@ delete_datasets(hid_t file_id, int min_dset, int max_dset) int i; if (show_progress) - HDfprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++); + fprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++); - HDassert(0 <= min_dset); - HDassert(min_dset <= max_dset); - HDassert(max_dset < MAX_NUM_DSETS); + assert(0 <= min_dset); + assert(min_dset <= max_dset); + assert(max_dset < MAX_NUM_DSETS); if (show_progress) - HDfprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++); + fprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++); /* first, verify the contents of the target dataset(s) */ verify_datasets(file_id, min_dset, max_dset); if (show_progress) - HDfprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++); + fprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++); /* now delete the target datasets */ if (pass) { @@ -455,7 +455,7 @@ delete_datasets(hid_t file_id, int min_dset, int max_dset) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++); + fprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++); } /* delete_datasets() */ @@ -536,12 +536,12 @@ open_hdf5_file(hbool_t create_file, hbool_t mdci_sbem_expected, hbool_t read_onl } else if (verbose) { - HDfprintf(stdout, "%s: HDF file name = \"%s\".\n", fcn_name, hdf_file_name); + fprintf(stdout, "%s: HDF file name = \"%s\".\n", fcn_name, hdf_file_name); } } if (show_progress) - HDfprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++); + fprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++); /* create a file access property list. */ if (pass) { @@ -556,7 +556,7 @@ open_hdf5_file(hbool_t create_file, hbool_t mdci_sbem_expected, hbool_t read_onl } if (show_progress) - HDfprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++); + fprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++); /* call H5Pset_libver_bounds() on the fapl_id */ if (pass) { @@ -569,7 +569,7 @@ open_hdf5_file(hbool_t create_file, hbool_t mdci_sbem_expected, hbool_t read_onl } if (show_progress) - HDfprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++); + fprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++); /* get metadata cache image config -- verify that it is the default */ if (pass) { @@ -593,7 +593,7 @@ open_hdf5_file(hbool_t create_file, hbool_t mdci_sbem_expected, hbool_t read_onl } if (show_progress) - HDfprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++); + fprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++); /* set metadata cache image fapl entry if indicated */ if ((pass) && (set_mdci_fapl)) { @@ -613,7 +613,7 @@ open_hdf5_file(hbool_t create_file, hbool_t mdci_sbem_expected, hbool_t read_onl } if (show_progress) - HDfprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++); + fprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++); /* setup the persistent free space manager if indicated */ if ((pass) && (config_fsm)) { @@ -635,7 +635,7 @@ open_hdf5_file(hbool_t create_file, hbool_t mdci_sbem_expected, hbool_t read_onl } if (show_progress) - HDfprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++); + fprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++); /* set evict on close if indicated */ if ((pass) && (set_eoc)) { @@ -648,7 +648,7 @@ open_hdf5_file(hbool_t create_file, hbool_t mdci_sbem_expected, hbool_t read_onl } if (show_progress) - HDfprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++); + fprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++); /* open the file */ if (pass) { @@ -691,14 +691,14 @@ open_hdf5_file(hbool_t create_file, hbool_t mdci_sbem_expected, hbool_t read_onl failure_mssg = "Can't get file_ptr."; if (verbose) { - HDfprintf(stdout, "%s: Can't get file_ptr.\n", fcn_name); + fprintf(stdout, "%s: Can't get file_ptr.\n", fcn_name); } } } } if (show_progress) - HDfprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++); + fprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++); /* get a pointer to the files internal data structure and then * to the cache structure @@ -717,7 +717,7 @@ open_hdf5_file(hbool_t create_file, hbool_t mdci_sbem_expected, hbool_t read_onl } if (show_progress) - HDfprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++); + fprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++); /* verify expected metadata cache status */ @@ -736,7 +736,7 @@ open_hdf5_file(hbool_t create_file, hbool_t mdci_sbem_expected, hbool_t read_onl } if (show_progress) - HDfprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++); + fprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++); if (pass) { @@ -779,7 +779,7 @@ open_hdf5_file(hbool_t create_file, hbool_t mdci_sbem_expected, hbool_t read_onl } if (show_progress) - HDfprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++); + fprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++); if ((pass) && (set_mdci_fapl)) { @@ -793,7 +793,7 @@ open_hdf5_file(hbool_t create_file, hbool_t mdci_sbem_expected, hbool_t read_onl } if (show_progress) - HDfprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++); + fprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++); if (pass) { @@ -833,7 +833,7 @@ open_hdf5_file(hbool_t create_file, hbool_t mdci_sbem_expected, hbool_t read_onl } if (show_progress) - HDfprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++); + fprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++); if (pass) { @@ -843,7 +843,7 @@ open_hdf5_file(hbool_t create_file, hbool_t mdci_sbem_expected, hbool_t read_onl } if (show_progress) - HDfprintf(stdout, "%s: cp = %d -- exiting.\n", fcn_name, cp++); + fprintf(stdout, "%s: cp = %d -- exiting.\n", fcn_name, cp++); } /* open_hdf5_file() */ @@ -891,7 +891,7 @@ attempt_swmr_open_hdf5_file(const hbool_t create_file, const hbool_t set_mdci_fa } if (show_progress) - HDfprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++); + fprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++); /* call H5Pset_libver_bounds() on the fapl_id */ if (pass) { @@ -904,7 +904,7 @@ attempt_swmr_open_hdf5_file(const hbool_t create_file, const hbool_t set_mdci_fa } if (show_progress) - HDfprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++); + fprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++); /* set metadata cache image fapl entry if indicated */ if ((pass) && (set_mdci_fapl)) { @@ -924,7 +924,7 @@ attempt_swmr_open_hdf5_file(const hbool_t create_file, const hbool_t set_mdci_fa } if (show_progress) - HDfprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++); + fprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++); /* open the file */ if (pass) { @@ -954,7 +954,7 @@ attempt_swmr_open_hdf5_file(const hbool_t create_file, const hbool_t set_mdci_fa } if (show_progress) - HDfprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++); + fprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++); } /* attempt_swmr_open_hdf5_file() */ @@ -1002,11 +1002,11 @@ verify_datasets(hid_t file_id, int min_dset, int max_dset) hsize_t offset[2]; if (show_progress) - HDfprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++); + fprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++); - HDassert(0 <= min_dset); - HDassert(min_dset <= max_dset); - HDassert(max_dset < MAX_NUM_DSETS); + assert(0 <= min_dset); + assert(min_dset <= max_dset); + assert(max_dset < MAX_NUM_DSETS); /* open the datasets */ @@ -1045,7 +1045,7 @@ verify_datasets(hid_t file_id, int min_dset, int max_dset) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++); + fprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++); /* create the mem space to be used to read and write chunks */ if (pass) { @@ -1062,7 +1062,7 @@ verify_datasets(hid_t file_id, int min_dset, int max_dset) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++); + fprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++); /* select in memory hyperslab */ if (pass) { @@ -1081,7 +1081,7 @@ verify_datasets(hid_t file_id, int min_dset, int max_dset) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++); + fprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++); /* read data from datasets and validate it */ i = 0; @@ -1130,11 +1130,11 @@ verify_datasets(hid_t file_id, int min_dset, int max_dset) if (verbose) { - HDfprintf(stdout, "data_chunk[%0d][%0d] = %0d, expect %0d.\n", k, l, - data_chunk[k][l], - ((DSET_SIZE * DSET_SIZE * m) + (DSET_SIZE * (i + k)) + j + l)); - HDfprintf(stdout, "m = %d, i = %d, j = %d, k = %d, l = %d\n", m, i, j, k, - l); + fprintf(stdout, "data_chunk[%0d][%0d] = %0d, expect %0d.\n", k, l, + data_chunk[k][l], + ((DSET_SIZE * DSET_SIZE * m) + (DSET_SIZE * (i + k)) + j + l)); + fprintf(stdout, "m = %d, i = %d, j = %d, k = %d, l = %d\n", m, i, j, k, + l); } } } @@ -1147,7 +1147,7 @@ verify_datasets(hid_t file_id, int min_dset, int max_dset) if (verbose) { - HDfprintf(stdout, "Chunk (%0d, %0d) in /dset%03d is invalid.\n", i, j, m); + fprintf(stdout, "Chunk (%0d, %0d) in /dset%03d is invalid.\n", i, j, m); } } } @@ -1159,7 +1159,7 @@ verify_datasets(hid_t file_id, int min_dset, int max_dset) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++); + fprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++); /* close the file spaces */ i = min_dset; @@ -1289,7 +1289,7 @@ check_cache_image_ctl_flow_1(hbool_t single_file_vfd) pass = TRUE; if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* setup the file name */ if (pass) { @@ -1302,7 +1302,7 @@ check_cache_image_ctl_flow_1(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 1) Create a HDF5 file with the cache image FAPL entry. * @@ -1328,7 +1328,7 @@ check_cache_image_ctl_flow_1(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 2) Create some datasets in the file. */ @@ -1338,7 +1338,7 @@ check_cache_image_ctl_flow_1(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 3) Close the file. */ @@ -1352,7 +1352,7 @@ check_cache_image_ctl_flow_1(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 4) Open the file. * @@ -1378,7 +1378,7 @@ check_cache_image_ctl_flow_1(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 5) Open and close a dataset. * @@ -1399,7 +1399,7 @@ check_cache_image_ctl_flow_1(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 6) Close the file. */ @@ -1413,7 +1413,7 @@ check_cache_image_ctl_flow_1(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 7) Open the file. * @@ -1437,7 +1437,7 @@ check_cache_image_ctl_flow_1(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 8) Close the file. */ @@ -1451,7 +1451,7 @@ check_cache_image_ctl_flow_1(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 9) Delete the file */ @@ -1472,7 +1472,7 @@ check_cache_image_ctl_flow_1(hbool_t single_file_vfd) } if (!pass) - HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg); + fprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg); return !pass; @@ -1566,7 +1566,7 @@ check_cache_image_ctl_flow_2(hbool_t single_file_vfd) pass = TRUE; if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* setup the file name */ if (pass) { @@ -1579,7 +1579,7 @@ check_cache_image_ctl_flow_2(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 1) Create a HDF5 file with the cache image FAPL entry. * @@ -1605,7 +1605,7 @@ check_cache_image_ctl_flow_2(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 2) Close the file. */ @@ -1619,7 +1619,7 @@ check_cache_image_ctl_flow_2(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 3) Open the file. * @@ -1645,7 +1645,7 @@ check_cache_image_ctl_flow_2(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 4) Close the file. */ @@ -1659,7 +1659,7 @@ check_cache_image_ctl_flow_2(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 5) Open the file. * @@ -1683,7 +1683,7 @@ check_cache_image_ctl_flow_2(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 6) Close the file. */ @@ -1697,7 +1697,7 @@ check_cache_image_ctl_flow_2(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 7) Delete the file */ @@ -1718,7 +1718,7 @@ check_cache_image_ctl_flow_2(hbool_t single_file_vfd) } if (!pass) - HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg); + fprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg); return !pass; @@ -1830,7 +1830,7 @@ check_cache_image_ctl_flow_3(hbool_t single_file_vfd) pass = TRUE; if (show_progress) /* 0 */ - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* setup the file name */ if (pass) { @@ -1843,7 +1843,7 @@ check_cache_image_ctl_flow_3(hbool_t single_file_vfd) } if (show_progress) /* 1 */ - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 1) Create a HDF5 file WITHOUT the cache image FAPL entry. * @@ -1867,7 +1867,7 @@ check_cache_image_ctl_flow_3(hbool_t single_file_vfd) } if (show_progress) /* 2 */ - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 2) Close the file. */ @@ -1881,7 +1881,7 @@ check_cache_image_ctl_flow_3(hbool_t single_file_vfd) } if (show_progress) /* 3 */ - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 3) Open the file WITH the cache image FAPL entry. * @@ -1907,7 +1907,7 @@ check_cache_image_ctl_flow_3(hbool_t single_file_vfd) } if (show_progress) /* 4 */ - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 4) Create some datasets. */ @@ -1917,7 +1917,7 @@ check_cache_image_ctl_flow_3(hbool_t single_file_vfd) } if (show_progress) /* 5 */ - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 5) Close the file. */ @@ -1931,7 +1931,7 @@ check_cache_image_ctl_flow_3(hbool_t single_file_vfd) } if (show_progress) /* 6 */ - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 6) Open the file READ ONLY. * @@ -1958,7 +1958,7 @@ check_cache_image_ctl_flow_3(hbool_t single_file_vfd) } if (show_progress) /* 7 */ - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 7) Verify the contents of the datasets. */ @@ -1968,7 +1968,7 @@ check_cache_image_ctl_flow_3(hbool_t single_file_vfd) } if (show_progress) /* 8 */ - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 8) Close the file. */ @@ -1982,7 +1982,7 @@ check_cache_image_ctl_flow_3(hbool_t single_file_vfd) } if (show_progress) /* 9 */ - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 9) Open the file READ/WRITE. * @@ -2009,7 +2009,7 @@ check_cache_image_ctl_flow_3(hbool_t single_file_vfd) } if (show_progress) /* 10 */ - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 10) Verify the contents of the datasets. */ @@ -2019,7 +2019,7 @@ check_cache_image_ctl_flow_3(hbool_t single_file_vfd) } if (show_progress) /* 11 */ - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 11) Close the file. */ @@ -2033,7 +2033,7 @@ check_cache_image_ctl_flow_3(hbool_t single_file_vfd) } if (show_progress) /* 12 */ - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 12) Open the file * @@ -2057,7 +2057,7 @@ check_cache_image_ctl_flow_3(hbool_t single_file_vfd) } if (show_progress) /* 13 */ - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 13) Close the file. */ @@ -2071,7 +2071,7 @@ check_cache_image_ctl_flow_3(hbool_t single_file_vfd) } if (show_progress) /* 14 */ - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 14) Delete the file. */ @@ -2092,7 +2092,7 @@ check_cache_image_ctl_flow_3(hbool_t single_file_vfd) } if (!pass) - HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg); + fprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg); return !pass; @@ -2196,7 +2196,7 @@ check_cache_image_ctl_flow_4(hbool_t single_file_vfd) pass = TRUE; if (show_progress) /* 0 */ - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* setup the file name */ if (pass) { @@ -2209,7 +2209,7 @@ check_cache_image_ctl_flow_4(hbool_t single_file_vfd) } if (show_progress) /* 1 */ - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 1) Create a HDF5 file WITHOUT the cache image FAPL entry. * @@ -2233,7 +2233,7 @@ check_cache_image_ctl_flow_4(hbool_t single_file_vfd) } if (show_progress) /* 2 */ - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 2) Close the file. */ @@ -2247,7 +2247,7 @@ check_cache_image_ctl_flow_4(hbool_t single_file_vfd) } if (show_progress) /* 3 */ - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 3) Open the file WITH the cache image FAPL entry. * @@ -2273,7 +2273,7 @@ check_cache_image_ctl_flow_4(hbool_t single_file_vfd) } if (show_progress) /* 4 */ - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 4) Close the file. */ @@ -2287,7 +2287,7 @@ check_cache_image_ctl_flow_4(hbool_t single_file_vfd) } if (show_progress) /* 5 */ - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 5) Open the file READ ONLY. * @@ -2314,7 +2314,7 @@ check_cache_image_ctl_flow_4(hbool_t single_file_vfd) } if (show_progress) /* 6 */ - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 6) Close the file. */ @@ -2328,7 +2328,7 @@ check_cache_image_ctl_flow_4(hbool_t single_file_vfd) } if (show_progress) /* 7 */ - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 7) Open the file READ/WRITE. * @@ -2355,7 +2355,7 @@ check_cache_image_ctl_flow_4(hbool_t single_file_vfd) } if (show_progress) /* 8 */ - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 8) Close the file. */ @@ -2369,7 +2369,7 @@ check_cache_image_ctl_flow_4(hbool_t single_file_vfd) } if (show_progress) /* 9 */ - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 9) Open the file * @@ -2393,7 +2393,7 @@ check_cache_image_ctl_flow_4(hbool_t single_file_vfd) } if (show_progress) /* 10 */ - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 10) Close the file. */ @@ -2407,7 +2407,7 @@ check_cache_image_ctl_flow_4(hbool_t single_file_vfd) } if (show_progress) /* 11 */ - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 11) Delete the file. */ @@ -2428,7 +2428,7 @@ check_cache_image_ctl_flow_4(hbool_t single_file_vfd) } if (!pass) - HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg); + fprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg); return !pass; @@ -2525,7 +2525,7 @@ check_cache_image_ctl_flow_5(hbool_t single_file_vfd) pass = TRUE; if (show_progress) /* 0 */ - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* setup the file name */ if (pass) { @@ -2538,7 +2538,7 @@ check_cache_image_ctl_flow_5(hbool_t single_file_vfd) } if (show_progress) /* 1 */ - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 1) Create a HDF5 file with the cache image FAPL entry. * @@ -2564,7 +2564,7 @@ check_cache_image_ctl_flow_5(hbool_t single_file_vfd) } if (show_progress) /* 2 */ - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 2) Create some datasets. */ @@ -2574,7 +2574,7 @@ check_cache_image_ctl_flow_5(hbool_t single_file_vfd) } if (show_progress) /* 3 */ - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 3) Close the file. */ @@ -2588,7 +2588,7 @@ check_cache_image_ctl_flow_5(hbool_t single_file_vfd) } if (show_progress) /* 4 */ - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 4) Open the file WITH the cache image FAPL entry. * @@ -2621,7 +2621,7 @@ check_cache_image_ctl_flow_5(hbool_t single_file_vfd) } if (show_progress) /* 5 */ - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 5) Verify the contents of the datasets. */ @@ -2631,7 +2631,7 @@ check_cache_image_ctl_flow_5(hbool_t single_file_vfd) } if (show_progress) /* 6 */ - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 6) Close the file. */ @@ -2645,7 +2645,7 @@ check_cache_image_ctl_flow_5(hbool_t single_file_vfd) } if (show_progress) /* 7 */ - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 7) Open the file. * @@ -2672,7 +2672,7 @@ check_cache_image_ctl_flow_5(hbool_t single_file_vfd) } if (show_progress) /* 8 */ - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 8) Verify the contents of the datasets. */ @@ -2682,7 +2682,7 @@ check_cache_image_ctl_flow_5(hbool_t single_file_vfd) } if (show_progress) /* 9 */ - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 9) Close the file. */ @@ -2696,7 +2696,7 @@ check_cache_image_ctl_flow_5(hbool_t single_file_vfd) } if (show_progress) /* 10 */ - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 10) Delete the file. */ @@ -2717,7 +2717,7 @@ check_cache_image_ctl_flow_5(hbool_t single_file_vfd) } if (!pass) - HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg); + fprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg); return !pass; @@ -2806,7 +2806,7 @@ check_cache_image_ctl_flow_6(hbool_t single_file_vfd) pass = TRUE; if (show_progress) /* 0 */ - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* setup the file name */ if (pass) { @@ -2819,7 +2819,7 @@ check_cache_image_ctl_flow_6(hbool_t single_file_vfd) } if (show_progress) /* 1 */ - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 1) Create a HDF5 file with the cache image FAPL entry. * @@ -2845,7 +2845,7 @@ check_cache_image_ctl_flow_6(hbool_t single_file_vfd) } if (show_progress) /* 2 */ - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 2) Close the file. */ @@ -2859,7 +2859,7 @@ check_cache_image_ctl_flow_6(hbool_t single_file_vfd) } if (show_progress) /* 3 */ - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 4) Open the file WITH the cache image FAPL entry. * @@ -2892,7 +2892,7 @@ check_cache_image_ctl_flow_6(hbool_t single_file_vfd) } if (show_progress) /* 4 */ - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 5) Close the file. */ @@ -2906,7 +2906,7 @@ check_cache_image_ctl_flow_6(hbool_t single_file_vfd) } if (show_progress) /* 5 */ - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 5) Open the file. * @@ -2933,7 +2933,7 @@ check_cache_image_ctl_flow_6(hbool_t single_file_vfd) } if (show_progress) /* 6 */ - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 6) Close the file. */ @@ -2947,7 +2947,7 @@ check_cache_image_ctl_flow_6(hbool_t single_file_vfd) } if (show_progress) /* 7 */ - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 7) Delete the file. */ @@ -2968,7 +2968,7 @@ check_cache_image_ctl_flow_6(hbool_t single_file_vfd) } if (!pass) - HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg); + fprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg); return !pass; @@ -3092,7 +3092,7 @@ cache_image_smoke_check_1(hbool_t single_file_vfd) pass = TRUE; if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* setup the file name */ if (pass) { @@ -3105,7 +3105,7 @@ cache_image_smoke_check_1(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 1) Create a HDF5 file with the cache image FAPL entry. * @@ -3130,7 +3130,7 @@ cache_image_smoke_check_1(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 2) Create some datasets in the file. */ @@ -3151,7 +3151,7 @@ cache_image_smoke_check_1(hbool_t single_file_vfd) #endif /* H5C_COLLECT_CACHE_STATS */ if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 3) Close the file. */ @@ -3165,7 +3165,7 @@ cache_image_smoke_check_1(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 4) Open the file. * @@ -3191,7 +3191,7 @@ cache_image_smoke_check_1(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 5) Open and close a dataset. * @@ -3216,7 +3216,7 @@ cache_image_smoke_check_1(hbool_t single_file_vfd) #endif /* H5C_COLLECT_CACHE_STATS */ if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 6) Close the file. */ @@ -3230,7 +3230,7 @@ cache_image_smoke_check_1(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 7) Open the file. * @@ -3254,7 +3254,7 @@ cache_image_smoke_check_1(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 8) Open and close a dataset. * @@ -3279,7 +3279,7 @@ cache_image_smoke_check_1(hbool_t single_file_vfd) #endif /* H5C_COLLECT_CACHE_STATS */ if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 9) Close the file. */ @@ -3293,7 +3293,7 @@ cache_image_smoke_check_1(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 10) Open the file with the cache image FAPL entry. * @@ -3317,7 +3317,7 @@ cache_image_smoke_check_1(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 11) Close the file. Since there has been no access to * any entries that would be included in the cache image, @@ -3334,7 +3334,7 @@ cache_image_smoke_check_1(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 12) Open the file. * @@ -3358,7 +3358,7 @@ cache_image_smoke_check_1(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 13) Open a dataset. * @@ -3382,7 +3382,7 @@ cache_image_smoke_check_1(hbool_t single_file_vfd) #endif /* H5C_COLLECT_CACHE_STATS */ if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 14) Close the file. */ @@ -3396,7 +3396,7 @@ cache_image_smoke_check_1(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 15) Delete the file */ @@ -3417,7 +3417,7 @@ cache_image_smoke_check_1(hbool_t single_file_vfd) } if (!pass) - HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg); + fprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg); return !pass; @@ -3503,7 +3503,7 @@ cache_image_smoke_check_2(hbool_t single_file_vfd) pass = TRUE; if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* setup the file name */ if (pass) { @@ -3516,7 +3516,7 @@ cache_image_smoke_check_2(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 1) Create a HDF5 file with the cache image FAPL entry. * @@ -3541,7 +3541,7 @@ cache_image_smoke_check_2(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 2) Create some datasets in the file. */ @@ -3562,7 +3562,7 @@ cache_image_smoke_check_2(hbool_t single_file_vfd) #endif /* H5C_COLLECT_CACHE_STATS */ if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 3) Close the file. */ @@ -3576,7 +3576,7 @@ cache_image_smoke_check_2(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 4) Open the file. * @@ -3606,7 +3606,7 @@ cache_image_smoke_check_2(hbool_t single_file_vfd) */ if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 5) Close the file. */ @@ -3620,7 +3620,7 @@ cache_image_smoke_check_2(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 6) Open the file. * @@ -3644,7 +3644,7 @@ cache_image_smoke_check_2(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 7) Open and close a dataset. * @@ -3658,7 +3658,7 @@ cache_image_smoke_check_2(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 8) Close the file. */ @@ -3672,7 +3672,7 @@ cache_image_smoke_check_2(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 9) Delete the file */ @@ -3693,7 +3693,7 @@ cache_image_smoke_check_2(hbool_t single_file_vfd) } if (!pass) - HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg); + fprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg); return !pass; @@ -3801,7 +3801,7 @@ cache_image_smoke_check_3(hbool_t single_file_vfd) pass = TRUE; if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* setup the file name */ if (pass) { @@ -3814,7 +3814,7 @@ cache_image_smoke_check_3(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 1) Create a HDF5 file with the cache image FAPL entry. * @@ -3839,7 +3839,7 @@ cache_image_smoke_check_3(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 2) Create some datasets in the file. */ @@ -3860,7 +3860,7 @@ cache_image_smoke_check_3(hbool_t single_file_vfd) #endif /* H5C_COLLECT_CACHE_STATS */ if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 3) Close the file. */ @@ -3874,7 +3874,7 @@ cache_image_smoke_check_3(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 4) Open the file read only. * @@ -3898,7 +3898,7 @@ cache_image_smoke_check_3(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 5) Open and close a dataset. * @@ -3923,7 +3923,7 @@ cache_image_smoke_check_3(hbool_t single_file_vfd) #endif /* H5C_COLLECT_CACHE_STATS */ if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 6) Close the file. */ @@ -3937,7 +3937,7 @@ cache_image_smoke_check_3(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 7) Open the file. * @@ -3961,7 +3961,7 @@ cache_image_smoke_check_3(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 8) Open and close a dataset. * @@ -3986,7 +3986,7 @@ cache_image_smoke_check_3(hbool_t single_file_vfd) #endif /* H5C_COLLECT_CACHE_STATS */ if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 9) Close the file. */ @@ -4021,7 +4021,7 @@ cache_image_smoke_check_3(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 11) Open and close a dataset. * @@ -4046,7 +4046,7 @@ cache_image_smoke_check_3(hbool_t single_file_vfd) #endif /* H5C_COLLECT_CACHE_STATS */ if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 12) Close the file. */ @@ -4060,7 +4060,7 @@ cache_image_smoke_check_3(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 13) Delete the file */ @@ -4081,7 +4081,7 @@ cache_image_smoke_check_3(hbool_t single_file_vfd) } if (!pass) - HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg); + fprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg); return !pass; @@ -4180,7 +4180,7 @@ cache_image_smoke_check_4(hbool_t single_file_vfd) pass = TRUE; if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* setup the file name */ if (pass) { @@ -4193,7 +4193,7 @@ cache_image_smoke_check_4(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 1) Create a HDF5 file with the cache image FAPL entry. * @@ -4218,7 +4218,7 @@ cache_image_smoke_check_4(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 2) Create a dataset in the file. */ @@ -4239,7 +4239,7 @@ cache_image_smoke_check_4(hbool_t single_file_vfd) #endif /* H5C_COLLECT_CACHE_STATS */ if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 3) Close the file. */ @@ -4253,7 +4253,7 @@ cache_image_smoke_check_4(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); while ((pass) && (max_dset < MAX_NUM_DSETS)) { @@ -4279,7 +4279,7 @@ cache_image_smoke_check_4(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s:L1 cp = %d, max_dset = %d, pass = %d.\n", fcn_name, cp, max_dset, pass); + fprintf(stdout, "%s:L1 cp = %d, max_dset = %d, pass = %d.\n", fcn_name, cp, max_dset, pass); /* 5) Create a dataset in the file. */ @@ -4300,7 +4300,7 @@ cache_image_smoke_check_4(hbool_t single_file_vfd) #endif /* H5C_COLLECT_CACHE_STATS */ if (show_progress) - HDfprintf(stdout, "%s:L2 cp = %d, max_dset = %d, pass = %d.\n", fcn_name, cp + 1, max_dset, pass); + fprintf(stdout, "%s:L2 cp = %d, max_dset = %d, pass = %d.\n", fcn_name, cp + 1, max_dset, pass); /* 6) Close the file. */ @@ -4314,7 +4314,7 @@ cache_image_smoke_check_4(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s:L3 cp = %d, max_dset = %d, pass = %d.\n", fcn_name, cp + 2, max_dset, pass); + fprintf(stdout, "%s:L3 cp = %d, max_dset = %d, pass = %d.\n", fcn_name, cp + 2, max_dset, pass); } /* end while */ cp += 3; @@ -4340,7 +4340,7 @@ cache_image_smoke_check_4(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 8) Open and close all datasets. * @@ -4365,7 +4365,7 @@ cache_image_smoke_check_4(hbool_t single_file_vfd) #endif /* H5C_COLLECT_CACHE_STATS */ if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 9) Close the file. */ @@ -4400,7 +4400,7 @@ cache_image_smoke_check_4(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 11) Open and close all datasets. * @@ -4425,7 +4425,7 @@ cache_image_smoke_check_4(hbool_t single_file_vfd) #endif /* H5C_COLLECT_CACHE_STATS */ if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 12) Close the file. */ @@ -4439,7 +4439,7 @@ cache_image_smoke_check_4(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 13) Delete the file */ @@ -4460,7 +4460,7 @@ cache_image_smoke_check_4(hbool_t single_file_vfd) } if (!pass) - HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg); + fprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg); return !pass; } /* cache_image_smoke_check_4() */ @@ -4576,7 +4576,7 @@ cache_image_smoke_check_5(hbool_t single_file_vfd) pass = TRUE; if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* setup the file name */ if (pass) { @@ -4593,7 +4593,7 @@ cache_image_smoke_check_5(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 1) Create a HDF5 file with the cache image FAPL entry. * @@ -4618,7 +4618,7 @@ cache_image_smoke_check_5(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 2) Create a process specific group. */ if (pass) { @@ -4635,7 +4635,7 @@ cache_image_smoke_check_5(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 3) Construct a "zoo" in the above group, and validate it. */ if (pass) @@ -4653,7 +4653,7 @@ cache_image_smoke_check_5(hbool_t single_file_vfd) #endif /* H5C_COLLECT_CACHE_STATS */ if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 4) Close the file. */ @@ -4676,7 +4676,7 @@ cache_image_smoke_check_5(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); while ((pass) && (max_group < MAX_NUM_GROUPS)) { @@ -4702,7 +4702,7 @@ cache_image_smoke_check_5(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s:L1 cp = %d, max_group = %d, pass = %d.\n", fcn_name, cp, max_group, pass); + fprintf(stdout, "%s:L1 cp = %d, max_group = %d, pass = %d.\n", fcn_name, cp, max_group, pass); /* 6) Validate the "zoo" created in the previous file open. */ if (pass) @@ -4720,8 +4720,7 @@ cache_image_smoke_check_5(hbool_t single_file_vfd) #endif /* H5C_COLLECT_CACHE_STATS */ if (show_progress) - HDfprintf(stdout, "%s:L2 cp = %d, max_group = %d, pass = %d.\n", fcn_name, cp + 1, max_group, - pass); + fprintf(stdout, "%s:L2 cp = %d, max_group = %d, pass = %d.\n", fcn_name, cp + 1, max_group, pass); /* 7) Create a process specific group for this file open */ if (pass) { @@ -4739,16 +4738,14 @@ cache_image_smoke_check_5(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s:L3 cp = %d, max_group = %d, pass = %d.\n", fcn_name, cp + 2, max_group, - pass); + fprintf(stdout, "%s:L3 cp = %d, max_group = %d, pass = %d.\n", fcn_name, cp + 2, max_group, pass); /* 8) Construct a "zoo" in the above group, and validate it. */ if (pass) create_zoo(file_id, process_group_name, max_group); if (show_progress) - HDfprintf(stdout, "%s:L4 cp = %d, max_group = %d, pass = %d.\n", fcn_name, cp + 3, max_group, - pass); + fprintf(stdout, "%s:L4 cp = %d, max_group = %d, pass = %d.\n", fcn_name, cp + 3, max_group, pass); /* 9) Close the file. */ @@ -4771,8 +4768,7 @@ cache_image_smoke_check_5(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s:L5 cp = %d, max_group = %d, pass = %d.\n", fcn_name, cp + 4, max_group, - pass); + fprintf(stdout, "%s:L5 cp = %d, max_group = %d, pass = %d.\n", fcn_name, cp + 4, max_group, pass); } /* end while */ cp += 5; @@ -4796,7 +4792,7 @@ cache_image_smoke_check_5(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 11) Validate all the zoos. */ i = min_group; @@ -4815,7 +4811,7 @@ cache_image_smoke_check_5(hbool_t single_file_vfd) #endif /* H5C_COLLECT_CACHE_STATS */ if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 12) Close the file. */ if (pass) { @@ -4847,7 +4843,7 @@ cache_image_smoke_check_5(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 14) Validate all the zoos. */ i = min_group; @@ -4869,7 +4865,7 @@ cache_image_smoke_check_5(hbool_t single_file_vfd) #endif /* H5C_COLLECT_CACHE_STATS */ if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 15) Close the file. */ @@ -4904,7 +4900,7 @@ cache_image_smoke_check_5(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 17) Validate all the zoos. * @@ -4929,7 +4925,7 @@ cache_image_smoke_check_5(hbool_t single_file_vfd) #endif /* H5C_COLLECT_CACHE_STATS */ if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 18) Close the file. */ @@ -4943,7 +4939,7 @@ cache_image_smoke_check_5(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 19) Delete the file */ @@ -4964,7 +4960,7 @@ cache_image_smoke_check_5(hbool_t single_file_vfd) } if (!pass) - HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg); + fprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg); return !pass; @@ -5076,7 +5072,7 @@ cache_image_smoke_check_6(hbool_t single_file_vfd) pass = TRUE; if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* setup the file name */ if (pass) { @@ -5089,7 +5085,7 @@ cache_image_smoke_check_6(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 1) Create a HDF5 file with the cache image FAPL entry. * @@ -5114,7 +5110,7 @@ cache_image_smoke_check_6(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 2) Create a dataset in the file. */ @@ -5135,7 +5131,7 @@ cache_image_smoke_check_6(hbool_t single_file_vfd) #endif /* H5C_COLLECT_CACHE_STATS */ if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 3) Close the file. */ @@ -5149,7 +5145,7 @@ cache_image_smoke_check_6(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); while ((pass) && (max_dset < MAX_NUM_DSETS)) { @@ -5175,7 +5171,7 @@ cache_image_smoke_check_6(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s:L1 cp = %d, max_dset = %d, pass = %d.\n", fcn_name, cp, max_dset, pass); + fprintf(stdout, "%s:L1 cp = %d, max_dset = %d, pass = %d.\n", fcn_name, cp, max_dset, pass); /* 5) Create a dataset in the file. */ @@ -5196,7 +5192,7 @@ cache_image_smoke_check_6(hbool_t single_file_vfd) #endif /* H5C_COLLECT_CACHE_STATS */ if (show_progress) - HDfprintf(stdout, "%s:L2 cp = %d, max_dset = %d, pass = %d.\n", fcn_name, cp + 1, max_dset, pass); + fprintf(stdout, "%s:L2 cp = %d, max_dset = %d, pass = %d.\n", fcn_name, cp + 1, max_dset, pass); /* 6) Verify and delete the old dataset. */ if (pass) { @@ -5205,7 +5201,7 @@ cache_image_smoke_check_6(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s:L3 cp = %d, max_dset = %d, pass = %d.\n", fcn_name, cp + 2, max_dset, pass); + fprintf(stdout, "%s:L3 cp = %d, max_dset = %d, pass = %d.\n", fcn_name, cp + 2, max_dset, pass); /* 7) Close the file. */ @@ -5219,7 +5215,7 @@ cache_image_smoke_check_6(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s:L4 cp = %d, max_dset = %d, pass = %d.\n", fcn_name, cp + 3, max_dset, pass); + fprintf(stdout, "%s:L4 cp = %d, max_dset = %d, pass = %d.\n", fcn_name, cp + 3, max_dset, pass); } /* end while */ cp += 4; @@ -5245,7 +5241,7 @@ cache_image_smoke_check_6(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 9) Verify the last dataset created. */ @@ -5266,7 +5262,7 @@ cache_image_smoke_check_6(hbool_t single_file_vfd) #endif /* H5C_COLLECT_CACHE_STATS */ if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 10) Close the file. */ @@ -5301,7 +5297,7 @@ cache_image_smoke_check_6(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 12) Verify and delete the last dataset. * @@ -5336,7 +5332,7 @@ cache_image_smoke_check_6(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 14) Get the size of the file. Verify that it is less * than 20 KB. Without deletions and persistent free @@ -5361,7 +5357,7 @@ cache_image_smoke_check_6(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 15) Delete the file */ if (pass) { @@ -5381,7 +5377,7 @@ cache_image_smoke_check_6(hbool_t single_file_vfd) } if (!pass) - HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg); + fprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg); return !pass; @@ -5468,7 +5464,7 @@ cache_image_api_error_check_1(hbool_t single_file_vfd) pass = TRUE; if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* setup the file name */ if (pass) { @@ -5481,7 +5477,7 @@ cache_image_api_error_check_1(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 1) Create a HDF5 file. */ @@ -5501,7 +5497,7 @@ cache_image_api_error_check_1(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 2) Create some datasets in the file. */ @@ -5522,7 +5518,7 @@ cache_image_api_error_check_1(hbool_t single_file_vfd) #endif /* H5C_COLLECT_CACHE_STATS */ if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 3) Close the file. */ @@ -5536,7 +5532,7 @@ cache_image_api_error_check_1(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 4) Open the file read only with a cache image FAPL entry requested. */ @@ -5556,7 +5552,7 @@ cache_image_api_error_check_1(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 5) Open and close a dataset. * @@ -5582,7 +5578,7 @@ cache_image_api_error_check_1(hbool_t single_file_vfd) #endif /* H5C_COLLECT_CACHE_STATS */ if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 6) Close the file. */ @@ -5596,7 +5592,7 @@ cache_image_api_error_check_1(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 7) Open the file read only. */ @@ -5616,7 +5612,7 @@ cache_image_api_error_check_1(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 8) Open and close a dataset. * @@ -5642,7 +5638,7 @@ cache_image_api_error_check_1(hbool_t single_file_vfd) #endif /* H5C_COLLECT_CACHE_STATS */ if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 9) Close the file. */ @@ -5656,7 +5652,7 @@ cache_image_api_error_check_1(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 10) Open the file read / write. */ @@ -5676,7 +5672,7 @@ cache_image_api_error_check_1(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 11) Open and close a dataset. * @@ -5702,7 +5698,7 @@ cache_image_api_error_check_1(hbool_t single_file_vfd) #endif /* H5C_COLLECT_CACHE_STATS */ if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 12) Close the file. */ @@ -5716,7 +5712,7 @@ cache_image_api_error_check_1(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 13) Delete the file */ @@ -5737,7 +5733,7 @@ cache_image_api_error_check_1(hbool_t single_file_vfd) } if (!pass) - HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg); + fprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg); return !pass; @@ -5836,7 +5832,7 @@ cache_image_api_error_check_2(hbool_t single_file_vfd) pass = TRUE; if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* setup the file name */ if (pass) { @@ -5849,7 +5845,7 @@ cache_image_api_error_check_2(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 1) Create a HDF5 file with a cache image requested. */ @@ -5869,7 +5865,7 @@ cache_image_api_error_check_2(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 2) Create some datasets in the file. */ @@ -5890,7 +5886,7 @@ cache_image_api_error_check_2(hbool_t single_file_vfd) #endif /* H5C_COLLECT_CACHE_STATS */ if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 3) Close the file. */ @@ -5904,7 +5900,7 @@ cache_image_api_error_check_2(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 4) Open the file read only with a cache image FAPL entry requested. */ @@ -5924,7 +5920,7 @@ cache_image_api_error_check_2(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 5) Open and close a dataset. * @@ -5950,7 +5946,7 @@ cache_image_api_error_check_2(hbool_t single_file_vfd) #endif /* H5C_COLLECT_CACHE_STATS */ if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 6) Close the file. */ @@ -5964,7 +5960,7 @@ cache_image_api_error_check_2(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 7) Open the file read only. */ @@ -5984,7 +5980,7 @@ cache_image_api_error_check_2(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 8) Open and close a dataset. * @@ -6010,7 +6006,7 @@ cache_image_api_error_check_2(hbool_t single_file_vfd) #endif /* H5C_COLLECT_CACHE_STATS */ if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 9) Close the file. */ @@ -6024,7 +6020,7 @@ cache_image_api_error_check_2(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 10) Open the file read / write. */ @@ -6044,7 +6040,7 @@ cache_image_api_error_check_2(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 11) Open and close a dataset. * @@ -6070,7 +6066,7 @@ cache_image_api_error_check_2(hbool_t single_file_vfd) #endif /* H5C_COLLECT_CACHE_STATS */ if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 12) Close the file. */ @@ -6084,7 +6080,7 @@ cache_image_api_error_check_2(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 13) Open the file read / write. */ @@ -6104,7 +6100,7 @@ cache_image_api_error_check_2(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 14) Open and close a dataset. * @@ -6130,7 +6126,7 @@ cache_image_api_error_check_2(hbool_t single_file_vfd) #endif /* H5C_COLLECT_CACHE_STATS */ if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 15) Close the file. */ @@ -6144,7 +6140,7 @@ cache_image_api_error_check_2(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 13) Delete the file */ @@ -6165,7 +6161,7 @@ cache_image_api_error_check_2(hbool_t single_file_vfd) } if (!pass) - HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg); + fprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg); return !pass; @@ -6237,7 +6233,7 @@ cache_image_api_error_check_3(hbool_t single_file_vfd) pass = TRUE; if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* setup the file name */ if (pass) { @@ -6250,7 +6246,7 @@ cache_image_api_error_check_3(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 1) Create a HDF5 file with a cache image requested. */ @@ -6270,7 +6266,7 @@ cache_image_api_error_check_3(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 2) Try to start SWMR write -- should fail. */ @@ -6288,7 +6284,7 @@ cache_image_api_error_check_3(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 3) Discard the file if necessary */ @@ -6308,7 +6304,7 @@ cache_image_api_error_check_3(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 4) Attempt to create a HDF5 file with SWMR write * access and cache image requested -- should fail. @@ -6319,7 +6315,7 @@ cache_image_api_error_check_3(hbool_t single_file_vfd) /* hdf_file_name */ filename); if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 5) Discard the file if necessary */ @@ -6332,7 +6328,7 @@ cache_image_api_error_check_3(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 6) Create a HDF5 file with a cache image requested. */ @@ -6352,7 +6348,7 @@ cache_image_api_error_check_3(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 7) Create some datasets in the file. */ @@ -6373,7 +6369,7 @@ cache_image_api_error_check_3(hbool_t single_file_vfd) #endif /* H5C_COLLECT_CACHE_STATS */ if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 8) Close the file. */ @@ -6387,7 +6383,7 @@ cache_image_api_error_check_3(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 9) Attempt to open the file with SWMR write access -- should fail. */ @@ -6396,7 +6392,7 @@ cache_image_api_error_check_3(hbool_t single_file_vfd) /* hdf_file_name */ filename); if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 10) Discard the file if necessary. */ @@ -6410,7 +6406,7 @@ cache_image_api_error_check_3(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); if (pass) { PASSED(); @@ -6420,7 +6416,7 @@ cache_image_api_error_check_3(hbool_t single_file_vfd) } if (!pass) - HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg); + fprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg); return !pass; @@ -6520,7 +6516,7 @@ cache_image_api_error_check_4(hbool_t single_file_vfd) pass = TRUE; if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* setup the file name */ if (pass) { @@ -6533,7 +6529,7 @@ cache_image_api_error_check_4(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 1) Create a FAPL requesting a cache image, but WITHOUT * specifying the latest file format. @@ -6550,7 +6546,7 @@ cache_image_api_error_check_4(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); if (pass) { @@ -6568,7 +6564,7 @@ cache_image_api_error_check_4(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 2) Create a HDF5 file using the above FAPL. */ @@ -6594,7 +6590,7 @@ cache_image_api_error_check_4(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* get a pointer to the files internal data structure and then * to the cache structure @@ -6613,7 +6609,7 @@ cache_image_api_error_check_4(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 3) Create some datasets in the file. */ @@ -6625,7 +6621,7 @@ cache_image_api_error_check_4(hbool_t single_file_vfd) #if H5C_COLLECT_CACHE_STATS if (pass) { - HDassert(cache_ptr); + assert(cache_ptr); if (cache_ptr->images_loaded != 0) { @@ -6636,7 +6632,7 @@ cache_image_api_error_check_4(hbool_t single_file_vfd) #endif /* H5C_COLLECT_CACHE_STATS */ if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 4) Close the file. */ @@ -6650,7 +6646,7 @@ cache_image_api_error_check_4(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 5) Open the file read only. */ @@ -6670,7 +6666,7 @@ cache_image_api_error_check_4(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 6) Verify that the datasets exist and contain the * expected data @@ -6693,7 +6689,7 @@ cache_image_api_error_check_4(hbool_t single_file_vfd) #endif /* H5C_COLLECT_CACHE_STATS */ if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 7) Close the file. */ @@ -6707,7 +6703,7 @@ cache_image_api_error_check_4(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 8) Open the file R/W using the FAPL defined in 1) above. * @@ -6736,7 +6732,7 @@ cache_image_api_error_check_4(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* get a pointer to the files internal data structure and then * to the cache structure @@ -6755,7 +6751,7 @@ cache_image_api_error_check_4(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); if (pass) { @@ -6767,7 +6763,7 @@ cache_image_api_error_check_4(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 9) Close the file. */ @@ -6781,7 +6777,7 @@ cache_image_api_error_check_4(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 10) Open the file R/W using the FAPL defined in 1) above. * Verify that the file does not contain a cache image. @@ -6809,7 +6805,7 @@ cache_image_api_error_check_4(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* get a pointer to the files internal data structure and then * to the cache structure @@ -6828,7 +6824,7 @@ cache_image_api_error_check_4(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); if (pass) { @@ -6840,7 +6836,7 @@ cache_image_api_error_check_4(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 11) Verify that the data sets contain the expected data * @@ -6864,7 +6860,7 @@ cache_image_api_error_check_4(hbool_t single_file_vfd) #endif /* H5C_COLLECT_CACHE_STATS */ if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 12) Create several more data sets. */ @@ -6874,7 +6870,7 @@ cache_image_api_error_check_4(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 13) Close the file. */ @@ -6888,7 +6884,7 @@ cache_image_api_error_check_4(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 14) Open the file read write. * @@ -6911,7 +6907,7 @@ cache_image_api_error_check_4(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 15) Verify the data sets exist and contain the expected data. * @@ -6935,7 +6931,7 @@ cache_image_api_error_check_4(hbool_t single_file_vfd) #endif /* H5C_COLLECT_CACHE_STATS */ if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 16) Close the file. */ @@ -6949,7 +6945,7 @@ cache_image_api_error_check_4(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 17) Delete the file */ @@ -6963,7 +6959,7 @@ cache_image_api_error_check_4(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* tidy up */ if (fapl_id != -1) @@ -6977,7 +6973,7 @@ cache_image_api_error_check_4(hbool_t single_file_vfd) } if (!pass) - HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg); + fprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg); return !pass; @@ -7091,7 +7087,7 @@ get_free_sections_test(hbool_t single_file_vfd) pass = TRUE; if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* setup the file name */ if (pass) { @@ -7104,7 +7100,7 @@ get_free_sections_test(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 1) Create a HDF5 file with a cache image requested * and persistent free space managers enabled. @@ -7126,7 +7122,7 @@ get_free_sections_test(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 2) Create some data sets, and then delete some of * of those near the beginning of the file. @@ -7138,7 +7134,7 @@ get_free_sections_test(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); if (pass) { @@ -7146,7 +7142,7 @@ get_free_sections_test(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); if (pass) { @@ -7154,7 +7150,7 @@ get_free_sections_test(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 3) Close the file. */ @@ -7168,7 +7164,7 @@ get_free_sections_test(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 4) Open the file read only. */ @@ -7188,7 +7184,7 @@ get_free_sections_test(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 5) Verify that a cache image exists, and has not been loaded. */ @@ -7202,7 +7198,7 @@ get_free_sections_test(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 6) Verify that one or more self referential FSMs * have been stored at the end of the file just @@ -7224,7 +7220,7 @@ get_free_sections_test(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 7) Call H5Fget_free_sections(). */ @@ -7238,7 +7234,7 @@ get_free_sections_test(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 8) Verify that the cache image has been loaded and * that the self referential FSMs have been floated. @@ -7253,7 +7249,7 @@ get_free_sections_test(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 9) Verify that the remaining data sets contain the expected data. */ @@ -7263,7 +7259,7 @@ get_free_sections_test(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 10) Close the file. */ @@ -7277,7 +7273,7 @@ get_free_sections_test(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 11) Open the file R/W. */ @@ -7297,7 +7293,7 @@ get_free_sections_test(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 12) Verify that a cache image exists, and has not been loaded. */ @@ -7311,7 +7307,7 @@ get_free_sections_test(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 13) Verify that one or more self referential FSMs * have been stored at the end of the file just @@ -7329,7 +7325,7 @@ get_free_sections_test(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 14) Call H5Fget_free_sections(). */ @@ -7343,7 +7339,7 @@ get_free_sections_test(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 15) Verify that the cache image has been loaded and * that the self referential FSMs have been floated. @@ -7358,7 +7354,7 @@ get_free_sections_test(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 16) Verify that the remaining data sets contain the expected data. */ @@ -7368,7 +7364,7 @@ get_free_sections_test(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 17) Delete the remaining data sets. */ @@ -7378,7 +7374,7 @@ get_free_sections_test(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 18) Close the file. */ @@ -7392,7 +7388,7 @@ get_free_sections_test(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 19) Verify that file space has been reclaimed. */ @@ -7411,7 +7407,7 @@ get_free_sections_test(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 20) Discard the file. */ @@ -7425,7 +7421,7 @@ get_free_sections_test(hbool_t single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); if (pass) { PASSED(); @@ -7435,7 +7431,7 @@ get_free_sections_test(hbool_t single_file_vfd) } if (!pass) - HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg); + fprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg); return !pass; @@ -7540,7 +7536,7 @@ evict_on_close_test(hbool_t H5_ATTR_PARALLEL_UNUSED single_file_vfd) pass = TRUE; if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* setup the file name */ if (pass) { @@ -7553,7 +7549,7 @@ evict_on_close_test(hbool_t H5_ATTR_PARALLEL_UNUSED single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 1) Create a HDF5 file without a cache image requested * and persistent free space managers enabled. @@ -7574,7 +7570,7 @@ evict_on_close_test(hbool_t H5_ATTR_PARALLEL_UNUSED single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 2) Create some data sets and verify them. */ @@ -7584,7 +7580,7 @@ evict_on_close_test(hbool_t H5_ATTR_PARALLEL_UNUSED single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); if (pass) { @@ -7592,7 +7588,7 @@ evict_on_close_test(hbool_t H5_ATTR_PARALLEL_UNUSED single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 3) Close the file. */ @@ -7606,7 +7602,7 @@ evict_on_close_test(hbool_t H5_ATTR_PARALLEL_UNUSED single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 4) Open the file R/W, and with cache image requested. */ @@ -7626,7 +7622,7 @@ evict_on_close_test(hbool_t H5_ATTR_PARALLEL_UNUSED single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 5) Verify the datasets created in 2) above. This will * force their (clean) metadata into the metadata cache, @@ -7639,7 +7635,7 @@ evict_on_close_test(hbool_t H5_ATTR_PARALLEL_UNUSED single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 6) Create some more datasets and verify them */ @@ -7649,7 +7645,7 @@ evict_on_close_test(hbool_t H5_ATTR_PARALLEL_UNUSED single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); if (pass) { @@ -7658,15 +7654,15 @@ evict_on_close_test(hbool_t H5_ATTR_PARALLEL_UNUSED single_file_vfd) if (verbose) { - HDassert(cache_ptr); - HDassert(cache_ptr->magic == H5C__H5C_T_MAGIC); + assert(cache_ptr); + assert(cache_ptr->magic == H5C__H5C_T_MAGIC); - HDfprintf(stdout, "index size / index dirty size = %lld / %lld\n", (long long)(cache_ptr->index_size), - (long long)(cache_ptr->dirty_index_size)); + fprintf(stdout, "index size / index dirty size = %lld / %lld\n", (long long)(cache_ptr->index_size), + (long long)(cache_ptr->dirty_index_size)); } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 7) Close the file. */ @@ -7680,7 +7676,7 @@ evict_on_close_test(hbool_t H5_ATTR_PARALLEL_UNUSED single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 8) Open the file R/O and with evict on close enabled. */ @@ -7700,7 +7696,7 @@ evict_on_close_test(hbool_t H5_ATTR_PARALLEL_UNUSED single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s*: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s*: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 9) Verify all datasets twice */ @@ -7710,7 +7706,7 @@ evict_on_close_test(hbool_t H5_ATTR_PARALLEL_UNUSED single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); if (pass) { @@ -7718,7 +7714,7 @@ evict_on_close_test(hbool_t H5_ATTR_PARALLEL_UNUSED single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 10) Close the file. */ @@ -7732,7 +7728,7 @@ evict_on_close_test(hbool_t H5_ATTR_PARALLEL_UNUSED single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 11) Open the file R/w and with evict on close enabled. */ @@ -7752,7 +7748,7 @@ evict_on_close_test(hbool_t H5_ATTR_PARALLEL_UNUSED single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s*: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s*: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 12) Verify all datasets twice */ @@ -7762,7 +7758,7 @@ evict_on_close_test(hbool_t H5_ATTR_PARALLEL_UNUSED single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); if (pass) { @@ -7770,7 +7766,7 @@ evict_on_close_test(hbool_t H5_ATTR_PARALLEL_UNUSED single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 13) Close the file. */ @@ -7784,7 +7780,7 @@ evict_on_close_test(hbool_t H5_ATTR_PARALLEL_UNUSED single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); /* 14) Discard the file. */ @@ -7798,7 +7794,7 @@ evict_on_close_test(hbool_t H5_ATTR_PARALLEL_UNUSED single_file_vfd) } if (show_progress) - HDfprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); + fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); if (pass) { PASSED(); @@ -7808,7 +7804,7 @@ evict_on_close_test(hbool_t H5_ATTR_PARALLEL_UNUSED single_file_vfd) } if (!pass) - HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg); + fprintf(stdout, "%s: failure_mssg = \"%s\".\n", __func__, failure_mssg); return !pass; #endif /* H5_HAVE_PARALLEL */ @@ -7846,10 +7842,10 @@ main(void) express_test = GetTestExpress(); - HDprintf("=========================================\n"); - HDprintf("Cache image tests\n"); - HDprintf(" express_test = %d\n", express_test); - HDprintf("=========================================\n"); + printf("=========================================\n"); + printf("Cache image tests\n"); + printf(" express_test = %d\n", express_test); + printf("=========================================\n"); /* Check for VFD which stores data in multiple files */ single_file_vfd = !h5_driver_uses_multiple_files(env_h5_drvr, H5_EXCLUDE_NON_MULTIPART_DRIVERS); diff --git a/test/cache_logging.c b/test/cache_logging.c index 7092110..d8aa424 100644 --- a/test/cache_logging.c +++ b/test/cache_logging.c @@ -77,7 +77,7 @@ test_logging_api(void) TEST_ERROR; /* Check to make sure that the property list getter works */ - if (NULL == (location = (char *)HDcalloc(size, sizeof(char)))) + if (NULL == (location = (char *)calloc(size, sizeof(char)))) TEST_ERROR; if (H5Pget_mdc_log_options(fapl, &is_enabled_out, location, &size, &start_on_access_out) < 0) TEST_ERROR; @@ -109,7 +109,7 @@ test_logging_api(void) /* Perform some manipulations */ for (i = 0; i < N_GROUPS; i++) { - HDmemset(group_name, 0, sizeof(group_name)); + memset(group_name, 0, sizeof(group_name)); HDsnprintf(group_name, sizeof(group_name), "%d", i); if ((gid = H5Gcreate2(fid, group_name, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR; @@ -127,7 +127,7 @@ test_logging_api(void) TEST_ERROR; /* Clean up */ - HDfree(location); + free(location); if (H5Fclose(fid) < 0) TEST_ERROR; @@ -165,16 +165,16 @@ main(void) /* Reset library */ h5_reset(); - HDprintf("Testing basic metadata cache logging functionality.\n"); + printf("Testing basic metadata cache logging functionality.\n"); nerrors += test_logging_api(); if (nerrors) { - HDprintf("***** %d Metadata cache logging TEST%s FAILED! *****\n", nerrors, nerrors > 1 ? "S" : ""); - HDexit(EXIT_FAILURE); + printf("***** %d Metadata cache logging TEST%s FAILED! *****\n", nerrors, nerrors > 1 ? "S" : ""); + exit(EXIT_FAILURE); } - HDprintf("All Metadata Cache Logging tests passed.\n"); + printf("All Metadata Cache Logging tests passed.\n"); - HDexit(EXIT_SUCCESS); + exit(EXIT_SUCCESS); } diff --git a/test/cache_tagging.c b/test/cache_tagging.c index 71260a8..af6ff58 100644 --- a/test/cache_tagging.c +++ b/test/cache_tagging.c @@ -1810,7 +1810,7 @@ check_attribute_rename_tags(hid_t fcpl, int type) TEST_ERROR; /* Allocate array */ - if ((NULL == (data = (int *)HDcalloc(DIMS * DIMS, sizeof(int))))) + if ((NULL == (data = (int *)calloc(DIMS * DIMS, sizeof(int))))) TEST_ERROR; /* Create Fapl */ @@ -1967,14 +1967,14 @@ check_attribute_rename_tags(hid_t fcpl, int type) /* Finished Test. Print status and return. */ /* ========================================== */ - HDfree(data); + free(data); PASSED(); return 0; error: if (data) - HDfree(data); + free(data); return 1; } /* check_attribute_rename_tags */ @@ -2023,7 +2023,7 @@ check_attribute_delete_tags(hid_t fcpl, int type) TEST_ERROR; /* Allocate array */ - if ((NULL == (data = (int *)HDcalloc(DIMS * DIMS, sizeof(int))))) + if ((NULL == (data = (int *)calloc(DIMS * DIMS, sizeof(int))))) TEST_ERROR; /* Create Fapl */ @@ -2159,14 +2159,14 @@ check_attribute_delete_tags(hid_t fcpl, int type) /* Finished Test. Print status and return. */ /* ========================================== */ - HDfree(data); + free(data); PASSED(); return 0; error: if (data) - HDfree(data); + free(data); return 1; } /* check_attribute_delete_tags */ @@ -2690,7 +2690,7 @@ check_dataset_write_tags(void) /* ===== */ /* Allocate array */ - if ((NULL == (data = (int *)HDcalloc(DIMS * DIMS, sizeof(int))))) + if ((NULL == (data = (int *)calloc(DIMS * DIMS, sizeof(int))))) TEST_ERROR; /* Create Fapl */ @@ -2803,14 +2803,14 @@ check_dataset_write_tags(void) /* Finished Test. Print status and return. */ /* ========================================== */ - HDfree(data); + free(data); PASSED(); return 0; error: if (data) - HDfree(data); + free(data); return 1; } /* check_dataset_write_tags */ @@ -2854,7 +2854,7 @@ check_attribute_write_tags(hid_t fcpl, int type) /* ===== */ /* Allocate array */ - if ((NULL == (data = (int *)HDcalloc(DIMS * DIMS, sizeof(int))))) + if ((NULL == (data = (int *)calloc(DIMS * DIMS, sizeof(int))))) TEST_ERROR; /* Create Fapl */ @@ -2990,14 +2990,14 @@ check_attribute_write_tags(hid_t fcpl, int type) /* Finished Test. Print status and return. */ /* ========================================== */ - HDfree(data); + free(data); PASSED(); return 0; error: if (data) - HDfree(data); + free(data); return 1; } /* check_attribute_write_tags */ @@ -3043,7 +3043,7 @@ check_dataset_read_tags(void) /* ===== */ /* Allocate array */ - if ((NULL == (data = (int *)HDcalloc(DIMS * DIMS, sizeof(int))))) + if ((NULL == (data = (int *)calloc(DIMS * DIMS, sizeof(int))))) TEST_ERROR; /* Create Fapl */ @@ -3152,14 +3152,14 @@ check_dataset_read_tags(void) /* Finished Test. Print status and return. */ /* ========================================== */ - HDfree(data); + free(data); PASSED(); return 0; error: if (data) - HDfree(data); + free(data); return 1; } /* check_dataset_read_tags */ @@ -3206,7 +3206,7 @@ check_dataset_size_retrieval(void) /* ===== */ /* Allocate array */ - if ((NULL == (data = (int *)HDcalloc(DIMS * DIMS, sizeof(int))))) + if ((NULL == (data = (int *)calloc(DIMS * DIMS, sizeof(int))))) TEST_ERROR; /* Create Fapl */ @@ -3315,14 +3315,14 @@ check_dataset_size_retrieval(void) /* Finished Test. Print status and return. */ /* ========================================== */ - HDfree(data); + free(data); PASSED(); return 0; error: if (data) - HDfree(data); + free(data); return 1; } /* check_dataset_size_retrieval */ @@ -3370,7 +3370,7 @@ check_dataset_extend_tags(void) /* ===== */ /* Allocate array */ - if ((NULL == (data = (int *)HDcalloc(DIMS * DIMS, sizeof(int))))) + if ((NULL == (data = (int *)calloc(DIMS * DIMS, sizeof(int))))) TEST_ERROR; /* Create Fapl */ @@ -3479,14 +3479,14 @@ check_dataset_extend_tags(void) /* Finished Test. Print status and return. */ /* ========================================== */ - HDfree(data); + free(data); PASSED(); return 0; error: if (data) - HDfree(data); + free(data); return 1; } /* check_dataset_extend_tags */ @@ -3817,7 +3817,7 @@ check_link_removal_tags(hid_t fcpl, int type) /* ===== */ /* Allocate array */ - if ((NULL == (data = (int *)HDcalloc(DIMS * DIMS, sizeof(int))))) + if ((NULL == (data = (int *)calloc(DIMS * DIMS, sizeof(int))))) TEST_ERROR; /* Create Fapl */ @@ -3950,14 +3950,14 @@ check_link_removal_tags(hid_t fcpl, int type) /* Finished Test. Print status and return. */ /* ========================================== */ - HDfree(data); + free(data); PASSED(); return 0; error: if (data) - HDfree(data); + free(data); return 1; } /* check_link_removal_tags */ @@ -4006,7 +4006,7 @@ check_link_getname_tags(void) /* ===== */ /* Allocate array */ - if ((NULL == (data = (int *)HDcalloc(DIMS * DIMS, sizeof(int))))) + if ((NULL == (data = (int *)calloc(DIMS * DIMS, sizeof(int))))) TEST_ERROR; /* Create Fapl */ @@ -4129,14 +4129,14 @@ check_link_getname_tags(void) /* Finished Test. Print status and return. */ /* ========================================== */ - HDfree(data); + free(data); PASSED(); return 0; error: if (data) - HDfree(data); + free(data); return 1; } /* check_link_getname_tags */ @@ -4532,7 +4532,7 @@ check_invalid_tag_application(void) PASSED(); #else SKIPPED(); - HDprintf(" test skipped because sanity checking on tag value is disabled.\n"); + printf(" test skipped because sanity checking on tag value is disabled.\n"); #endif /* H5C_DO_TAGGING_SANITY_CHECKS */ return 0; @@ -4575,7 +4575,7 @@ main(void) /* Only run with sec2/default driver */ if (!h5_using_default_driver(NULL)) { HDputs(" -- SKIPPED for incompatible VFD --"); - HDexit(EXIT_SUCCESS); + exit(EXIT_SUCCESS); } /* ========== */ @@ -4601,13 +4601,13 @@ main(void) if (test_type == TEST_DEFAULT) { if (!nerrs) - HDprintf("Testing standard tag application cases w/ default fcpl:\n"); + printf("Testing standard tag application cases w/ default fcpl:\n"); fcpl = fcpl_default; } else if (test_type == TEST_SHMESG) { if (!nerrs) - HDprintf("Testing standard tag application cases w/ shared messages:\n"); + printf("Testing standard tag application cases w/ shared messages:\n"); fcpl = fcpl_shmesg_all; } else { @@ -4638,7 +4638,7 @@ main(void) } /* end for */ if (!nerrs) - HDprintf("Testing other specific tag application cases:\n"); + printf("Testing other specific tag application cases:\n"); if (!nerrs) nerrs += check_group_creation_tags(); if (!nerrs) diff --git a/test/chunk_info.c b/test/chunk_info.c index 77d2b8a..a2eab94 100644 --- a/test/chunk_info.c +++ b/test/chunk_info.c @@ -323,7 +323,7 @@ verify_selected_chunks(hid_t dset, hid_t plist, const hsize_t *start, const hsiz hsize_t ii, jj; /* Array indices */ int n; - HDmemset(&read_buf, 0, sizeof(read_buf)); + memset(&read_buf, 0, sizeof(read_buf)); /* Initialize the array of chunk data for all NUM_CHUNKS chunks, this is the same as the written data and will be used to verify the read data */ @@ -345,10 +345,10 @@ verify_selected_chunks(hid_t dset, hid_t plist, const hsize_t *start, const hsiz TEST_ERROR; /* Verify that read chunk is the same as the corresponding written one */ - if (HDmemcmp(expected_buf[chk_index], read_buf, CHUNK_NX * CHUNK_NY) != 0) { - HDfprintf(stderr, - "Read chunk differs from written chunk at offset (%" PRIuHSIZE ",%" PRIuHSIZE ")\n", - offset[0], offset[1]); + if (memcmp(expected_buf[chk_index], read_buf, CHUNK_NX * CHUNK_NY) != 0) { + fprintf(stderr, + "Read chunk differs from written chunk at offset (%" PRIuHSIZE ",%" PRIuHSIZE ")\n", + offset[0], offset[1]); return FAIL; } } @@ -555,7 +555,7 @@ test_get_chunk_info_highest_v18(hid_t fapl) #ifdef H5_HAVE_FILTER_DEFLATE /* Allocate input (compressed) buffer */ - inbuf = HDcalloc(1, z_dst_nbytes); + inbuf = calloc(1, z_dst_nbytes); /* zlib-friendly alias for the input buffer */ z_dst = (Bytef *)inbuf; @@ -568,22 +568,22 @@ test_get_chunk_info_highest_v18(hid_t fapl) /* Check for various zlib errors */ if (Z_BUF_ERROR == ret) { - HDfprintf(stderr, "overflow"); + fprintf(stderr, "overflow"); TEST_ERROR; } else if (Z_MEM_ERROR == ret) { - HDfprintf(stderr, "deflate memory error"); + fprintf(stderr, "deflate memory error"); TEST_ERROR; } else if (Z_OK != ret) { - HDfprintf(stderr, "other deflate error"); + fprintf(stderr, "other deflate error"); TEST_ERROR; } #else /* Allocate input (non-compressed) buffer */ - if (NULL == (inbuf = HDcalloc(1, CHK_SIZE))) + if (NULL == (inbuf = calloc(1, CHK_SIZE))) TEST_ERROR; - HDmemcpy(inbuf, direct_buf, CHK_SIZE); + memcpy(inbuf, direct_buf, CHK_SIZE); #endif /* end H5_HAVE_FILTER_DEFLATE */ /* Write only NUM_CHUNKS_WRITTEN chunks at the following logical coords: @@ -600,7 +600,7 @@ test_get_chunk_info_highest_v18(hid_t fapl) /* Free the input buffer */ if (inbuf) - HDfree(inbuf); + free(inbuf); if (H5Fflush(dset, H5F_SCOPE_LOCAL) < 0) TEST_ERROR; @@ -1923,7 +1923,7 @@ test_get_chunk_info_v110(hid_t fapl) H5F_libver_t low, high; /* File format bounds */ TESTING("getting chunk information in file with versions 1.10 and later"); - HDprintf("\n"); /* to list sub-tests */ + printf("\n"); /* to list sub-tests */ /* Set high bound to the current latest version */ high = H5F_LIBVER_LATEST; @@ -2099,9 +2099,9 @@ test_flt_msk_with_skip_compress(hid_t fapl) for (ii = 0; ii < CHUNK_NX; ii++) for (jj = 0; jj < CHUNK_NY; jj++) if (direct_buf[ii][jj] != check_chunk[ii][jj]) { - HDprintf(" 1. Read different values than written."); - HDprintf(" At index %d,%d\n", ii, jj); - HDprintf(" direct_buf=%d, check_chunk=%d\n", direct_buf[ii][jj], check_chunk[ii][jj]); + printf(" 1. Read different values than written."); + printf(" At index %d,%d\n", ii, jj); + printf(" direct_buf=%d, check_chunk=%d\n", direct_buf[ii][jj], check_chunk[ii][jj]); TEST_ERROR; } @@ -2112,7 +2112,7 @@ test_flt_msk_with_skip_compress(hid_t fapl) TEST_ERROR; /* Read the raw chunk back with H5Dread_chunk */ - HDmemset(&read_direct_buf, 0, sizeof(read_direct_buf)); + memset(&read_direct_buf, 0, sizeof(read_direct_buf)); if (H5Dread_chunk(dset, H5P_DEFAULT, offset, &read_flt_msk, read_direct_buf) < 0) TEST_ERROR; if (read_flt_msk != flt_msk) @@ -2122,10 +2122,10 @@ test_flt_msk_with_skip_compress(hid_t fapl) for (ii = 0; ii < CHUNK_NX; ii++) for (jj = 0; jj < CHUNK_NY; jj++) if (direct_buf[ii][jj] != read_direct_buf[ii][jj]) { - HDprintf(" 1. Read different values than written."); - HDprintf(" At index %d,%d\n", ii, jj); - HDprintf(" direct_buf=%d, read_direct_buf=%d\n", direct_buf[ii][jj], - read_direct_buf[ii][jj]); + printf(" 1. Read different values than written."); + printf(" At index %d,%d\n", ii, jj); + printf(" direct_buf=%d, read_direct_buf=%d\n", direct_buf[ii][jj], + read_direct_buf[ii][jj]); TEST_ERROR; } @@ -2221,7 +2221,7 @@ main(void) if (nerrors) goto error; - HDprintf("All chunk query tests passed.\n"); + printf("All chunk query tests passed.\n"); h5_cleanup(FILENAME, fapl); @@ -2229,7 +2229,7 @@ main(void) error: nerrors = MAX(1, nerrors); - HDprintf("***** %d QUERY CHUNK INFO TEST%s FAILED! *****\n", nerrors, 1 == nerrors ? "" : "S"); + printf("***** %d QUERY CHUNK INFO TEST%s FAILED! *****\n", nerrors, 1 == nerrors ? "" : "S"); return EXIT_FAILURE; } diff --git a/test/cmpd_dset.c b/test/cmpd_dset.c index 73d0459..9bb245f 100644 --- a/test/cmpd_dset.c +++ b/test/cmpd_dset.c @@ -182,17 +182,17 @@ test_compound(char *filename, hid_t fapl) int ret_code; /* Allocate buffers for datasets */ - if (NULL == (s1 = (s1_t *)HDmalloc(sizeof(s1_t) * NX * NY))) + if (NULL == (s1 = (s1_t *)malloc(sizeof(s1_t) * NX * NY))) goto error; - if (NULL == (s2 = (s2_t *)HDmalloc(sizeof(s2_t) * NX * NY))) + if (NULL == (s2 = (s2_t *)malloc(sizeof(s2_t) * NX * NY))) goto error; - if (NULL == (s3 = (s3_t *)HDmalloc(sizeof(s3_t) * NX * NY))) + if (NULL == (s3 = (s3_t *)malloc(sizeof(s3_t) * NX * NY))) goto error; - if (NULL == (s4 = (s4_t *)HDmalloc(sizeof(s4_t) * NX * NY))) + if (NULL == (s4 = (s4_t *)malloc(sizeof(s4_t) * NX * NY))) goto error; - if (NULL == (s5 = (s5_t *)HDmalloc(sizeof(s5_t) * NX * NY))) + if (NULL == (s5 = (s5_t *)malloc(sizeof(s5_t) * NX * NY))) goto error; - if (NULL == (s6 = (s6_t *)HDmalloc(sizeof(s6_t) * NX * NY))) + if (NULL == (s6 = (s6_t *)malloc(sizeof(s6_t) * NX * NY))) goto error; /* Create the file */ @@ -209,17 +209,17 @@ test_compound(char *filename, hid_t fapl) if ((PRESERVE = H5Pcreate(H5P_DATASET_XFER)) < 0) goto error; if ((ret_code = H5Pget_preserve(PRESERVE)) != 0) { - HDprintf("Preserve status of dataset transfer property list should be" - " 0 (FALSE), got %d\n", - ret_code); + printf("Preserve status of dataset transfer property list should be" + " 0 (FALSE), got %d\n", + ret_code); goto error; } if (H5Pset_preserve(PRESERVE, 1) < 0) goto error; if ((ret_code = H5Pget_preserve(PRESERVE)) != 1) { - HDprintf("Preserve status of dataset transfer property list should be" - " 1 (TRUE), got %d\n", - ret_code); + printf("Preserve status of dataset transfer property list should be" + " 1 (TRUE), got %d\n", + ret_code); goto error; } @@ -520,11 +520,11 @@ test_compound(char *filename, hid_t fapl) s1[i].c[1] != 8 * i + 3 || s1[i].c[2] != 8 * i + 4 || s1[i].c[3] != 8 * i + 5 || s1[i].d != 8 * i + 6 || s1[i].e != 8 * i + 7) { H5_FAILED(); - HDprintf(" i==%u, row=%u, col=%u\n", i, i / NY, i % NY); - HDprintf(" got: {%7d,%7d,[%7d,%7d,%7d,%7d],%7d,%7d}\n", s1[i].a, s1[i].b, s1[i].c[0], - s1[i].c[1], s1[i].c[2], s1[i].c[3], s1[i].d, s1[i].e); - HDprintf(" ans: {%7d,%7d,[%7d,%7d,%7d,%7d],%7d,%7d}\n", 8 * i + 0, 8 * i + 1, 8 * i + 2, - 8 * i + 3, 8 * i + 4, 8 * i + 5, 8 * i + 6, 8 * i + 7); + printf(" i==%u, row=%u, col=%u\n", i, i / NY, i % NY); + printf(" got: {%7d,%7d,[%7d,%7d,%7d,%7d],%7d,%7d}\n", s1[i].a, s1[i].b, s1[i].c[0], s1[i].c[1], + s1[i].c[2], s1[i].c[3], s1[i].d, s1[i].e); + printf(" ans: {%7d,%7d,[%7d,%7d,%7d,%7d],%7d,%7d}\n", 8 * i + 0, 8 * i + 1, 8 * i + 2, + 8 * i + 3, 8 * i + 4, 8 * i + 5, 8 * i + 6, 8 * i + 7); goto error; } } @@ -581,8 +581,8 @@ test_compound(char *filename, hid_t fapl) goto error; /* Read the dataset */ - s8 = (s1_t *)HDcalloc((size_t)(h_size[0] * h_size[1]), sizeof(s1_t)); - HDassert(s8); + s8 = (s1_t *)calloc((size_t)(h_size[0] * h_size[1]), sizeof(s1_t)); + assert(s8); if (H5Dread(dataset, s1_tid, s8_m_sid, s8_f_sid, H5P_DEFAULT, s8) < 0) { goto error; } @@ -602,7 +602,7 @@ test_compound(char *filename, hid_t fapl) } } - HDfree(s8); + free(s8); s8 = NULL; PASSED(); @@ -714,8 +714,8 @@ test_compound(char *filename, hid_t fapl) f_offset[1] = NY / 3; h_size[0] = 2 * NX / 3 - f_offset[0]; h_size[1] = 2 * NY / 3 - f_offset[1]; - s11 = (s4_t *)HDmalloc((size_t)h_size[0] * (size_t)h_size[1] * sizeof(s4_t)); - HDassert(s11); + s11 = (s4_t *)malloc((size_t)h_size[0] * (size_t)h_size[1] * sizeof(s4_t)); + assert(s11); /* Initialize */ for (i = 0; i < h_size[0] * h_size[1]; i++) { @@ -726,7 +726,7 @@ test_compound(char *filename, hid_t fapl) if (H5Dwrite(dataset, s4_tid, s8_m_sid, s8_f_sid, PRESERVE, s11) < 0) { goto error; } - HDfree(s11); + free(s11); s11 = NULL; /* Read the whole thing */ @@ -773,12 +773,12 @@ test_compound(char *filename, hid_t fapl) H5Fclose(file); /* Release buffers */ - HDfree(s1); - HDfree(s2); - HDfree(s3); - HDfree(s4); - HDfree(s5); - HDfree(s6); + free(s1); + free(s2); + free(s3); + free(s4); + free(s5); + free(s6); PASSED(); return 0; @@ -788,17 +788,17 @@ error: /* Release resources */ if (s1) - HDfree(s1); + free(s1); if (s2) - HDfree(s2); + free(s2); if (s3) - HDfree(s3); + free(s3); if (s4) - HDfree(s4); + free(s4); if (s5) - HDfree(s5); + free(s5); if (s6) - HDfree(s6); + free(s6); return 1; } @@ -1220,8 +1220,8 @@ compare_data(void *src_data, void *dst_data, hbool_t src_subset) !H5_DBL_ABS_EQUAL(s_ptr->n, d_ptr->n)) { H5_FAILED(); - HDprintf(" i=%d\n", i); - HDprintf( + printf(" i=%d\n", i); + printf( " src={a=%d, b=%d, c=[%d,%d,%d,%d,%d,%d,%d,%d], d=%d, e=%d, f=%f, g=%f, " "h=[%f,%f,%f,%f,%f,%f,%f,%f,%f,%f,%f,%f,%f,%f,%f,%f], i=%f, j=%f, k=%f, l=%f, m=%f, n=%f}\n", s_ptr->a, s_ptr->b, s_ptr->c[0], s_ptr->c[1], s_ptr->c[2], s_ptr->c[3], s_ptr->c[4], @@ -1231,7 +1231,7 @@ compare_data(void *src_data, void *dst_data, hbool_t src_subset) (double)s_ptr->h[8], (double)s_ptr->h[9], (double)s_ptr->h[10], (double)s_ptr->h[11], (double)s_ptr->h[12], (double)s_ptr->h[13], (double)s_ptr->h[14], (double)s_ptr->h[15], (double)s_ptr->i, (double)s_ptr->j, s_ptr->k, s_ptr->l, s_ptr->m, s_ptr->n); - HDprintf( + printf( " dst={a=%d, b=%d, c=[%d,%d,%d,%d,%d,%d,%d,%d], d=%d, e=%d, f=%f, g=%f, " "h=[%f,%f,%f,%f,%f,%f,%f,%f,%f,%f,%f,%f,%f,%f,%f,%f], i=%f, j=%f, k=%f, l=%f, m=%f, n=%f}\n", d_ptr->a, d_ptr->b, d_ptr->c[0], d_ptr->c[1], d_ptr->c[2], d_ptr->c[3], d_ptr->c[4], @@ -1306,12 +1306,12 @@ test_hdf5_src_subset(char *filename, hid_t fapl) goto error; /* Allocate space and initialize data */ - orig = (unsigned char *)HDmalloc(NX * NY * sizeof(stype1)); + orig = (unsigned char *)malloc(NX * NY * sizeof(stype1)); initialize_stype1(orig, (size_t)NX * NY); - rbuf = (unsigned char *)HDmalloc(NX * NY * sizeof(stype2)); + rbuf = (unsigned char *)malloc(NX * NY * sizeof(stype2)); - rew_buf = (unsigned char *)HDmalloc(NX * NY * sizeof(stype3)); + rew_buf = (unsigned char *)malloc(NX * NY * sizeof(stype3)); initialize_stype3(rew_buf, (size_t)NX * NY); /* Create dataset creation property list */ @@ -1440,17 +1440,17 @@ test_hdf5_src_subset(char *filename, hid_t fapl) if (H5Fclose(file) < 0) FAIL_STACK_ERROR; - HDfree(orig); - HDfree(rbuf); - HDfree(rew_buf); + free(orig); + free(rbuf); + free(rew_buf); PASSED(); return 0; error: - HDfree(orig); - HDfree(rbuf); - HDfree(rew_buf); + free(orig); + free(rbuf); + free(rew_buf); HDputs("*** DATASET TESTS FAILED ***"); return 1; @@ -1512,12 +1512,12 @@ test_hdf5_dst_subset(char *filename, hid_t fapl) goto error; /* Allocate space and initialize data */ - orig = (unsigned char *)HDmalloc(NX * NY * sizeof(stype2)); + orig = (unsigned char *)malloc(NX * NY * sizeof(stype2)); initialize_stype2(orig, (size_t)NX * NY); - rbuf = (unsigned char *)HDmalloc(NX * NY * sizeof(stype1)); + rbuf = (unsigned char *)malloc(NX * NY * sizeof(stype1)); - rew_buf = (unsigned char *)HDmalloc(NX * NY * sizeof(stype4)); + rew_buf = (unsigned char *)malloc(NX * NY * sizeof(stype4)); initialize_stype4(rew_buf, (size_t)NX * NY); /* Create dataset creation property list */ @@ -1646,9 +1646,9 @@ test_hdf5_dst_subset(char *filename, hid_t fapl) if (H5Fclose(file) < 0) goto error; - HDfree(orig); - HDfree(rbuf); - HDfree(rew_buf); + free(orig); + free(rbuf); + free(rew_buf); PASSED(); return 0; @@ -1665,11 +1665,11 @@ error: int _i; \ H5_FAILED(); \ AT(); \ - HDprintf(" Insertion order ="); \ + printf(" Insertion order ="); \ for (_i = 0; _i < PACK_NMEMBS; _i++) \ - HDprintf(" %d", order[_i]); \ - HDprintf("\n Inner compound order = %d, location = %d\n", sub_cmpd_order, order[sub_cmpd_order]); \ - HDfflush(stdout); \ + printf(" %d", order[_i]); \ + printf("\n Inner compound order = %d, location = %d\n", sub_cmpd_order, order[sub_cmpd_order]); \ + fflush(stdout); \ goto error; \ } @@ -2216,8 +2216,8 @@ main(int argc, char *argv[]) /* Turn off optimized compound converter? */ if (argc > 1) { if (argc > 2 || HDstrcmp("--noopt", argv[1]) != 0) { - HDfprintf(stderr, "usage: %s [--noopt]\n", argv[0]); - HDexit(EXIT_FAILURE); + fprintf(stderr, "usage: %s [--noopt]\n", argv[0]); + exit(EXIT_FAILURE); } H5Tunregister(H5T_PERS_DONTCARE, NULL, (hid_t)-1, (hid_t)-1, (H5T_conv_t)((void (*)(void))H5T__conv_struct_opt)); @@ -2249,8 +2249,8 @@ main(int argc, char *argv[]) nerrors += (h5_verify_cached_stabs(FILENAME, fapl_id) < 0 ? 1 : 0); if (nerrors) { - HDprintf("***** %u FAILURE%s! *****\n", nerrors, 1 == nerrors ? "" : "S"); - HDexit(EXIT_FAILURE); + printf("***** %u FAILURE%s! *****\n", nerrors, 1 == nerrors ? "" : "S"); + exit(EXIT_FAILURE); } h5_cleanup(FILENAME, fapl_id); diff --git a/test/cmpd_dtransform.c b/test/cmpd_dtransform.c index 6e38ec9..9487531 100644 --- a/test/cmpd_dtransform.c +++ b/test/cmpd_dtransform.c @@ -47,7 +47,7 @@ main(void) att_t *atts_res = NULL; /* Compound datatype */ - if (NULL == (atts = HDmalloc(sizeof(att_t)))) + if (NULL == (atts = malloc(sizeof(att_t)))) TEST_ERROR; HDstrcpy(atts[0].name, "Name"); HDstrcpy(atts[0].unit, "Unit"); @@ -92,13 +92,13 @@ main(void) if ((dxpl_id = H5Pcreate(H5P_DATASET_XFER)) < 0) FAIL_STACK_ERROR; if (H5Pset_data_transform(dxpl_id, expr) < 0) { - HDprintf("**** ERROR: H5Pset_data_transform (expression: %s) ****\n", expr); + printf("**** ERROR: H5Pset_data_transform (expression: %s) ****\n", expr); FAIL_STACK_ERROR; } - if (NULL == (data = HDmalloc(LENGTH * sizeof(int)))) + if (NULL == (data = malloc(LENGTH * sizeof(int)))) TEST_ERROR; - if (NULL == (data_res = HDmalloc(LENGTH * sizeof(int)))) + if (NULL == (data_res = malloc(LENGTH * sizeof(int)))) TEST_ERROR; for (unsigned i = 0; i < LENGTH; i++) { data[i] = 10; @@ -110,7 +110,7 @@ main(void) FAIL_STACK_ERROR; /* Read attribute */ - if (NULL == (atts_res = HDmalloc(sizeof(att_t)))) + if (NULL == (atts_res = malloc(sizeof(att_t)))) TEST_ERROR; if (H5Aread(att_attr_id, att_dtyp_id, atts_res) < 0) FAIL_STACK_ERROR; @@ -130,10 +130,10 @@ main(void) if (data[idx] != data_res[idx]) TEST_ERROR; - HDfree(atts); - HDfree(atts_res); - HDfree(data); - HDfree(data_res); + free(atts); + free(atts_res); + free(data); + free(data_res); /* Close all identifiers. */ if (H5Pclose(dxpl_id) < 0) @@ -170,13 +170,13 @@ error: H5E_END_TRY if (atts) - HDfree(atts); + free(atts); if (atts_res) - HDfree(atts_res); + free(atts_res); if (data) - HDfree(data); + free(data); if (data_res) - HDfree(data_res); + free(data_res); return 1; } diff --git a/test/cork.c b/test/cork.c index ad10fa2..e5138cf 100644 --- a/test/cork.c +++ b/test/cork.c @@ -141,9 +141,9 @@ verify_old_dset_cork(void) TEST_ERROR; /* Set up data array */ - if (NULL == (buf_data = (int *)HDcalloc(100 * 20, sizeof(int)))) + if (NULL == (buf_data = (int *)calloc(100 * 20, sizeof(int)))) TEST_ERROR; - if (NULL == (buf = (int **)HDcalloc(100, sizeof(buf_data)))) + if (NULL == (buf = (int **)calloc(100, sizeof(buf_data)))) TEST_ERROR; for (i = 0; i < 100; i++) buf[i] = buf_data + (i * 20); @@ -255,8 +255,8 @@ verify_old_dset_cork(void) if (H5Fclose(fid) < 0) TEST_ERROR; - HDfree(buf); - HDfree(buf_data); + free(buf); + free(buf_data); PASSED(); return 0; @@ -277,8 +277,8 @@ error: } H5E_END_TRY; - HDfree(buf); - HDfree(buf_data); + free(buf); + free(buf_data); return 1; } /* verify_old_dset_cork */ @@ -653,9 +653,9 @@ verify_dset_cork(hbool_t swmr, hbool_t new_format) TEST_ERROR; /* Set up data array */ - if (NULL == (buf_data = (int *)HDcalloc(100 * 20, sizeof(int)))) + if (NULL == (buf_data = (int *)calloc(100 * 20, sizeof(int)))) TEST_ERROR; - if (NULL == (buf = (int **)HDcalloc(100, sizeof(buf_data)))) + if (NULL == (buf = (int **)calloc(100, sizeof(buf_data)))) TEST_ERROR; for (i = 0; i < 100; i++) buf[i] = buf_data + (i * 20); @@ -719,8 +719,8 @@ verify_dset_cork(hbool_t swmr, hbool_t new_format) if (H5Fclose(fid) < 0) TEST_ERROR; - HDfree(buf); - HDfree(buf_data); + free(buf); + free(buf_data); PASSED(); return 0; @@ -740,8 +740,8 @@ error: } H5E_END_TRY; - HDfree(buf); - HDfree(buf_data); + free(buf); + free(buf_data); return 1; } /* verify_dset_cork */ @@ -2001,9 +2001,9 @@ test_dset_cork(hbool_t swmr, hbool_t new_format) TEST_ERROR; /* Set up data array */ - if (NULL == (wbuf_data = (int *)HDcalloc(DIMS0 * DIMS1, sizeof(int)))) + if (NULL == (wbuf_data = (int *)calloc(DIMS0 * DIMS1, sizeof(int)))) TEST_ERROR; - if (NULL == (wbuf = (int **)HDcalloc(DIMS0, sizeof(wbuf_data)))) + if (NULL == (wbuf = (int **)calloc(DIMS0, sizeof(wbuf_data)))) TEST_ERROR; for (i = 0; i < DIMS0; i++) wbuf[i] = wbuf_data + (i * DIMS1); @@ -2048,7 +2048,7 @@ test_dset_cork(hbool_t swmr, hbool_t new_format) TEST_ERROR; /* Set up data array */ - if (NULL == (rbuf_data = (int *)HDcalloc(DIMS0 * DIMS1, sizeof(int)))) + if (NULL == (rbuf_data = (int *)calloc(DIMS0 * DIMS1, sizeof(int)))) TEST_ERROR; /* Read from the dataset */ @@ -2195,9 +2195,9 @@ test_dset_cork(hbool_t swmr, hbool_t new_format) if (H5Pclose(dcpl) < 0) TEST_ERROR; - HDfree(wbuf); - HDfree(wbuf_data); - HDfree(rbuf_data); + free(wbuf); + free(wbuf_data); + free(rbuf_data); PASSED(); return 0; @@ -2217,9 +2217,9 @@ error: } H5E_END_TRY; - HDfree(wbuf); - HDfree(wbuf_data); - HDfree(rbuf_data); + free(wbuf); + free(wbuf_data); + free(rbuf_data); return 1; diff --git a/test/cross_read.c b/test/cross_read.c index c1073cb..05ff7ca 100644 --- a/test/cross_read.c +++ b/test/cross_read.c @@ -90,7 +90,7 @@ check_data_i(const char *dsetname, hid_t fid) for (i = 0; i < NY; i++) data_in[NX][i] = -2; /* Output */ - HDmemset(data_out, 0, (NX + 1) * NY * sizeof(long long)); + memset(data_out, 0, (NX + 1) * NY * sizeof(long long)); /* Read data from hyperslab in the file into the hyperslab in * memory and display. @@ -104,8 +104,8 @@ check_data_i(const char *dsetname, hid_t fid) if (data_out[i][j] != data_in[i][j]) if (!nerrors++) { H5_FAILED(); - HDprintf("element [%d][%d] is %lld but should have been %lld\n", (int)i, (int)j, - data_out[i][j], data_in[i][j]); + printf("element [%d][%d] is %lld but should have been %lld\n", (int)i, (int)j, + data_out[i][j], data_in[i][j]); } /* end if */ /* Close/release resources. */ @@ -114,7 +114,7 @@ check_data_i(const char *dsetname, hid_t fid) /* Failure */ if (nerrors) { - HDprintf("total of %d errors out of %d elements\n", nerrors, (int)(NX * NY)); + printf("total of %d errors out of %d elements\n", nerrors, (int)(NX * NY)); return 1; } /* end if */ @@ -164,7 +164,7 @@ check_data_f(const char *dsetname, hid_t fid) for (i = 0; i < NY; i++) data_in[NX][i] = -2.2; /* Output */ - HDmemset(data_out, 0, (NX + 1) * NY * sizeof(double)); + memset(data_out, 0, (NX + 1) * NY * sizeof(double)); /* Read data from hyperslab in the file into the hyperslab in * memory and display. @@ -178,8 +178,8 @@ check_data_f(const char *dsetname, hid_t fid) if (!H5_DBL_REL_EQUAL(data_out[i][j], data_in[i][j], 0.001)) if (!nerrors++) { H5_FAILED(); - HDprintf("element [%d][%d] is %g but should have been %g\n", (int)i, (int)j, - data_out[i][j], data_in[i][j]); + printf("element [%d][%d] is %g but should have been %g\n", (int)i, (int)j, data_out[i][j], + data_in[i][j]); } /* end if */ /* Close/release resources. */ @@ -188,7 +188,7 @@ check_data_f(const char *dsetname, hid_t fid) /* Failure */ if (nerrors) { - HDprintf("total of %d errors out of %d elements\n", nerrors, (int)(NX * NY)); + printf("total of %d errors out of %d elements\n", nerrors, (int)(NX * NY)); return 1; } /* end if */ @@ -364,11 +364,11 @@ main(void) */ if (h5_driver_is_default_vfd_compatible(H5P_DEFAULT, &driver_is_default_compatible) < 0) { HDputs(" -- couldn't check if VFD is compatible with default VFD --"); - HDexit(EXIT_SUCCESS); + exit(EXIT_SUCCESS); } if (!driver_is_default_compatible) { HDputs(" -- SKIPPED for incompatible VFD --"); - HDexit(EXIT_SUCCESS); + exit(EXIT_SUCCESS); } HDputs("\n"); @@ -382,10 +382,10 @@ main(void) nerrors += check_file(filename); if (nerrors) { - HDprintf("***** %d FAILURE%s! *****\n", nerrors, 1 == nerrors ? "" : "S"); + printf("***** %d FAILURE%s! *****\n", nerrors, 1 == nerrors ? "" : "S"); return EXIT_FAILURE; } /* end if */ - HDprintf("All data type tests passed.\n"); + printf("All data type tests passed.\n"); return EXIT_SUCCESS; } /* end main() */ diff --git a/test/dangle.c b/test/dangle.c index 36984b8..d0b0295 100644 --- a/test/dangle.c +++ b/test/dangle.c @@ -598,7 +598,7 @@ test_dangle_force(void) TEST_ERROR; /* Allocate the array of object IDs */ - if (NULL == (objs = (hid_t *)HDcalloc((size_t)count, sizeof(hid_t)))) + if (NULL == (objs = (hid_t *)calloc((size_t)count, sizeof(hid_t)))) TEST_ERROR; /* Get the list of open IDs */ @@ -620,14 +620,14 @@ test_dangle_force(void) HDremove(filename); /* Release object ID array */ - HDfree(objs); + free(objs); PASSED(); return 0; error: if (objs) - HDfree(objs); + free(objs); return 1; } diff --git a/test/del_many_dense_attrs.c b/test/del_many_dense_attrs.c index 806c25f..8a1243a 100644 --- a/test/del_many_dense_attrs.c +++ b/test/del_many_dense_attrs.c @@ -37,7 +37,7 @@ const char *FILENAME[] = {"del_many_dense_attrs", NULL}; static void catch_signal(int H5_ATTR_UNUSED signo) { - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); } /* catch_signal() */ /*------------------------------------------------------------------------- diff --git a/test/direct_chunk.c b/test/direct_chunk.c index d6f094e..95ff9df 100644 --- a/test/direct_chunk.c +++ b/test/direct_chunk.c @@ -204,7 +204,7 @@ test_direct_chunk_write(hid_t file) direct_buf[i][j] = n++; /* Allocate output (compressed) buffer */ - outbuf = HDmalloc(z_dst_nbytes); + outbuf = malloc(z_dst_nbytes); z_dst = (Bytef *)outbuf; /* Perform compression from the source to the destination buffer */ @@ -212,15 +212,15 @@ test_direct_chunk_write(hid_t file) /* Check for various zlib errors */ if (Z_BUF_ERROR == ret) { - HDfprintf(stderr, "overflow"); + fprintf(stderr, "overflow"); goto error; } else if (Z_MEM_ERROR == ret) { - HDfprintf(stderr, "deflate memory error"); + fprintf(stderr, "deflate memory error"); goto error; } else if (Z_OK != ret) { - HDfprintf(stderr, "other deflate error"); + fprintf(stderr, "other deflate error"); goto error; } @@ -236,7 +236,7 @@ test_direct_chunk_write(hid_t file) } if (outbuf) - HDfree(outbuf); + free(outbuf); if (H5Fflush(dataset, H5F_SCOPE_LOCAL) < 0) goto error; @@ -269,9 +269,9 @@ test_direct_chunk_write(hid_t file) for (i = 0; i < CHUNK_NX; i++) { for (j = 0; j < CHUNK_NY; j++) { if (direct_buf[i][j] != check_chunk[i][j]) { - HDprintf(" 1. Read different values than written."); - HDprintf(" At index %d,%d\n", i, j); - HDprintf(" direct_buf=%d, check_chunk=%d\n", direct_buf[i][j], check_chunk[i][j]); + printf(" 1. Read different values than written."); + printf(" At index %d,%d\n", i, j); + printf(" direct_buf=%d, check_chunk=%d\n", direct_buf[i][j], check_chunk[i][j]); goto error; } } @@ -283,7 +283,7 @@ test_direct_chunk_write(hid_t file) direct_buf[i][j] = i + j; /* Allocate output (compressed) buffer */ - outbuf = HDmalloc(z_dst_nbytes); + outbuf = malloc(z_dst_nbytes); z_dst = (Bytef *)outbuf; /* Perform compression from the source to the destination buffer */ @@ -291,15 +291,15 @@ test_direct_chunk_write(hid_t file) /* Check for various zlib errors */ if (Z_BUF_ERROR == ret) { - HDfprintf(stderr, "overflow"); + fprintf(stderr, "overflow"); goto error; } else if (Z_MEM_ERROR == ret) { - HDfprintf(stderr, "deflate memory error"); + fprintf(stderr, "deflate memory error"); goto error; } else if (Z_OK != ret) { - HDfprintf(stderr, "other deflate error"); + fprintf(stderr, "other deflate error"); goto error; } @@ -316,7 +316,7 @@ test_direct_chunk_write(hid_t file) } if (outbuf) - HDfree(outbuf); + free(outbuf); if (H5Fflush(dataset, H5F_SCOPE_LOCAL) < 0) goto error; @@ -335,9 +335,9 @@ test_direct_chunk_write(hid_t file) for (i = 0; i < CHUNK_NX; i++) { for (j = 0; j < CHUNK_NY; j++) { if (direct_buf[i][j] != check_chunk[i][j]) { - HDprintf(" 2. Read different values than written."); - HDprintf(" At index %d,%d\n", i, j); - HDprintf(" direct_buf=%d, check_chunk=%d\n", direct_buf[i][j], check_chunk[i][j]); + printf(" 2. Read different values than written."); + printf(" At index %d,%d\n", i, j); + printf(" direct_buf=%d, check_chunk=%d\n", direct_buf[i][j], check_chunk[i][j]); goto error; } } @@ -367,7 +367,7 @@ error: H5E_END_TRY; if (outbuf) - HDfree(outbuf); + free(outbuf); H5_FAILED(); return 1; @@ -605,9 +605,9 @@ test_skip_compress_write1(hid_t file) for (i = 0; i < CHUNK_NX; i++) { for (j = 0; j < CHUNK_NY; j++) { if (direct_buf[i][j] != check_chunk[i][j]) { - HDprintf(" 1. Read different values than written."); - HDprintf(" At index %d,%d\n", i, j); - HDprintf(" direct_buf=%d, check_chunk=%d\n", direct_buf[i][j], check_chunk[i][j]); + printf(" 1. Read different values than written."); + printf(" At index %d,%d\n", i, j); + printf(" direct_buf=%d, check_chunk=%d\n", direct_buf[i][j], check_chunk[i][j]); goto error; } } @@ -620,7 +620,7 @@ test_skip_compress_write1(hid_t file) goto error; /* Read the raw chunk back */ - HDmemset(&read_direct_buf, 0, sizeof(read_direct_buf)); + memset(&read_direct_buf, 0, sizeof(read_direct_buf)); if ((status = H5Dread_chunk(dataset, H5P_DEFAULT, offset, &read_filter_mask, read_direct_buf)) < 0) goto error; if (read_filter_mask != filter_mask) @@ -630,9 +630,9 @@ test_skip_compress_write1(hid_t file) for (i = 0; i < CHUNK_NX; i++) { for (j = 0; j < CHUNK_NY; j++) { if (direct_buf[i][j] != read_direct_buf[i][j]) { - HDprintf(" 1. Read different values than written."); - HDprintf(" At index %d,%d\n", i, j); - HDprintf(" direct_buf=%d, read_direct_buf=%d\n", direct_buf[i][j], read_direct_buf[i][j]); + printf(" 1. Read different values than written."); + printf(" At index %d,%d\n", i, j); + printf(" direct_buf=%d, read_direct_buf=%d\n", direct_buf[i][j], read_direct_buf[i][j]); goto error; } } @@ -880,10 +880,10 @@ test_skip_compress_write2(hid_t file) for (i = 0; i < CHUNK_NX; i++) { for (j = 0; j < CHUNK_NY; j++) { if (origin_direct_buf[i][j] != check_chunk[i][j]) { - HDprintf(" 1. Read different values than written."); - HDprintf(" At index %d,%d\n", i, j); - HDprintf(" origin_direct_buf=%d, check_chunk=%d\n", origin_direct_buf[i][j], - check_chunk[i][j]); + printf(" 1. Read different values than written."); + printf(" At index %d,%d\n", i, j); + printf(" origin_direct_buf=%d, check_chunk=%d\n", origin_direct_buf[i][j], + check_chunk[i][j]); goto error; } } @@ -896,7 +896,7 @@ test_skip_compress_write2(hid_t file) goto error; /* Read the raw chunk back */ - HDmemset(&read_direct_buf, 0, sizeof(read_direct_buf)); + memset(&read_direct_buf, 0, sizeof(read_direct_buf)); if ((status = H5Dread_chunk(dataset, H5P_DEFAULT, offset, &read_filter_mask, read_direct_buf)) < 0) goto error; if (read_filter_mask != filter_mask) @@ -906,9 +906,9 @@ test_skip_compress_write2(hid_t file) for (i = 0; i < CHUNK_NX; i++) { for (j = 0; j < CHUNK_NY; j++) { if (direct_buf[i][j] != read_direct_buf[i][j]) { - HDprintf(" 1. Read different values than written."); - HDprintf(" At index %d,%d\n", i, j); - HDprintf(" direct_buf=%d, read_direct_buf=%d\n", direct_buf[i][j], read_direct_buf[i][j]); + printf(" 1. Read different values than written."); + printf(" At index %d,%d\n", i, j); + printf(" direct_buf=%d, read_direct_buf=%d\n", direct_buf[i][j], read_direct_buf[i][j]); goto error; } } @@ -1088,16 +1088,16 @@ test_data_conv(hid_t file) (direct_buf[i][j]).c[3] != (read_chunk[i][j]).c[3] || (direct_buf[i][j]).d != (read_chunk[i][j]).d || (direct_buf[i][j]).e != (read_chunk[i][j]).e) { - HDprintf(" 1. Read different values than written."); - HDprintf(" At index %d,%d\n", i, j); - HDprintf(" src={a=%d, b=%d, c=[%d,%d,%d,%d], d=%d, e=%d\n", (direct_buf[i][j]).a, - (direct_buf[i][j]).b, (direct_buf[i][j]).c[0], (direct_buf[i][j]).c[1], - (direct_buf[i][j]).c[2], (direct_buf[i][j]).c[3], (direct_buf[i][j]).d, - (direct_buf[i][j]).e); - HDprintf(" dst={a=%d, b=%d, c=[%d,%d,%d,%d], d=%d, e=%d\n", (read_chunk[i][j]).a, - (read_chunk[i][j]).b, (read_chunk[i][j]).c[0], (read_chunk[i][j]).c[1], - (read_chunk[i][j]).c[2], (read_chunk[i][j]).c[3], (read_chunk[i][j]).d, - (read_chunk[i][j]).e); + printf(" 1. Read different values than written."); + printf(" At index %d,%d\n", i, j); + printf(" src={a=%d, b=%d, c=[%d,%d,%d,%d], d=%d, e=%d\n", (direct_buf[i][j]).a, + (direct_buf[i][j]).b, (direct_buf[i][j]).c[0], (direct_buf[i][j]).c[1], + (direct_buf[i][j]).c[2], (direct_buf[i][j]).c[3], (direct_buf[i][j]).d, + (direct_buf[i][j]).e); + printf(" dst={a=%d, b=%d, c=[%d,%d,%d,%d], d=%d, e=%d\n", (read_chunk[i][j]).a, + (read_chunk[i][j]).b, (read_chunk[i][j]).c[0], (read_chunk[i][j]).c[1], + (read_chunk[i][j]).c[2], (read_chunk[i][j]).c[3], (read_chunk[i][j]).d, + (read_chunk[i][j]).e); goto error; } @@ -1131,15 +1131,15 @@ test_data_conv(hid_t file) (direct_buf[i][j]).c[2] != (check_chunk[i][j]).c[2] || (direct_buf[i][j]).c[3] != (check_chunk[i][j]).c[3] || (direct_buf[i][j]).e != (check_chunk[i][j]).e) { - HDprintf(" 1. Read different values than written."); - HDprintf(" At index %d,%d\n", i, j); - HDprintf(" src={a=%d, b=%d, c=[%d,%d,%d,%d], d=%d, e=%d\n", (direct_buf[i][j]).a, - (direct_buf[i][j]).b, (direct_buf[i][j]).c[0], (direct_buf[i][j]).c[1], - (direct_buf[i][j]).c[2], (direct_buf[i][j]).c[3], (direct_buf[i][j]).d, - (direct_buf[i][j]).e); - HDprintf(" dst={a=%d, c=[%d,%d,%d,%d], e=%d\n", (check_chunk[i][j]).a, - (check_chunk[i][j]).c[0], (check_chunk[i][j]).c[1], (check_chunk[i][j]).c[2], - (check_chunk[i][j]).c[3], (check_chunk[i][j]).e); + printf(" 1. Read different values than written."); + printf(" At index %d,%d\n", i, j); + printf(" src={a=%d, b=%d, c=[%d,%d,%d,%d], d=%d, e=%d\n", (direct_buf[i][j]).a, + (direct_buf[i][j]).b, (direct_buf[i][j]).c[0], (direct_buf[i][j]).c[1], + (direct_buf[i][j]).c[2], (direct_buf[i][j]).c[3], (direct_buf[i][j]).d, + (direct_buf[i][j]).e); + printf(" dst={a=%d, c=[%d,%d,%d,%d], e=%d\n", (check_chunk[i][j]).a, + (check_chunk[i][j]).c[0], (check_chunk[i][j]).c[1], (check_chunk[i][j]).c[2], + (check_chunk[i][j]).c[3], (check_chunk[i][j]).e); goto error; } @@ -1510,7 +1510,7 @@ test_direct_chunk_read_no_cache(hid_t file) goto error; /* Allocate output (compressed) buffer */ - outbuf = HDmalloc(z_src_nbytes); + outbuf = malloc(z_src_nbytes); z_src = (Bytef *)outbuf; /* For each chunk in the dataset, compare the result of H5Dread and H5Dread_chunk. */ @@ -1550,19 +1550,19 @@ test_direct_chunk_read_no_cache(hid_t file) /* Check for various zlib errors */ if (Z_BUF_ERROR == ret) { - HDfprintf(stderr, "overflow\n"); + fprintf(stderr, "overflow\n"); goto error; } else if (Z_MEM_ERROR == ret) { - HDfprintf(stderr, "deflate memory error\n"); + fprintf(stderr, "deflate memory error\n"); goto error; } else if (Z_DATA_ERROR == ret) { - HDfprintf(stderr, "corrupted data\n"); + fprintf(stderr, "corrupted data\n"); goto error; } else if (Z_OK != ret) { - HDfprintf(stderr, "other deflate error\n"); + fprintf(stderr, "other deflate error\n"); goto error; } @@ -1570,9 +1570,9 @@ test_direct_chunk_read_no_cache(hid_t file) for (k = 0; k < CHUNK_NX; k++) { for (l = 0; l < CHUNK_NY; l++) { if (direct_buf[k][l] != check_chunk[k][l]) { - HDprintf("\n 1. Read different values than written."); - HDprintf(" At index %d,%d\n", k, l); - HDprintf(" direct_buf=%d, check_chunk=%d\n", direct_buf[k][l], check_chunk[k][l]); + printf("\n 1. Read different values than written."); + printf(" At index %d,%d\n", k, l); + printf(" direct_buf=%d, check_chunk=%d\n", direct_buf[k][l], check_chunk[k][l]); goto error; } } @@ -1589,7 +1589,7 @@ test_direct_chunk_read_no_cache(hid_t file) H5Pclose(dapl); if (outbuf) - HDfree(outbuf); + free(outbuf); PASSED(); return 0; @@ -1607,7 +1607,7 @@ error: H5E_END_TRY; if (outbuf) - HDfree(outbuf); + free(outbuf); H5_FAILED(); return 1; @@ -1694,7 +1694,7 @@ test_direct_chunk_read_cache(hid_t file, hbool_t flush) } /* Allocate output (compressed) buffer */ - outbuf = HDmalloc(z_src_nbytes); + outbuf = malloc(z_src_nbytes); z_src = (Bytef *)outbuf; /* For each chunk in the dataset, compare the result of H5Dread and H5Dread_chunk. */ @@ -1741,19 +1741,19 @@ test_direct_chunk_read_cache(hid_t file, hbool_t flush) /* Check for various zlib errors */ if (Z_BUF_ERROR == ret) { - HDfprintf(stderr, "overflow\n"); + fprintf(stderr, "overflow\n"); goto error; } else if (Z_MEM_ERROR == ret) { - HDfprintf(stderr, "deflate memory error\n"); + fprintf(stderr, "deflate memory error\n"); goto error; } else if (Z_DATA_ERROR == ret) { - HDfprintf(stderr, "corrupted data\n"); + fprintf(stderr, "corrupted data\n"); goto error; } else if (Z_OK != ret) { - HDfprintf(stderr, "other deflate error\n"); + fprintf(stderr, "other deflate error\n"); goto error; } @@ -1761,9 +1761,9 @@ test_direct_chunk_read_cache(hid_t file, hbool_t flush) for (k = 0; k < CHUNK_NX; k++) { for (l = 0; l < CHUNK_NY; l++) { if (direct_buf[k][l] != check_chunk[k][l]) { - HDprintf("\n 1. Read different values than written."); - HDprintf(" At index %d,%d\n", k, l); - HDprintf(" direct_buf=%d, check_chunk=%d\n", direct_buf[k][l], check_chunk[k][l]); + printf("\n 1. Read different values than written."); + printf(" At index %d,%d\n", k, l); + printf(" direct_buf=%d, check_chunk=%d\n", direct_buf[k][l], check_chunk[k][l]); goto error; } } @@ -1779,7 +1779,7 @@ test_direct_chunk_read_cache(hid_t file, hbool_t flush) H5Pclose(dxpl); if (outbuf) - HDfree(outbuf); + free(outbuf); PASSED(); return 0; @@ -1796,7 +1796,7 @@ error: H5E_END_TRY; if (outbuf) - HDfree(outbuf); + free(outbuf); H5_FAILED(); return 1; @@ -1910,7 +1910,7 @@ test_read_unfiltered_dset(hid_t file) offset[0] = (hsize_t)i * CHUNK_NX; offset[1] = (hsize_t)j * CHUNK_NY; /* Read the raw chunk back */ - HDmemset(&direct_buf, 0, sizeof(direct_buf)); + memset(&direct_buf, 0, sizeof(direct_buf)); filter_mask = UINT_MAX; if ((status = H5Dread_chunk(dataset, dxpl, offset, &filter_mask, direct_buf)) < 0) goto error; @@ -1923,9 +1923,9 @@ test_read_unfiltered_dset(hid_t file) for (k = 0; k < CHUNK_NX; k++) { for (l = 0; l < CHUNK_NY; l++) { if (direct_buf[k][l] != check_chunk[k][l]) { - HDprintf("\n 1. Read different values than written."); - HDprintf(" At index %d,%d\n", k, l); - HDprintf(" direct_buf=%d, check_chunk=%d\n", direct_buf[k][l], check_chunk[k][l]); + printf("\n 1. Read different values than written."); + printf(" At index %d,%d\n", k, l); + printf(" direct_buf=%d, check_chunk=%d\n", direct_buf[k][l], check_chunk[k][l]); goto error; } } @@ -2014,7 +2014,7 @@ test_read_unallocated_chunk(hid_t file) FAIL_STACK_ERROR; /* Write a single chunk to initialize the chunk storage */ - HDmemset(direct_buf, 0, CHUNK_NX * CHUNK_NY * sizeof(int)); + memset(direct_buf, 0, CHUNK_NX * CHUNK_NY * sizeof(int)); offset[0] = 0; offset[1] = 0; @@ -2299,41 +2299,41 @@ main(void) continue; /* Print configuration */ - HDprintf("Configuration: "); + printf("Configuration: "); if (config == 0) - HDprintf("<empty>"); + printf("<empty>"); if (config & CONFIG_LATEST) { if (need_comma) - HDprintf(", "); - HDprintf("latest format"); + printf(", "); + printf("latest format"); need_comma = TRUE; } /* end if */ if (config & CONFIG_REOPEN_FILE) { if (need_comma) - HDprintf(", "); - HDprintf("reopen file"); + printf(", "); + printf("reopen file"); need_comma = TRUE; } /* end if */ else if (config & CONFIG_REOPEN_DSET) { if (need_comma) - HDprintf(", "); - HDprintf("reopen dataset"); + printf(", "); + printf("reopen dataset"); need_comma = TRUE; } /* end if */ if (config & CONFIG_DIRECT_WRITE) { if (need_comma) - HDprintf(", "); - HDprintf("direct write"); + printf(", "); + printf("direct write"); need_comma = TRUE; } /* end if */ if (config & CONFIG_DIRECT_READ) { if (need_comma) - HDprintf(", "); - HDprintf("direct read"); + printf(", "); + printf("direct read"); need_comma = TRUE; } /* end if */ - HDprintf(":\n"); - HDfflush(stdout); + printf(":\n"); + fflush(stdout); nerrors += test_single_chunk(config); } /* end for */ diff --git a/test/dsets.c b/test/dsets.c index fc3de08..801eb6a 100644 --- a/test/dsets.c +++ b/test/dsets.c @@ -380,13 +380,13 @@ test_create(hid_t file) dims[0] = 256; dims[1] = 512; space = H5Screate_simple(2, dims, NULL); - HDassert(space >= 0); + assert(space >= 0); /* Create a small data space for compact dataset */ small_dims[0] = 16; small_dims[1] = 8; small_space = H5Screate_simple(2, small_dims, NULL); - HDassert(space >= 0); + assert(space >= 0); /* * Create a dataset using the default dataset creation properties. We're @@ -455,13 +455,13 @@ test_create(hid_t file) * layout. */ create_parms = H5Pcreate(H5P_DATASET_CREATE); - HDassert(create_parms >= 0); + assert(create_parms >= 0); /* Attempt to create a dataset with invalid chunk sizes */ csize[0] = dims[0] * 2; csize[1] = dims[1] * 2; status = H5Pset_chunk(create_parms, 2, csize); - HDassert(status >= 0); + assert(status >= 0); H5E_BEGIN_TRY { dataset = H5Dcreate2(file, DSET_CHUNKED_NAME, H5T_NATIVE_DOUBLE, space, H5P_DEFAULT, create_parms, @@ -477,7 +477,7 @@ test_create(hid_t file) csize[0] = 5; csize[1] = 100; status = H5Pset_chunk(create_parms, 2, csize); - HDassert(status >= 0); + assert(status >= 0); dataset = H5Dcreate2(file, DSET_CHUNKED_NAME, H5T_NATIVE_DOUBLE, space, H5P_DEFAULT, create_parms, H5P_DEFAULT); @@ -499,11 +499,11 @@ test_create(hid_t file) * Create a compact dataset, then close it. */ create_parms = H5Pcreate(H5P_DATASET_CREATE); - HDassert(create_parms >= 0); + assert(create_parms >= 0); status = H5Pset_layout(create_parms, H5D_COMPACT); - HDassert(status >= 0); + assert(status >= 0); status = H5Pset_alloc_time(create_parms, H5D_ALLOC_TIME_EARLY); - HDassert(status >= 0); + assert(status >= 0); dataset = H5Dcreate2(file, DSET_COMPACT_NAME, H5T_NATIVE_DOUBLE, small_space, H5P_DEFAULT, create_parms, H5P_DEFAULT); @@ -552,9 +552,9 @@ test_simple_io(const char *env_h5_drvr, hid_t fapl) h5_fixname(FILENAME[4], fapl, filename, sizeof filename); /* Set up data array */ - if (NULL == (rdata_bytes = (int *)HDcalloc(DSET_DIM1 * DSET_DIM2, sizeof(int)))) + if (NULL == (rdata_bytes = (int *)calloc(DSET_DIM1 * DSET_DIM2, sizeof(int)))) TEST_ERROR; - if (NULL == (rdata = (int **)HDcalloc(DSET_DIM1, sizeof(rdata_bytes)))) + if (NULL == (rdata = (int **)calloc(DSET_DIM1, sizeof(rdata_bytes)))) TEST_ERROR; for (i = 0; i < DSET_DIM1; i++) rdata[i] = rdata_bytes + (i * DSET_DIM2); @@ -574,9 +574,9 @@ test_simple_io(const char *env_h5_drvr, hid_t fapl) goto error; /* Create a small conversion buffer to test strip mining */ - tconv_buf = HDmalloc((size_t)1000); + tconv_buf = malloc((size_t)1000); xfer = H5Pcreate(H5P_DATASET_XFER); - HDassert(xfer >= 0); + assert(xfer >= 0); if (H5Pset_buffer(xfer, (size_t)1000, tconv_buf, NULL) < 0) goto error; @@ -611,8 +611,8 @@ test_simple_io(const char *env_h5_drvr, hid_t fapl) for (j = 0; j < DSET_DIM2; j++) { if (points[i][j] != check[i][j]) { H5_FAILED(); - HDprintf(" Read different values than written.\n"); - HDprintf(" At index %d,%d\n", i, j); + printf(" Read different values than written.\n"); + printf(" At index %d,%d\n", i, j); goto error; } } @@ -638,8 +638,8 @@ test_simple_io(const char *env_h5_drvr, hid_t fapl) for (j = 0; j < DSET_DIM2; j++) { if (points[i][j] != rdata[i][j]) { H5_FAILED(); - HDprintf(" Read different values than written.\n"); - HDprintf(" At index %d,%d\n", i, j); + printf(" Read different values than written.\n"); + printf(" At index %d,%d\n", i, j); goto error; } } @@ -648,9 +648,9 @@ test_simple_io(const char *env_h5_drvr, hid_t fapl) HDclose(f); f = -1; - HDfree(tconv_buf); - HDfree(rdata_bytes); - HDfree(rdata); + free(tconv_buf); + free(rdata_bytes); + free(rdata); PASSED(); } /* end if */ @@ -677,9 +677,9 @@ error: if (f > 0) HDclose(f); - HDfree(tconv_buf); - HDfree(rdata_bytes); - HDfree(rdata); + free(tconv_buf); + free(rdata_bytes); + free(rdata); return FAIL; } /* end test_simple_io() */ @@ -713,9 +713,9 @@ test_userblock_offset(const char *env_h5_drvr, hid_t fapl, hbool_t new_format) h5_fixname(FILENAME[2], fapl, filename, sizeof filename); /* Set up data array */ - if (NULL == (rdata_bytes = (int *)HDcalloc(DSET_DIM1 * DSET_DIM2, sizeof(int)))) + if (NULL == (rdata_bytes = (int *)calloc(DSET_DIM1 * DSET_DIM2, sizeof(int)))) TEST_ERROR; - if (NULL == (rdata = (int **)HDcalloc(DSET_DIM1, sizeof(rdata_bytes)))) + if (NULL == (rdata = (int **)calloc(DSET_DIM1, sizeof(rdata_bytes)))) TEST_ERROR; for (i = 0; i < DSET_DIM1; i++) rdata[i] = rdata_bytes + (i * DSET_DIM2); @@ -775,8 +775,8 @@ test_userblock_offset(const char *env_h5_drvr, hid_t fapl, hbool_t new_format) for (j = 0; j < DSET_DIM2; j++) { if (points[i][j] != rdata[i][j]) { H5_FAILED(); - HDprintf(" Read different values than written.\n"); - HDprintf(" At index %d,%d\n", i, j); + printf(" Read different values than written.\n"); + printf(" At index %d,%d\n", i, j); goto error; } } @@ -785,8 +785,8 @@ test_userblock_offset(const char *env_h5_drvr, hid_t fapl, hbool_t new_format) HDclose(f); f = -1; - HDfree(rdata_bytes); - HDfree(rdata); + free(rdata_bytes); + free(rdata); PASSED(); } /* end if */ @@ -813,8 +813,8 @@ error: if (f > 0) HDclose(f); - HDfree(rdata_bytes); - HDfree(rdata); + free(rdata_bytes); + free(rdata); return FAIL; } /* end test_userblock_offset() */ @@ -913,10 +913,10 @@ test_compact_io(hid_t fapl) for (j = 0; j < 8; j++) if (rbuf[i][j] != wbuf[i][j]) { H5_FAILED(); - HDprintf(" Read different values than written.\n"); - HDprintf(" At index %d,%d\n", i, j); - HDprintf(" wbuf[%d][%d]=%d\n", i, j, wbuf[i][j]); - HDprintf(" rbuf[%d][%d]=%d\n", i, j, rbuf[i][j]); + printf(" Read different values than written.\n"); + printf(" At index %d,%d\n", i, j); + printf(" wbuf[%d][%d]=%d\n", i, j, wbuf[i][j]); + printf(" rbuf[%d][%d]=%d\n", i, j, rbuf[i][j]); goto error; } /* end */ @@ -979,10 +979,10 @@ test_compact_io(hid_t fapl) for (j = 0; j < 8; j++) if (rbuf[i][j] != wbuf[i][j]) { H5_FAILED(); - HDprintf(" Read different values than written.\n"); - HDprintf(" At index %d,%d\n", i, j); - HDprintf(" wbuf[%d][%d]=%d\n", i, j, wbuf[i][j]); - HDprintf(" rbuf[%d][%d]=%d\n", i, j, rbuf[i][j]); + printf(" Read different values than written.\n"); + printf(" At index %d,%d\n", i, j); + printf(" wbuf[%d][%d]=%d\n", i, j, wbuf[i][j]); + printf(" rbuf[%d][%d]=%d\n", i, j, rbuf[i][j]); goto error; } /* end */ @@ -1075,9 +1075,9 @@ test_max_compact(hid_t fapl) /* Initialize data */ compact_size = (SIXTY_FOUR_KB - 64) / sizeof(int); - if (NULL == (wbuf = (int *)HDmalloc(sizeof(int) * compact_size))) + if (NULL == (wbuf = (int *)malloc(sizeof(int) * compact_size))) TEST_ERROR; - if (NULL == (rbuf = (int *)HDmalloc(sizeof(int) * compact_size))) + if (NULL == (rbuf = (int *)malloc(sizeof(int) * compact_size))) TEST_ERROR; n = 0; @@ -1132,8 +1132,8 @@ test_max_compact(hid_t fapl) for (u = 0; u < compact_size; u++) if (rbuf[u] != wbuf[u]) { H5_FAILED(); - HDprintf(" Read different values than written.\n"); - HDprintf(" At index %u\n", (unsigned)u); + printf(" Read different values than written.\n"); + printf(" At index %u\n", (unsigned)u); goto error; } /* end if */ @@ -1141,9 +1141,9 @@ test_max_compact(hid_t fapl) FAIL_STACK_ERROR; if (H5Fclose(file) < 0) FAIL_STACK_ERROR; - HDfree(wbuf); + free(wbuf); wbuf = NULL; - HDfree(rbuf); + free(rbuf); rbuf = NULL; /* Test compact dataset of size 64KB */ @@ -1184,9 +1184,9 @@ test_max_compact(hid_t fapl) error: if (wbuf) - HDfree(wbuf); + free(wbuf); if (rbuf) - HDfree(rbuf); + free(rbuf); H5E_BEGIN_TRY { @@ -1389,7 +1389,7 @@ test_conv_buffer(hid_t fid) TESTING("data type conversion buffer size"); - if ((cf = (CmpField *)HDcalloc((size_t)1, sizeof(CmpField))) == 0) + if ((cf = (CmpField *)calloc((size_t)1, sizeof(CmpField))) == 0) goto error; /* Populate the data members */ @@ -1454,7 +1454,7 @@ test_conv_buffer(hid_t fid) goto error; /* Read should succeed since library will set conversion buffer big enough */ - if ((cfrR = (CmpFieldR *)HDcalloc((size_t)1, sizeof(CmpFieldR))) == 0) + if ((cfrR = (CmpFieldR *)calloc((size_t)1, sizeof(CmpFieldR))) == 0) goto error; if (H5Dread(dataset, ctype2, H5S_ALL, H5S_ALL, H5P_DEFAULT, cfrR) < 0) goto error; @@ -1505,14 +1505,14 @@ test_conv_buffer(hid_t fid) if (H5Dclose(dataset) < 0) goto error; - HDfree(cf); - HDfree(cfrR); + free(cf); + free(cfrR); HDputs(" PASSED"); return SUCCEED; error: - HDfree(cfrR); - HDfree(cf); + free(cfrR); + free(cf); H5E_BEGIN_TRY { @@ -1549,9 +1549,9 @@ test_tconv(hid_t file) hid_t space = -1, dataset = -1; int i; - if ((out = (char *)HDmalloc((size_t)(4 * 1000 * 1000))) == NULL) + if ((out = (char *)malloc((size_t)(4 * 1000 * 1000))) == NULL) goto error; - if ((in = (char *)HDmalloc((size_t)(4 * 1000 * 1000))) == NULL) + if ((in = (char *)malloc((size_t)(4 * 1000 * 1000))) == NULL) goto error; TESTING("data type conversion"); @@ -1596,17 +1596,17 @@ test_tconv(hid_t file) goto error; if (H5Sclose(space) < 0) goto error; - HDfree(out); - HDfree(in); + free(out); + free(in); HDputs(" PASSED"); return SUCCEED; error: if (out) - HDfree(out); + free(out); if (in) - HDfree(in); + free(in); H5E_BEGIN_TRY { @@ -1822,13 +1822,13 @@ filter_corrupt(unsigned int flags, size_t cd_nelmts, const unsigned int *cd_valu if (offset > nbytes || (offset + length) > nbytes || length < sizeof(unsigned int)) TEST_ERROR; - if (NULL == (data = HDmalloc((size_t)length))) + if (NULL == (data = malloc((size_t)length))) TEST_ERROR; - HDmemset(data, (int)value, (size_t)length); + memset(data, (int)value, (size_t)length); if (flags & H5Z_FLAG_REVERSE) { /* Verify data is actually corrupted during read */ dst += offset; - if (HDmemcmp(data, dst, (size_t)length) != 0) + if (memcmp(data, dst, (size_t)length) != 0) TEST_ERROR; else { *buf_size = nbytes; @@ -1837,14 +1837,14 @@ filter_corrupt(unsigned int flags, size_t cd_nelmts, const unsigned int *cd_valu } /* end if */ else { /* Write corrupted data */ dst += offset; - HDmemcpy(dst, data, (size_t)length); + memcpy(dst, data, (size_t)length); *buf_size = nbytes; ret_value = *buf_size; } /* end else */ error: if (data) - HDfree(data); + free(data); return ret_value; } /* end filter_corrupt() */ @@ -1922,7 +1922,7 @@ test_filter_internal(hid_t fid, const char *name, hid_t dcpl, int if_fletcher32, */ if ((dxpl = H5Pcreate(H5P_DATASET_XFER)) < 0) goto error; - tconv_buf = HDmalloc((size_t)1000); + tconv_buf = malloc((size_t)1000); if (H5Pset_buffer(dxpl, (size_t)1000, tconv_buf, NULL) < 0) goto error; if ((write_dxpl = H5Pcopy(dxpl)) < 0) @@ -1940,7 +1940,7 @@ test_filter_internal(hid_t fid, const char *name, hid_t dcpl, int if_fletcher32, /* Check if all the filters are available */ if (H5Pall_filters_avail(dcpl) != TRUE) { H5_FAILED(); - HDprintf(" Line %d: Incorrect filter availability\n", __LINE__); + printf(" Line %d: Incorrect filter availability\n", __LINE__); goto error; } /* end if */ @@ -1963,8 +1963,8 @@ test_filter_internal(hid_t fid, const char *name, hid_t dcpl, int if_fletcher32, for (j = 0; j < (size_t)size[1]; j++) { if (0 != check[i][j]) { H5_FAILED(); - HDprintf(" Read a non-zero value.\n"); - HDprintf(" At index %lu,%lu\n", (unsigned long)i, (unsigned long)j); + printf(" Read a non-zero value.\n"); + printf(" At index %lu,%lu\n", (unsigned long)i, (unsigned long)j); goto error; } } @@ -2037,10 +2037,10 @@ test_filter_internal(hid_t fid, const char *name, hid_t dcpl, int if_fletcher32, for (j = 0; j < size[1]; j++) { if (points[i][j] != check[i][j]) { H5_FAILED(); - HDfprintf(stderr, " Read different values than written.\n"); - HDfprintf(stderr, " At index %lu,%lu\n", (unsigned long)i, (unsigned long)j); - HDfprintf(stderr, " At original: %d\n", (int)points[i][j]); - HDfprintf(stderr, " At returned: %d\n", (int)check[i][j]); + fprintf(stderr, " Read different values than written.\n"); + fprintf(stderr, " At index %lu,%lu\n", (unsigned long)i, (unsigned long)j); + fprintf(stderr, " At original: %d\n", (int)points[i][j]); + fprintf(stderr, " At returned: %d\n", (int)check[i][j]); goto error; } } @@ -2105,8 +2105,8 @@ test_filter_internal(hid_t fid, const char *name, hid_t dcpl, int if_fletcher32, for (j = 0; j < size[1]; j++) { if (points[i][j] != check[i][j]) { H5_FAILED(); - HDprintf(" Read different values than written.\n"); - HDprintf(" At index %lu,%lu\n", (unsigned long)i, (unsigned long)j); + printf(" Read different values than written.\n"); + printf(" At index %lu,%lu\n", (unsigned long)i, (unsigned long)j); goto error; } } @@ -2169,8 +2169,8 @@ test_filter_internal(hid_t fid, const char *name, hid_t dcpl, int if_fletcher32, for (j = 0; j < size[1]; j++) if (points[i][j] != check[i][j]) { H5_FAILED(); - HDprintf(" Read different values than written.\n"); - HDprintf(" At index %lu,%lu\n", (unsigned long)i, (unsigned long)j); + printf(" Read different values than written.\n"); + printf(" At index %lu,%lu\n", (unsigned long)i, (unsigned long)j); goto error; } /* end if */ } /* end else */ @@ -2236,13 +2236,13 @@ test_filter_internal(hid_t fid, const char *name, hid_t dcpl, int if_fletcher32, if (points[(size_t)hs_offset[0] + i][(size_t)hs_offset[1] + j] != check[(size_t)hs_offset[0] + i][(size_t)hs_offset[1] + j]) { H5_FAILED(); - HDfprintf(stderr, " Read different values than written.\n"); - HDfprintf(stderr, " At index %lu,%lu\n", (unsigned long)((size_t)hs_offset[0] + i), - (unsigned long)((size_t)hs_offset[1] + j)); - HDfprintf(stderr, " At original: %d\n", - (int)points[(size_t)hs_offset[0] + i][(size_t)hs_offset[1] + j]); - HDfprintf(stderr, " At returned: %d\n", - (int)check[(size_t)hs_offset[0] + i][(size_t)hs_offset[1] + j]); + fprintf(stderr, " Read different values than written.\n"); + fprintf(stderr, " At index %lu,%lu\n", (unsigned long)((size_t)hs_offset[0] + i), + (unsigned long)((size_t)hs_offset[1] + j)); + fprintf(stderr, " At original: %d\n", + (int)points[(size_t)hs_offset[0] + i][(size_t)hs_offset[1] + j]); + fprintf(stderr, " At returned: %d\n", + (int)check[(size_t)hs_offset[0] + i][(size_t)hs_offset[1] + j]); goto error; } } @@ -2264,13 +2264,13 @@ test_filter_internal(hid_t fid, const char *name, hid_t dcpl, int if_fletcher32, goto error; if (H5Pclose(write_dxpl) < 0) goto error; - HDfree(tconv_buf); + free(tconv_buf); return SUCCEED; error: if (tconv_buf) - HDfree(tconv_buf); + free(tconv_buf); return FAIL; } /* end test_filter_internal() */ @@ -2857,7 +2857,7 @@ test_missing_filter(hid_t file) /* Verify deflate filter is registered currently */ if (H5Zfilter_avail(H5Z_FILTER_DEFLATE) != TRUE) { H5_FAILED(); - HDprintf(" Line %d: Deflate filter not available\n", __LINE__); + printf(" Line %d: Deflate filter not available\n", __LINE__); goto error; } /* end if */ @@ -2870,31 +2870,31 @@ test_missing_filter(hid_t file) /* (Use private routine, to avoid range checking on filter ID) */ if (H5Z__unregister(H5Z_FILTER_DEFLATE) < 0) { H5_FAILED(); - HDprintf(" Line %d: Can't unregister deflate filter\n", __LINE__); + printf(" Line %d: Can't unregister deflate filter\n", __LINE__); goto error; } /* end if */ #endif /* H5_HAVE_FILTER_DEFLATE */ /* Verify deflate filter is not registered currently */ if (H5Zfilter_avail(H5Z_FILTER_DEFLATE) != FALSE) { H5_FAILED(); - HDprintf(" Line %d: Deflate filter available\n", __LINE__); + printf(" Line %d: Deflate filter available\n", __LINE__); goto error; } /* end if */ /* Create dcpl with deflate filter */ if ((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0) { H5_FAILED(); - HDprintf(" Line %d: Can't create dcpl\n", __LINE__); + printf(" Line %d: Can't create dcpl\n", __LINE__); goto error; } /* end if */ if (H5Pset_chunk(dcpl, 2, chunk_dims) < 0) { H5_FAILED(); - HDprintf(" Line %d: Can't set chunk sizes\n", __LINE__); + printf(" Line %d: Can't set chunk sizes\n", __LINE__); goto error; } /* end if */ if (H5Pset_deflate(dcpl, 9) < 0) { H5_FAILED(); - HDprintf(" Line %d: Can't set deflate filter\n", __LINE__); + printf(" Line %d: Can't set deflate filter\n", __LINE__); goto error; } /* end if */ @@ -2902,19 +2902,19 @@ test_missing_filter(hid_t file) ret = H5Pall_filters_avail(dcpl); if (ret < 0) { H5_FAILED(); - HDprintf(" Line %d: Can't check filter availability\n", __LINE__); + printf(" Line %d: Can't check filter availability\n", __LINE__); goto error; } /* end if */ if (ret != FALSE) { H5_FAILED(); - HDprintf(" Line %d: Filter shouldn't be available\n", __LINE__); + printf(" Line %d: Filter shouldn't be available\n", __LINE__); goto error; } /* end if */ /* Create the data space */ if ((sid = H5Screate_simple(2, dims, NULL)) < 0) { H5_FAILED(); - HDprintf(" Line %d: Can't open dataspace\n", __LINE__); + printf(" Line %d: Can't open dataspace\n", __LINE__); goto error; } /* end if */ @@ -2922,29 +2922,29 @@ test_missing_filter(hid_t file) if ((dsid = H5Dcreate2(file, DSET_MISSING_NAME, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" Line %d: Can't create dataset\n", __LINE__); + printf(" Line %d: Can't create dataset\n", __LINE__); goto error; } /* end if */ /* Write data */ if (H5Dwrite(dsid, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, points_data) < 0) { H5_FAILED(); - HDprintf(" Line %d: Error writing dataset data\n", __LINE__); + printf(" Line %d: Error writing dataset data\n", __LINE__); goto error; } /* end if */ /* Flush the file (to clear the cache) */ if (H5Fflush(file, H5F_SCOPE_GLOBAL) < 0) { H5_FAILED(); - HDprintf(" Line %d: Error flushing file\n", __LINE__); + printf(" Line %d: Error flushing file\n", __LINE__); goto error; } /* end if */ /* Query the dataset's size on disk */ if (0 == (dset_size = H5Dget_storage_size(dsid))) { H5_FAILED(); - HDprintf(" Line %d: Error querying dataset size, dset_size=%lu\n", __LINE__, - (unsigned long)dset_size); + printf(" Line %d: Error querying dataset size, dset_size=%lu\n", __LINE__, + (unsigned long)dset_size); goto error; } /* end if */ @@ -2952,14 +2952,14 @@ test_missing_filter(hid_t file) /* (i.e. the deflation filter we asked for was silently ignored) */ if ((H5Tget_size(H5T_NATIVE_INT) * DSET_DIM1 * DSET_DIM2) != dset_size) { H5_FAILED(); - HDprintf(" Line %d: Incorrect dataset size: %lu\n", __LINE__, (unsigned long)dset_size); + printf(" Line %d: Incorrect dataset size: %lu\n", __LINE__, (unsigned long)dset_size); goto error; } /* end if */ /* Read data */ if (H5Dread(dsid, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, check_data) < 0) { H5_FAILED(); - HDprintf(" Line %d: Error reading dataset data\n", __LINE__); + printf(" Line %d: Error reading dataset data\n", __LINE__); goto error; } /* end if */ @@ -2969,10 +2969,10 @@ test_missing_filter(hid_t file) for (j = 0; j < (size_t)dims[1]; j++) { if (points[i][j] != check[i][j]) { H5_FAILED(); - HDprintf(" Line %d: Read different values than written.\n", __LINE__); - HDprintf(" At index %lu,%lu\n", (unsigned long)(i), (unsigned long)(j)); - HDprintf(" At original: %d\n", points[i][j]); - HDprintf(" At returned: %d\n", check[i][j]); + printf(" Line %d: Read different values than written.\n", __LINE__); + printf(" At index %lu,%lu\n", (unsigned long)(i), (unsigned long)(j)); + printf(" At original: %d\n", points[i][j]); + printf(" At returned: %d\n", check[i][j]); goto error; } /* end if */ } /* end for */ @@ -2981,21 +2981,21 @@ test_missing_filter(hid_t file) /* Close dataset */ if (H5Dclose(dsid) < 0) { H5_FAILED(); - HDprintf(" Line %d: Can't close dataset\n", __LINE__); + printf(" Line %d: Can't close dataset\n", __LINE__); goto error; } /* end if */ /* Close dataspace */ if (H5Sclose(sid) < 0) { H5_FAILED(); - HDprintf(" Line %d: Can't close dataspace\n", __LINE__); + printf(" Line %d: Can't close dataspace\n", __LINE__); goto error; } /* end if */ /* Close dataset creation property list */ if (H5Pclose(dcpl) < 0) { H5_FAILED(); - HDprintf(" Line %d: Can't close dcpl\n", __LINE__); + printf(" Line %d: Can't close dcpl\n", __LINE__); goto error; } /* end if */ @@ -3004,14 +3004,14 @@ test_missing_filter(hid_t file) /* Open existing file */ if ((fid = H5Fopen(testfile, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" Line %d: Can't open existing deflated file\n", __LINE__); + printf(" Line %d: Can't open existing deflated file\n", __LINE__); goto error; } /* end if */ /* Open dataset */ if ((dsid = H5Dopen2(fid, "Dataset1", H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" Line %d: Can't open dataset\n", __LINE__); + printf(" Line %d: Can't open dataset\n", __LINE__); goto error; } /* end if */ @@ -3023,21 +3023,21 @@ test_missing_filter(hid_t file) H5E_END_TRY; if (ret >= 0) { H5_FAILED(); - HDprintf(" Line %d: Should not be able to read dataset data\n", __LINE__); + printf(" Line %d: Should not be able to read dataset data\n", __LINE__); goto error; } /* end if */ /* Close dataset */ if (H5Dclose(dsid) < 0) { H5_FAILED(); - HDprintf(" Line %d: Can't close dataset\n", __LINE__); + printf(" Line %d: Can't close dataset\n", __LINE__); goto error; } /* end if */ /* Close existing file */ if (H5Fclose(fid) < 0) { H5_FAILED(); - HDprintf(" Line %d: Can't close file\n", __LINE__); + printf(" Line %d: Can't close file\n", __LINE__); goto error; } /* end if */ @@ -3045,21 +3045,21 @@ test_missing_filter(hid_t file) /* Verify deflate filter is not registered currently */ if (H5Zfilter_avail(H5Z_FILTER_DEFLATE) != FALSE) { H5_FAILED(); - HDprintf(" Line %d: Deflate filter available\n", __LINE__); + printf(" Line %d: Deflate filter available\n", __LINE__); goto error; } /* end if */ #ifdef H5_HAVE_FILTER_DEFLATE /* Register deflate filter (use internal function to avoid range checks) */ if (H5Z_register(H5Z_DEFLATE) < 0) { H5_FAILED(); - HDprintf(" Line %d: Can't unregister deflate filter\n", __LINE__); + printf(" Line %d: Can't unregister deflate filter\n", __LINE__); goto error; } /* end if */ /* Verify deflate filter is registered currently */ if (H5Zfilter_avail(H5Z_FILTER_DEFLATE) != TRUE) { H5_FAILED(); - HDprintf(" Line %d: Deflate filter not available\n", __LINE__); + printf(" Line %d: Deflate filter not available\n", __LINE__); goto error; } /* end if */ #endif /* H5_HAVE_FILTER_DEFLATE */ @@ -3152,8 +3152,8 @@ test_onebyte_shuffle(hid_t file) for (j = 0; j < (size_t)size[1]; j++) { if (new_data[i][j] != orig_data[i][j]) { H5_FAILED(); - HDprintf(" Read different values than written.\n"); - HDprintf(" At index %lu,%lu\n", (unsigned long)i, (unsigned long)j); + printf(" Read different values than written.\n"); + printf(" At index %lu,%lu\n", (unsigned long)i, (unsigned long)j); goto error; } } @@ -3275,8 +3275,8 @@ test_nbit_int(hid_t file) for (j = 0; j < (size_t)size[1]; j++) { if (((unsigned)new_data[i][j] & mask) != ((unsigned)orig_data[i][j] & mask)) { H5_FAILED(); - HDprintf(" Read different values than written.\n"); - HDprintf(" At index %lu,%lu\n", (unsigned long)i, (unsigned long)j); + printf(" Read different values than written.\n"); + printf(" At index %lu,%lu\n", (unsigned long)i, (unsigned long)j); goto error; } } @@ -3394,8 +3394,8 @@ test_nbit_float(hid_t file) continue; /* skip if value is NaN */ if (!H5_FLT_ABS_EQUAL(new_data[i][j], orig_data[i][j])) { H5_FAILED(); - HDprintf(" Read different values than written.\n"); - HDprintf(" At index %lu,%lu\n", (unsigned long)i, (unsigned long)j); + printf(" Read different values than written.\n"); + printf(" At index %lu,%lu\n", (unsigned long)i, (unsigned long)j); goto error; } } @@ -3516,8 +3516,8 @@ test_nbit_double(hid_t file) continue; /* skip if value is NaN */ if (!H5_DBL_ABS_EQUAL(new_data[i][j], orig_data[i][j])) { H5_FAILED(); - HDprintf(" Read different values than written.\n"); - HDprintf(" At index %lu,%lu\n", (unsigned long)i, (unsigned long)j); + printf(" Read different values than written.\n"); + printf(" At index %lu,%lu\n", (unsigned long)i, (unsigned long)j); goto error; } } @@ -3649,9 +3649,9 @@ test_nbit_array(hid_t file) for (n = 0; n < (size_t)adims[1]; n++) { if (new_data[i][j][m][n] != orig_data[i][j][m][n]) { H5_FAILED(); - HDprintf(" Read different values than written.\n"); - HDprintf(" At index %lu,%lu,%lu,%lu\n", (unsigned long)i, (unsigned long)j, - (unsigned long)m, (unsigned long)n); + printf(" Read different values than written.\n"); + printf(" At index %lu,%lu,%lu,%lu\n", (unsigned long)i, (unsigned long)j, + (unsigned long)m, (unsigned long)n); goto error; } } @@ -3860,8 +3860,8 @@ test_nbit_compound(hid_t file) ((unsigned)new_data[i][j].s & s_mask) != ((unsigned)orig_data[i][j].s & s_mask) || (!HDisnan(orig_data[i][j].f) && !H5_FLT_ABS_EQUAL(new_data[i][j].f, orig_data[i][j].f))) { H5_FAILED(); - HDprintf(" Read different values than written.\n"); - HDprintf(" At index %lu,%lu\n", (unsigned long)i, (unsigned long)j); + printf(" Read different values than written.\n"); + printf(" At index %lu,%lu\n", (unsigned long)i, (unsigned long)j); goto error; } } @@ -4198,8 +4198,8 @@ out: (!HDisnan(new_data[i][j].a.f) && !H5_FLT_ABS_EQUAL(new_data[i][j].a.f, new_data[i][j].a.f)) || new_data[i][j].v != orig_data[i][j].v || b_failed || d_failed) { H5_FAILED(); - HDprintf(" Read different values than written.\n"); - HDprintf(" At index %lu,%lu\n", (unsigned long)i, (unsigned long)j); + printf(" Read different values than written.\n"); + printf(" At index %lu,%lu\n", (unsigned long)i, (unsigned long)j); goto error; } } @@ -4348,12 +4348,12 @@ test_nbit_compound_3(hid_t file) /* Initialize data */ for (i = 0; i < (size_t)size[0]; i++) { power = HDpow(2.0, 17.0 - 1.0); - HDmemset(&orig_data[i], 0, sizeof(orig_data[i])); + memset(&orig_data[i], 0, sizeof(orig_data[i])); orig_data[i].i = (int)(HDrandom() % (long)power); HDstrcpy(orig_data[i].str, "fixed-length C string"); orig_data[i].vl_str = HDstrdup("variable-length C string"); - orig_data[i].v.p = HDmalloc((size_t)(i + 1) * sizeof(unsigned int)); + orig_data[i].v.p = malloc((size_t)(i + 1) * sizeof(unsigned int)); orig_data[i].v.len = (size_t)i + 1; for (k = 0; k < (i + 1); k++) ((unsigned int *)orig_data[i].v.p)[k] = (unsigned int)(i * 100 + k); @@ -4395,24 +4395,24 @@ test_nbit_compound_3(hid_t file) HDstrcmp(new_data[i].vl_str, orig_data[i].vl_str) != 0 || new_data[i].v.len != orig_data[i].v.len || new_data[i].r != orig_data[i].r) { H5_FAILED(); - HDprintf(" Read different values than written.\n"); - HDprintf(" At index %lu\n", (unsigned long)i); + printf(" Read different values than written.\n"); + printf(" At index %lu\n", (unsigned long)i); goto error; } for (k = 0; k < i + 1; k++) if (((unsigned int *)orig_data[i].v.p)[k] != ((unsigned int *)new_data[i].v.p)[k]) { H5_FAILED(); - HDprintf(" Read different values than written.\n"); - HDprintf(" At index %lu\n", (unsigned long)i); + printf(" Read different values than written.\n"); + printf(" At index %lu\n", (unsigned long)i); goto error; } for (j = 0; j < 5; j++) if (orig_data[i].o[j] != new_data[i].o[j]) { H5_FAILED(); - HDprintf(" Read different values than written.\n"); - HDprintf(" At index %lu\n", (unsigned long)i); + printf(" Read different values than written.\n"); + printf(" At index %lu\n", (unsigned long)i); goto error; } } @@ -4483,9 +4483,9 @@ test_nbit_int_size(hid_t file) TESTING(" nbit integer dataset size"); /* Set up data array */ - if (NULL == (orig_data = (int *)HDcalloc(DSET_DIM1 * DSET_DIM2, sizeof(int)))) + if (NULL == (orig_data = (int *)calloc(DSET_DIM1 * DSET_DIM2, sizeof(int)))) TEST_ERROR; - if (NULL == (orig = (int **)HDcalloc(DSET_DIM1, sizeof(orig_data)))) + if (NULL == (orig = (int **)calloc(DSET_DIM1, sizeof(orig_data)))) TEST_ERROR; for (i = 0; i < DSET_DIM1; i++) orig[i] = orig_data + (i * DSET_DIM2); @@ -4493,41 +4493,41 @@ test_nbit_int_size(hid_t file) /* Define dataset datatype (integer), and set precision, offset */ if ((datatype = H5Tcopy(H5T_NATIVE_INT)) < 0) { H5_FAILED(); - HDprintf(" line %d: H5Tcopy failed\n", __LINE__); + printf(" line %d: H5Tcopy failed\n", __LINE__); goto error; } precision = 16; /* precision includes sign bit */ if (H5Tset_precision(datatype, precision) < 0) { H5_FAILED(); - HDprintf(" line %d: H5Pset_precision failed\n", __LINE__); + printf(" line %d: H5Pset_precision failed\n", __LINE__); goto error; } offset = 8; if (H5Tset_offset(datatype, offset) < 0) { H5_FAILED(); - HDprintf(" line %d: H5Tset_offset failed\n", __LINE__); + printf(" line %d: H5Tset_offset failed\n", __LINE__); goto error; } /* Copy to memory datatype */ if ((mem_datatype = H5Tcopy(datatype)) < 0) { H5_FAILED(); - HDprintf(" line %d: H5Tcopy failed\n", __LINE__); + printf(" line %d: H5Tcopy failed\n", __LINE__); goto error; } /* Set order of dataset datatype */ if (H5Tset_order(datatype, H5T_ORDER_BE) < 0) { H5_FAILED(); - HDprintf(" line %d: H5Pset_order failed\n", __LINE__); + printf(" line %d: H5Pset_order failed\n", __LINE__); goto error; } if (H5Tset_size(datatype, 4) < 0) { H5_FAILED(); - HDprintf(" line %d: H5Pset_size failed\n", __LINE__); + printf(" line %d: H5Pset_size failed\n", __LINE__); goto error; } @@ -4545,7 +4545,7 @@ test_nbit_int_size(hid_t file) dims[1] = DSET_DIM2; if ((dataspace = H5Screate_simple(2, dims, NULL)) < 0) { H5_FAILED(); - HDprintf(" line %d: H5Pcreate failed\n", __LINE__); + printf(" line %d: H5Pcreate failed\n", __LINE__); goto error; } @@ -4556,13 +4556,13 @@ test_nbit_int_size(hid_t file) chunk_size[1] = DSET_DIM2 / 10; if ((dset_create_props = H5Pcreate(H5P_DATASET_CREATE)) < 0) { H5_FAILED(); - HDprintf(" line %d: H5Pcreate failed\n", __LINE__); + printf(" line %d: H5Pcreate failed\n", __LINE__); goto error; } if (H5Pset_chunk(dset_create_props, 2, chunk_size) < 0) { H5_FAILED(); - HDprintf(" line %d: H5Pset_chunk failed\n", __LINE__); + printf(" line %d: H5Pset_chunk failed\n", __LINE__); goto error; } @@ -4571,7 +4571,7 @@ test_nbit_int_size(hid_t file) */ if (H5Pset_nbit(dset_create_props) < 0) { H5_FAILED(); - HDprintf(" line %d: H5Pset_nbit failed\n", __LINE__); + printf(" line %d: H5Pset_nbit failed\n", __LINE__); goto error; } @@ -4581,7 +4581,7 @@ test_nbit_int_size(hid_t file) if ((dataset = H5Dcreate2(file, DSET_NBIT_INT_SIZE_NAME, datatype, dataspace, H5P_DEFAULT, dset_create_props, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" line %d: H5dwrite failed\n", __LINE__); + printf(" line %d: H5dwrite failed\n", __LINE__); goto error; } @@ -4590,7 +4590,7 @@ test_nbit_int_size(hid_t file) */ if (H5Dwrite(dataset, mem_datatype, H5S_ALL, H5S_ALL, H5P_DEFAULT, orig_data) < 0) { H5_FAILED(); - HDprintf(" Line %d: H5Dwrite failed\n", __LINE__); + printf(" Line %d: H5Dwrite failed\n", __LINE__); goto error; } @@ -4599,7 +4599,7 @@ test_nbit_int_size(hid_t file) */ if ((precision = H5Tget_precision(datatype)) == 0) { H5_FAILED(); - HDprintf(" Line %d: wrong precision size: %zu\n", __LINE__, precision); + printf(" Line %d: wrong precision size: %zu\n", __LINE__, precision); goto error; } @@ -4609,7 +4609,7 @@ test_nbit_int_size(hid_t file) if ((dset_size = H5Dget_storage_size(dataset)) < DSET_DIM1 * DSET_DIM2 * (precision / 8) || dset_size > DSET_DIM1 * DSET_DIM2 * (precision / 8) + 1 * KB) { H5_FAILED(); - HDfprintf(stdout, " Line %d: wrong dataset size: %" PRIuHSIZE "\n", __LINE__, dset_size); + fprintf(stdout, " Line %d: wrong dataset size: %" PRIuHSIZE "\n", __LINE__, dset_size); goto error; } @@ -4619,16 +4619,16 @@ test_nbit_int_size(hid_t file) H5Sclose(dataspace); H5Pclose(dset_create_props); - HDfree(orig); - HDfree(orig_data); + free(orig); + free(orig_data); PASSED(); return SUCCEED; error: - HDfree(orig); - HDfree(orig_data); + free(orig); + free(orig_data); return FAIL; } /* end test_nbit_int_size() */ @@ -4663,9 +4663,9 @@ test_nbit_flt_size(hid_t file) TESTING(" nbit floating-number dataset size"); /* Set up data array */ - if (NULL == (orig_data = (float *)HDcalloc(DSET_DIM1 * DSET_DIM2, sizeof(float)))) + if (NULL == (orig_data = (float *)calloc(DSET_DIM1 * DSET_DIM2, sizeof(float)))) TEST_ERROR; - if (NULL == (orig = (float **)HDcalloc(DSET_DIM1, sizeof(orig_data)))) + if (NULL == (orig = (float **)calloc(DSET_DIM1, sizeof(orig_data)))) TEST_ERROR; for (i = 0; i < DSET_DIM1; i++) orig[i] = orig_data + (i * DSET_DIM2); @@ -4694,7 +4694,7 @@ test_nbit_flt_size(hid_t file) *-------------------------------------------------------------------*/ if ((datatype = H5Tcopy(H5T_IEEE_F32LE)) < 0) { H5_FAILED(); - HDprintf(" line %d: H5Tcopy failed\n", __LINE__); + printf(" line %d: H5Tcopy failed\n", __LINE__); goto error; } /* end if */ @@ -4708,38 +4708,38 @@ test_nbit_flt_size(hid_t file) if (H5Tset_fields(datatype, spos, epos, esize, mpos, msize) < 0) { H5_FAILED(); - HDprintf(" line %d: H5Tset_fields failed\n", __LINE__); + printf(" line %d: H5Tset_fields failed\n", __LINE__); goto error; } /* end if */ if (H5Tset_offset(datatype, offset) < 0) { H5_FAILED(); - HDprintf(" line %d: H5Tset_offset failed\n", __LINE__); + printf(" line %d: H5Tset_offset failed\n", __LINE__); goto error; } /* end if */ if (H5Tset_precision(datatype, precision) < 0) { H5_FAILED(); - HDprintf(" line %d: H5Tset_precision failed\n", __LINE__); + printf(" line %d: H5Tset_precision failed\n", __LINE__); goto error; } /* end if */ if (H5Tset_size(datatype, 4) < 0) { H5_FAILED(); - HDprintf(" line %d: H5Pset_size failed\n", __LINE__); + printf(" line %d: H5Pset_size failed\n", __LINE__); goto error; } /* end if */ /* Set order of dataset datatype */ if (H5Tset_order(datatype, H5T_ORDER_BE) < 0) { H5_FAILED(); - HDprintf(" line %d: H5Pset_order failed\n", __LINE__); + printf(" line %d: H5Pset_order failed\n", __LINE__); goto error; } /* end if */ if (H5Tset_ebias(datatype, 31) < 0) { H5_FAILED(); - HDprintf(" line %d: H5Pset_size failed\n", __LINE__); + printf(" line %d: H5Pset_size failed\n", __LINE__); goto error; } /* end if */ @@ -4755,7 +4755,7 @@ test_nbit_flt_size(hid_t file) dims[1] = DSET_DIM2; if ((dataspace = H5Screate_simple(2, dims, NULL)) < 0) { H5_FAILED(); - HDprintf(" line %d: H5Pcreate failed\n", __LINE__); + printf(" line %d: H5Pcreate failed\n", __LINE__); goto error; } /* end if */ @@ -4766,13 +4766,13 @@ test_nbit_flt_size(hid_t file) chunk_size[1] = DSET_DIM2 / 10; if ((dset_create_props = H5Pcreate(H5P_DATASET_CREATE)) < 0) { H5_FAILED(); - HDprintf(" line %d: H5Pcreate failed\n", __LINE__); + printf(" line %d: H5Pcreate failed\n", __LINE__); goto error; } /* end if */ if (H5Pset_chunk(dset_create_props, 2, chunk_size) < 0) { H5_FAILED(); - HDprintf(" line %d: H5Pset_chunk failed\n", __LINE__); + printf(" line %d: H5Pset_chunk failed\n", __LINE__); goto error; } /* end if */ @@ -4781,7 +4781,7 @@ test_nbit_flt_size(hid_t file) */ if (H5Pset_nbit(dset_create_props) < 0) { H5_FAILED(); - HDprintf(" line %d: H5Pset_nbit failed\n", __LINE__); + printf(" line %d: H5Pset_nbit failed\n", __LINE__); goto error; } /* end if */ @@ -4791,7 +4791,7 @@ test_nbit_flt_size(hid_t file) if ((dataset = H5Dcreate2(file, DSET_NBIT_FLT_SIZE_NAME, datatype, dataspace, H5P_DEFAULT, dset_create_props, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" line %d: H5dwrite failed\n", __LINE__); + printf(" line %d: H5dwrite failed\n", __LINE__); goto error; } /* end if */ @@ -4800,7 +4800,7 @@ test_nbit_flt_size(hid_t file) */ if (H5Dwrite(dataset, H5T_NATIVE_FLOAT, H5S_ALL, H5S_ALL, H5P_DEFAULT, orig_data) < 0) { H5_FAILED(); - HDprintf(" Line %d: H5Dwrite failed\n", __LINE__); + printf(" Line %d: H5Dwrite failed\n", __LINE__); goto error; } /* end if */ @@ -4809,7 +4809,7 @@ test_nbit_flt_size(hid_t file) */ if ((precision = H5Tget_precision(datatype)) == 0) { H5_FAILED(); - HDprintf(" Line %d: wrong precision size: %zu\n", __LINE__, precision); + printf(" Line %d: wrong precision size: %zu\n", __LINE__, precision); goto error; } /* end if */ @@ -4819,7 +4819,7 @@ test_nbit_flt_size(hid_t file) if ((dset_size = H5Dget_storage_size(dataset)) < DSET_DIM1 * DSET_DIM2 * (precision / 8) || dset_size > DSET_DIM1 * DSET_DIM2 * (precision / 8) + 1 * KB) { H5_FAILED(); - HDfprintf(stdout, " Line %d: wrong dataset size: %" PRIuHSIZE "\n", __LINE__, dset_size); + fprintf(stdout, " Line %d: wrong dataset size: %" PRIuHSIZE "\n", __LINE__, dset_size); goto error; } /* end if */ @@ -4830,13 +4830,13 @@ test_nbit_flt_size(hid_t file) PASSED(); - HDfree(orig); - HDfree(orig_data); + free(orig); + free(orig_data); return SUCCEED; error: - HDfree(orig); - HDfree(orig_data); + free(orig); + free(orig_data); return FAIL; } /* end test_nbit_flt_size() */ @@ -4936,8 +4936,8 @@ test_scaleoffset_int(hid_t file) for (j = 0; j < (size_t)size[1]; j++) { if (new_data[i][j] != orig_data[i][j]) { H5_FAILED(); - HDprintf(" Read different values than written.\n"); - HDprintf(" At index %lu,%lu\n", (unsigned long)i, (unsigned long)j); + printf(" Read different values than written.\n"); + printf(" At index %lu,%lu\n", (unsigned long)i, (unsigned long)j); goto error; } } @@ -5080,8 +5080,8 @@ test_scaleoffset_int_2(hid_t file) for (j = 0; j < (size_t)size[1]; j++) { if (new_data[0][j] != orig_data[0][j]) { H5_FAILED(); - HDprintf(" Read different values than written.\n"); - HDprintf(" At index %lu,%lu\n", (unsigned long)0, (unsigned long)j); + printf(" Read different values than written.\n"); + printf(" At index %lu,%lu\n", (unsigned long)0, (unsigned long)j); goto error; } } @@ -5202,8 +5202,8 @@ test_scaleoffset_float(hid_t file) for (j = 0; j < (size_t)size[1]; j++) { if (HDfabs((double)(new_data[i][j] - orig_data[i][j])) > HDpow(10.0, -3.0)) { H5_FAILED(); - HDprintf(" Read different values than written.\n"); - HDprintf(" At index %lu,%lu\n", (unsigned long)i, (unsigned long)j); + printf(" Read different values than written.\n"); + printf(" At index %lu,%lu\n", (unsigned long)i, (unsigned long)j); goto error; } } @@ -5348,8 +5348,8 @@ test_scaleoffset_float_2(hid_t file) for (j = 0; j < (size_t)size[1]; j++) { if (HDfabs((double)(new_data[0][j] - orig_data[0][j])) > HDpow(10.0, -3.0)) { H5_FAILED(); - HDprintf(" Read different values than written.\n"); - HDprintf(" At index %lu,%lu\n", (unsigned long)0, (unsigned long)j); + printf(" Read different values than written.\n"); + printf(" At index %lu,%lu\n", (unsigned long)0, (unsigned long)j); goto error; } } @@ -5469,8 +5469,8 @@ test_scaleoffset_double(hid_t file) for (j = 0; j < (size_t)size[1]; j++) { if (HDfabs(new_data[i][j] - orig_data[i][j]) > HDpow(10.0, -7.0)) { H5_FAILED(); - HDprintf(" Read different values than written.\n"); - HDprintf(" At index %lu,%lu\n", (unsigned long)i, (unsigned long)j); + printf(" Read different values than written.\n"); + printf(" At index %lu,%lu\n", (unsigned long)i, (unsigned long)j); goto error; } } @@ -5615,8 +5615,8 @@ test_scaleoffset_double_2(hid_t file) for (j = 0; j < (size_t)size[1]; j++) { if (HDfabs((double)(new_data[0][j] - orig_data[0][j])) > HDpow(10.0, -7.0)) { H5_FAILED(); - HDprintf(" Read different values than written.\n"); - HDprintf(" At index %lu,%lu\n", (unsigned long)0, (unsigned long)j); + printf(" Read different values than written.\n"); + printf(" At index %lu,%lu\n", (unsigned long)0, (unsigned long)j); goto error; } } @@ -5694,7 +5694,7 @@ test_multiopen(hid_t file) goto error; if (cur_size[0] != tmp_size[0]) { H5_FAILED(); - HDprintf(" Got %d instead of %d!\n", (int)tmp_size[0], (int)cur_size[0]); + printf(" Got %d instead of %d!\n", (int)tmp_size[0], (int)cur_size[0]); goto error; } /* end if */ @@ -5874,30 +5874,30 @@ test_can_apply(hid_t file) /* Create dcpl with special filter */ if ((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0) { H5_FAILED(); - HDprintf(" Line %d: Can't create dcpl\n", __LINE__); + printf(" Line %d: Can't create dcpl\n", __LINE__); goto error; } /* end if */ if (H5Pset_chunk(dcpl, 2, chunk_dims) < 0) { H5_FAILED(); - HDprintf(" Line %d: Can't set chunk sizes\n", __LINE__); + printf(" Line %d: Can't set chunk sizes\n", __LINE__); goto error; } /* end if */ if (H5Zregister(H5Z_CAN_APPLY_TEST) < 0) { H5_FAILED(); - HDprintf(" Line %d: Can't register 'can apply' filter\n", __LINE__); + printf(" Line %d: Can't register 'can apply' filter\n", __LINE__); goto error; } /* The filter is mandate. */ if (H5Pset_filter(dcpl, H5Z_FILTER_CAN_APPLY_TEST, 0, (size_t)0, NULL) < 0) { H5_FAILED(); - HDprintf(" Line %d: Can't set bogus filter\n", __LINE__); + printf(" Line %d: Can't set bogus filter\n", __LINE__); goto error; } /* Create the data space */ if ((sid = H5Screate_simple(2, dims, NULL)) < 0) { H5_FAILED(); - HDprintf(" Line %d: Can't open dataspace\n", __LINE__); + printf(" Line %d: Can't open dataspace\n", __LINE__); goto error; } /* end if */ @@ -5911,7 +5911,7 @@ test_can_apply(hid_t file) H5E_END_TRY; if (dsid >= 0) { H5_FAILED(); - HDprintf(" Line %d: Shouldn't have created dataset!\n", __LINE__); + printf(" Line %d: Shouldn't have created dataset!\n", __LINE__); H5Dclose(dsid); goto error; } /* end if */ @@ -5924,7 +5924,7 @@ test_can_apply(hid_t file) H5E_END_TRY; if (dsid >= 0) { H5_FAILED(); - HDprintf(" Line %d: Shouldn't have created dataset!\n", __LINE__); + printf(" Line %d: Shouldn't have created dataset!\n", __LINE__); H5Dclose(dsid); goto error; } /* end if */ @@ -5933,42 +5933,42 @@ test_can_apply(hid_t file) if ((dsid = H5Dcreate2(file, DSET_CAN_APPLY_NAME, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" Line %d: Can't create dataset\n", __LINE__); + printf(" Line %d: Can't create dataset\n", __LINE__); goto error; } /* end if */ /* Write data */ if (H5Dwrite(dsid, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, points_data) < 0) { H5_FAILED(); - HDprintf(" Line %d: Error writing dataset data\n", __LINE__); + printf(" Line %d: Error writing dataset data\n", __LINE__); goto error; } /* end if */ /* Flush the file (to clear the cache) */ if (H5Fflush(file, H5F_SCOPE_GLOBAL) < 0) { H5_FAILED(); - HDprintf(" Line %d: Error flushing file\n", __LINE__); + printf(" Line %d: Error flushing file\n", __LINE__); goto error; } /* end if */ /* Query the dataset's size on disk */ if ((dset_size = H5Dget_storage_size(dsid)) == 0) { H5_FAILED(); - HDprintf(" Line %d: Error querying dataset size\n", __LINE__); + printf(" Line %d: Error querying dataset size\n", __LINE__); goto error; } /* end if */ /* Verify that the size indicates data is uncompressed */ if ((H5Tget_size(H5T_NATIVE_INT) * dims[0] * dims[1]) != dset_size) { H5_FAILED(); - HDprintf(" Line %d: Incorrect dataset size: %lu\n", __LINE__, (unsigned long)dset_size); + printf(" Line %d: Incorrect dataset size: %lu\n", __LINE__, (unsigned long)dset_size); goto error; } /* end if */ /* Read data */ if (H5Dread(dsid, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, check_data) < 0) { H5_FAILED(); - HDprintf(" Line %d: Error reading dataset data\n", __LINE__); + printf(" Line %d: Error reading dataset data\n", __LINE__); goto error; } /* end if */ @@ -5978,10 +5978,10 @@ test_can_apply(hid_t file) for (j = 0; j < (size_t)dims[1]; j++) { if (points[i][j] != check[i][j]) { H5_FAILED(); - HDprintf(" Line %d: Read different values than written.\n", __LINE__); - HDprintf(" At index %lu,%lu\n", (unsigned long)(i), (unsigned long)(j)); - HDprintf(" At original: %d\n", points[i][j]); - HDprintf(" At returned: %d\n", check[i][j]); + printf(" Line %d: Read different values than written.\n", __LINE__); + printf(" At index %lu,%lu\n", (unsigned long)(i), (unsigned long)(j)); + printf(" At original: %d\n", points[i][j]); + printf(" At returned: %d\n", check[i][j]); goto error; } /* end if */ } /* end for */ @@ -5990,21 +5990,21 @@ test_can_apply(hid_t file) /* Close dataset */ if (H5Dclose(dsid) < 0) { H5_FAILED(); - HDprintf(" Line %d: Can't close dataset\n", __LINE__); + printf(" Line %d: Can't close dataset\n", __LINE__); goto error; } /* end if */ /* Close dataspace */ if (H5Sclose(sid) < 0) { H5_FAILED(); - HDprintf(" Line %d: Can't close dataspace\n", __LINE__); + printf(" Line %d: Can't close dataspace\n", __LINE__); goto error; } /* end if */ /* Close dataset creation property list */ if (H5Pclose(dcpl) < 0) { H5_FAILED(); - HDprintf(" Line %d: Can't close dcpl\n", __LINE__); + printf(" Line %d: Can't close dcpl\n", __LINE__); goto error; } /* end if */ @@ -6058,30 +6058,30 @@ test_can_apply2(hid_t file) /* Create dcpl with special filter */ if ((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0) { H5_FAILED(); - HDprintf(" Line %d: Can't create dcpl\n", __LINE__); + printf(" Line %d: Can't create dcpl\n", __LINE__); goto error; } /* end if */ if (H5Pset_chunk(dcpl, 2, chunk_dims) < 0) { H5_FAILED(); - HDprintf(" Line %d: Can't set chunk sizes\n", __LINE__); + printf(" Line %d: Can't set chunk sizes\n", __LINE__); goto error; } /* end if */ if (H5Zregister(H5Z_CAN_APPLY_TEST2) < 0) { H5_FAILED(); - HDprintf(" Line %d: Can't register 'can apply' filter\n", __LINE__); + printf(" Line %d: Can't register 'can apply' filter\n", __LINE__); goto error; } /* The filter is optional. */ if (H5Pset_filter(dcpl, H5Z_FILTER_CAN_APPLY_TEST2, H5Z_FLAG_OPTIONAL, (size_t)0, NULL) < 0) { H5_FAILED(); - HDprintf(" Line %d: Can't set bogus filter\n", __LINE__); + printf(" Line %d: Can't set bogus filter\n", __LINE__); goto error; } /* Create the data space */ if ((sid = H5Screate_simple(2, dims, NULL)) < 0) { H5_FAILED(); - HDprintf(" Line %d: Can't open dataspace\n", __LINE__); + printf(" Line %d: Can't open dataspace\n", __LINE__); goto error; } /* end if */ @@ -6089,42 +6089,42 @@ test_can_apply2(hid_t file) if ((dsid = H5Dcreate2(file, DSET_CAN_APPLY_NAME2, H5T_NATIVE_DOUBLE, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" Line %d: Can't create dataset\n", __LINE__); + printf(" Line %d: Can't create dataset\n", __LINE__); goto error; } /* end if */ /* Write data */ if (H5Dwrite(dsid, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, points_data) < 0) { H5_FAILED(); - HDprintf(" Line %d: Error writing dataset data\n", __LINE__); + printf(" Line %d: Error writing dataset data\n", __LINE__); goto error; } /* end if */ /* Flush the file (to clear the cache) */ if (H5Fflush(file, H5F_SCOPE_GLOBAL) < 0) { H5_FAILED(); - HDprintf(" Line %d: Error flushing file\n", __LINE__); + printf(" Line %d: Error flushing file\n", __LINE__); goto error; } /* end if */ /* Query the dataset's size on disk */ if ((dset_size = H5Dget_storage_size(dsid)) == 0) { H5_FAILED(); - HDprintf(" Line %d: Error querying dataset size\n", __LINE__); + printf(" Line %d: Error querying dataset size\n", __LINE__); goto error; } /* end if */ /* Verify that the size indicates data is uncompressed */ if ((H5Tget_size(H5T_NATIVE_DOUBLE) * dims[0] * dims[1]) != dset_size) { H5_FAILED(); - HDprintf(" Line %d: Incorrect dataset size: %lu\n", __LINE__, (unsigned long)dset_size); + printf(" Line %d: Incorrect dataset size: %lu\n", __LINE__, (unsigned long)dset_size); goto error; } /* end if */ /* Read data */ if (H5Dread(dsid, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, check_data) < 0) { H5_FAILED(); - HDprintf(" Line %d: Error reading dataset data\n", __LINE__); + printf(" Line %d: Error reading dataset data\n", __LINE__); goto error; } /* end if */ @@ -6134,10 +6134,10 @@ test_can_apply2(hid_t file) for (j = 0; j < (size_t)dims[1]; j++) { if (points[i][j] != check[i][j]) { H5_FAILED(); - HDprintf(" Line %d: Read different values than written.\n", __LINE__); - HDprintf(" At index %lu,%lu\n", (unsigned long)(i), (unsigned long)(j)); - HDprintf(" At original: %d\n", points[i][j]); - HDprintf(" At returned: %d\n", check[i][j]); + printf(" Line %d: Read different values than written.\n", __LINE__); + printf(" At index %lu,%lu\n", (unsigned long)(i), (unsigned long)(j)); + printf(" At original: %d\n", points[i][j]); + printf(" At returned: %d\n", check[i][j]); goto error; } /* end if */ } /* end for */ @@ -6146,21 +6146,21 @@ test_can_apply2(hid_t file) /* Close dataset */ if (H5Dclose(dsid) < 0) { H5_FAILED(); - HDprintf(" Line %d: Can't close dataset\n", __LINE__); + printf(" Line %d: Can't close dataset\n", __LINE__); goto error; } /* end if */ /* Close dataspace */ if (H5Sclose(sid) < 0) { H5_FAILED(); - HDprintf(" Line %d: Can't close dataspace\n", __LINE__); + printf(" Line %d: Can't close dataspace\n", __LINE__); goto error; } /* end if */ /* Close dataset creation property list */ if (H5Pclose(dcpl) < 0) { H5_FAILED(); - HDprintf(" Line %d: Can't close dcpl\n", __LINE__); + printf(" Line %d: Can't close dcpl\n", __LINE__); goto error; } /* end if */ @@ -6322,19 +6322,19 @@ test_can_apply_szip(hid_t /* Create the data space */ if ((sid = H5Screate_simple(2, dims, NULL)) < 0) { H5_FAILED(); - HDprintf(" Line %d: Can't open dataspace\n", __LINE__); + printf(" Line %d: Can't open dataspace\n", __LINE__); goto error; } /* end if */ /* Create dcpl with special filter */ if ((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0) { H5_FAILED(); - HDprintf(" Line %d: Can't create dcpl\n", __LINE__); + printf(" Line %d: Can't create dcpl\n", __LINE__); goto error; } /* end if */ if (H5Pset_chunk(dcpl, 2, chunk_dims) < 0) { H5_FAILED(); - HDprintf(" Line %d: Can't set chunk sizes\n", __LINE__); + printf(" Line %d: Can't set chunk sizes\n", __LINE__); goto error; } /* end if */ @@ -6347,7 +6347,7 @@ test_can_apply_szip(hid_t H5E_END_TRY; if (ret >= 0) { H5_FAILED(); - HDprintf(" Line %d: Shouldn't be able to set szip filter\n", __LINE__); + printf(" Line %d: Shouldn't be able to set szip filter\n", __LINE__); goto error; } @@ -6360,7 +6360,7 @@ test_can_apply_szip(hid_t H5E_END_TRY; if (ret >= 0) { H5_FAILED(); - HDprintf(" Line %d: Shouldn't be able to set szip filter\n", __LINE__); + printf(" Line %d: Shouldn't be able to set szip filter\n", __LINE__); goto error; } @@ -6368,7 +6368,7 @@ test_can_apply_szip(hid_t szip_pixels_per_block = 2; if (H5Pset_szip(dcpl, szip_options_mask, szip_pixels_per_block) < 0) { H5_FAILED(); - HDprintf(" Line %d: Can't set szip filter\n", __LINE__); + printf(" Line %d: Can't set szip filter\n", __LINE__); goto error; } @@ -6383,47 +6383,47 @@ test_can_apply_szip(hid_t H5E_END_TRY; if (dsid <= 0) { H5_FAILED(); - HDprintf(" Line %d: Should have created dataset!\n", __LINE__); + printf(" Line %d: Should have created dataset!\n", __LINE__); goto error; } /* end if */ /* Close dataset */ if (H5Dclose(dsid) < 0) { H5_FAILED(); - HDprintf(" Line %d: Can't close dataset\n", __LINE__); + printf(" Line %d: Can't close dataset\n", __LINE__); goto error; } /* end if */ /* Close dataspace */ if (H5Sclose(sid) < 0) { H5_FAILED(); - HDprintf(" Line %d: Can't close dataspace\n", __LINE__); + printf(" Line %d: Can't close dataspace\n", __LINE__); goto error; } /* end if */ /* Close dataset creation property list */ if (H5Pclose(dcpl) < 0) { H5_FAILED(); - HDprintf(" Line %d: Can't close dcpl\n", __LINE__); + printf(" Line %d: Can't close dcpl\n", __LINE__); goto error; } /* end if */ /* Create another data space */ if ((sid = H5Screate_simple(2, dims2, NULL)) < 0) { H5_FAILED(); - HDprintf(" Line %d: Can't open dataspace\n", __LINE__); + printf(" Line %d: Can't open dataspace\n", __LINE__); goto error; } /* end if */ /* Create dcpl with special filter */ if ((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0) { H5_FAILED(); - HDprintf(" Line %d: Can't create dcpl\n", __LINE__); + printf(" Line %d: Can't create dcpl\n", __LINE__); goto error; } /* end if */ if (H5Pset_chunk(dcpl, 2, chunk_dims2) < 0) { H5_FAILED(); - HDprintf(" Line %d: Can't set chunk sizes\n", __LINE__); + printf(" Line %d: Can't set chunk sizes\n", __LINE__); goto error; } /* end if */ @@ -6431,7 +6431,7 @@ test_can_apply_szip(hid_t szip_pixels_per_block = 32; if (H5Pset_szip(dcpl, szip_options_mask, szip_pixels_per_block) < 0) { H5_FAILED(); - HDprintf(" Line %d: Can't set szip filter\n", __LINE__); + printf(" Line %d: Can't set szip filter\n", __LINE__); goto error; } @@ -6445,7 +6445,7 @@ test_can_apply_szip(hid_t H5E_END_TRY; if (dsid >= 0) { H5_FAILED(); - HDprintf(" Line %d: Shouldn't have created dataset!\n", __LINE__); + printf(" Line %d: Shouldn't have created dataset!\n", __LINE__); H5Dclose(dsid); goto error; } /* end if */ @@ -6453,14 +6453,14 @@ test_can_apply_szip(hid_t /* Close dataspace */ if (H5Sclose(sid) < 0) { H5_FAILED(); - HDprintf(" Line %d: Can't close dataspace\n", __LINE__); + printf(" Line %d: Can't close dataspace\n", __LINE__); goto error; } /* end if */ /* Close dataset creation property list */ if (H5Pclose(dcpl) < 0) { H5_FAILED(); - HDprintf(" Line %d: Can't close dcpl\n", __LINE__); + printf(" Line %d: Can't close dcpl\n", __LINE__); goto error; } /* end if */ @@ -6534,36 +6534,36 @@ test_set_local(hid_t fapl) /* Open file */ if ((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) { H5_FAILED(); - HDprintf(" Line %d: Can't open file\n", __LINE__); + printf(" Line %d: Can't open file\n", __LINE__); goto error; } /* Create dcpl with special filter */ if ((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0) { H5_FAILED(); - HDprintf(" Line %d: Can't create dcpl\n", __LINE__); + printf(" Line %d: Can't create dcpl\n", __LINE__); goto error; } /* end if */ if (H5Pset_chunk(dcpl, 2, chunk_dims) < 0) { H5_FAILED(); - HDprintf(" Line %d: Can't set chunk sizes\n", __LINE__); + printf(" Line %d: Can't set chunk sizes\n", __LINE__); goto error; } /* end if */ if (H5Zregister(H5Z_SET_LOCAL_TEST) < 0) { H5_FAILED(); - HDprintf(" Line %d: Can't register 'set local' filter\n", __LINE__); + printf(" Line %d: Can't register 'set local' filter\n", __LINE__); goto error; } if (H5Pset_filter(dcpl, H5Z_FILTER_SET_LOCAL_TEST, 0, (size_t)BOGUS2_PERM_NPARMS, cd_values) < 0) { H5_FAILED(); - HDprintf(" Line %d: Can't set bogus2 filter\n", __LINE__); + printf(" Line %d: Can't set bogus2 filter\n", __LINE__); goto error; } /* Create the data space */ if ((sid = H5Screate_simple(2, dims, NULL)) < 0) { H5_FAILED(); - HDprintf(" Line %d: Can't open dataspace\n", __LINE__); + printf(" Line %d: Can't open dataspace\n", __LINE__); goto error; } /* end if */ @@ -6571,21 +6571,21 @@ test_set_local(hid_t fapl) if ((dsid = H5Dcreate2(file, DSET_SET_LOCAL_NAME, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" Line %d: Can't create dataset\n", __LINE__); + printf(" Line %d: Can't create dataset\n", __LINE__); goto error; } /* end if */ /* Write data */ if (H5Dwrite(dsid, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, points_data) < 0) { H5_FAILED(); - HDprintf(" Line %d: Error writing dataset data\n", __LINE__); + printf(" Line %d: Error writing dataset data\n", __LINE__); goto error; } /* end if */ /* Close dataset */ if (H5Dclose(dsid) < 0) { H5_FAILED(); - HDprintf(" Line %d: Can't close dataset\n", __LINE__); + printf(" Line %d: Can't close dataset\n", __LINE__); goto error; } /* end if */ @@ -6594,77 +6594,77 @@ test_set_local(hid_t fapl) if ((dsid = H5Dcreate2(file, DSET_SET_LOCAL_NAME_2, H5T_NATIVE_DOUBLE, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" Line %d: Can't create dataset\n", __LINE__); + printf(" Line %d: Can't create dataset\n", __LINE__); goto error; } /* end if */ /* Write data */ if (H5Dwrite(dsid, H5T_NATIVE_DOUBLE, H5S_ALL, H5S_ALL, H5P_DEFAULT, points_dbl_data) < 0) { H5_FAILED(); - HDprintf(" Line %d: Error writing dataset data\n", __LINE__); + printf(" Line %d: Error writing dataset data\n", __LINE__); goto error; } /* end if */ /* Close dataset */ if (H5Dclose(dsid) < 0) { H5_FAILED(); - HDprintf(" Line %d: Can't close dataset\n", __LINE__); + printf(" Line %d: Can't close dataset\n", __LINE__); goto error; } /* end if */ /* Close dataspace */ if (H5Sclose(sid) < 0) { H5_FAILED(); - HDprintf(" Line %d: Can't close dataspace\n", __LINE__); + printf(" Line %d: Can't close dataspace\n", __LINE__); goto error; } /* end if */ /* Close dataset creation property list */ if (H5Pclose(dcpl) < 0) { H5_FAILED(); - HDprintf(" Line %d: Can't close dcpl\n", __LINE__); + printf(" Line %d: Can't close dcpl\n", __LINE__); goto error; } /* end if */ /* Close file (flushes & empties cache) */ if (H5Fclose(file) < 0) { H5_FAILED(); - HDprintf(" Line %d: Can't close file\n", __LINE__); + printf(" Line %d: Can't close file\n", __LINE__); goto error; } /* end if */ /* Open file */ if ((file = H5Fopen(filename, H5F_ACC_RDWR, fapl)) < 0) { H5_FAILED(); - HDprintf(" Line %d: Can't open file\n", __LINE__); + printf(" Line %d: Can't open file\n", __LINE__); goto error; } /* Re-open dataset */ if ((dsid = H5Dopen2(file, DSET_SET_LOCAL_NAME, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" Line %d: Can't open dataset\n", __LINE__); + printf(" Line %d: Can't open dataset\n", __LINE__); goto error; } /* end if */ /* Query the dataset's size on disk */ if ((dset_size = H5Dget_storage_size(dsid)) == 0) { H5_FAILED(); - HDprintf(" Line %d: Error querying dataset size\n", __LINE__); + printf(" Line %d: Error querying dataset size\n", __LINE__); goto error; } /* end if */ /* Verify that the size indicates data is uncompressed */ if ((H5Tget_size(H5T_NATIVE_INT) * dims[0] * dims[1]) != dset_size) { H5_FAILED(); - HDprintf(" Line %d: Incorrect dataset size: %lu\n", __LINE__, (unsigned long)dset_size); + printf(" Line %d: Incorrect dataset size: %lu\n", __LINE__, (unsigned long)dset_size); goto error; } /* end if */ /* Read data */ if (H5Dread(dsid, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, check_data) < 0) { H5_FAILED(); - HDprintf(" Line %d: Error reading dataset data\n", __LINE__); + printf(" Line %d: Error reading dataset data\n", __LINE__); goto error; } /* end if */ @@ -6674,10 +6674,10 @@ test_set_local(hid_t fapl) for (j = 0; j < dims[1]; j++) { if ((points[i][j] + (int)sizeof(int)) != check[i][j]) { H5_FAILED(); - HDprintf(" Line %d: Read different values than written.\n", __LINE__); - HDprintf(" At index %lu,%lu\n", (unsigned long)(i), (unsigned long)(j)); - HDprintf(" At original: %d\n", points[i][j]); - HDprintf(" At returned: %d\n", check[i][j]); + printf(" Line %d: Read different values than written.\n", __LINE__); + printf(" At index %lu,%lu\n", (unsigned long)(i), (unsigned long)(j)); + printf(" At original: %d\n", points[i][j]); + printf(" At returned: %d\n", check[i][j]); goto error; } /* end if */ } /* end for */ @@ -6686,35 +6686,35 @@ test_set_local(hid_t fapl) /* Close dataset */ if (H5Dclose(dsid) < 0) { H5_FAILED(); - HDprintf(" Line %d: Can't close dataset\n", __LINE__); + printf(" Line %d: Can't close dataset\n", __LINE__); goto error; } /* end if */ /* Re-open second dataset */ if ((dsid = H5Dopen2(file, DSET_SET_LOCAL_NAME_2, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf(" Line %d: Can't open dataset\n", __LINE__); + printf(" Line %d: Can't open dataset\n", __LINE__); goto error; } /* end if */ /* Query the dataset's size on disk */ if ((dset_size = H5Dget_storage_size(dsid)) == 0) { H5_FAILED(); - HDprintf(" Line %d: Error querying dataset size\n", __LINE__); + printf(" Line %d: Error querying dataset size\n", __LINE__); goto error; } /* end if */ /* Verify that the size indicates data is uncompressed */ if ((H5Tget_size(H5T_NATIVE_DOUBLE) * dims[0] * dims[1]) != dset_size) { H5_FAILED(); - HDprintf(" Line %d: Incorrect dataset size: %lu\n", __LINE__, (unsigned long)dset_size); + printf(" Line %d: Incorrect dataset size: %lu\n", __LINE__, (unsigned long)dset_size); goto error; } /* end if */ /* Read data */ if (H5Dread(dsid, H5T_NATIVE_DOUBLE, H5S_ALL, H5S_ALL, H5P_DEFAULT, check_dbl_data) < 0) { H5_FAILED(); - HDprintf(" Line %d: Error reading dataset data\n", __LINE__); + printf(" Line %d: Error reading dataset data\n", __LINE__); goto error; } /* end if */ @@ -6726,10 +6726,10 @@ test_set_local(hid_t fapl) * considered not equal. */ if (!H5_DBL_REL_EQUAL(points_dbl[i][j], check_dbl[i][j], 0.00001)) { H5_FAILED(); - HDprintf(" Line %d: Read different values than written.\n", __LINE__); - HDprintf(" At index %lu,%lu\n", (unsigned long)(i), (unsigned long)(j)); - HDprintf(" At original: %f\n", points_dbl[i][j]); - HDprintf(" At returned: %f\n", check_dbl[i][j]); + printf(" Line %d: Read different values than written.\n", __LINE__); + printf(" At index %lu,%lu\n", (unsigned long)(i), (unsigned long)(j)); + printf(" At original: %f\n", points_dbl[i][j]); + printf(" At returned: %f\n", check_dbl[i][j]); goto error; } /* end if */ } /* end for */ @@ -6738,14 +6738,14 @@ test_set_local(hid_t fapl) /* Close dataset */ if (H5Dclose(dsid) < 0) { H5_FAILED(); - HDprintf(" Line %d: Can't close dataset\n", __LINE__); + printf(" Line %d: Can't close dataset\n", __LINE__); goto error; } /* end if */ /* Close file */ if (H5Fclose(file) < 0) { H5_FAILED(); - HDprintf(" Line %d: Can't close file\n", __LINE__); + printf(" Line %d: Can't close file\n", __LINE__); goto error; } /* end if */ @@ -7106,7 +7106,7 @@ test_filter_delete(hid_t file) H5E_END_TRY; if (ret >= 0) { H5_FAILED(); - HDprintf(" Line %d: Shouldn't have deleted filter!\n", __LINE__); + printf(" Line %d: Shouldn't have deleted filter!\n", __LINE__); goto error; } /* end if */ @@ -7118,7 +7118,7 @@ test_filter_delete(hid_t file) H5E_END_TRY; if (ret >= 0) { H5_FAILED(); - HDprintf(" Line %d: Shouldn't have deleted filter!\n", __LINE__); + printf(" Line %d: Shouldn't have deleted filter!\n", __LINE__); goto error; } /* end if */ @@ -7212,7 +7212,7 @@ auxread_fdata(hid_t fid, const char *name) goto error; if ((rank = H5Sget_simple_extent_ndims(space_id)) < 0) goto error; - HDmemset(dims, 0, sizeof dims); + memset(dims, 0, sizeof dims); if (H5Sget_simple_extent_dims(space_id, dims, NULL) < 0) goto error; nelmts = 1; @@ -7224,9 +7224,9 @@ auxread_fdata(hid_t fid, const char *name) goto error; if (nelmts) { - buf = (void *)HDmalloc((size_t)(nelmts * msize)); + buf = (void *)malloc((size_t)(nelmts * msize)); if (buf == NULL) { - HDprintf("cannot read into memory\n"); + printf("cannot read into memory\n"); goto error; } if (H5Dread(dset_id, mtype_id, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) @@ -7240,7 +7240,7 @@ auxread_fdata(hid_t fid, const char *name) if (H5Dclose(dset_id) < 0) goto error; if (buf) - HDfree(buf); + free(buf); return SUCCEED; @@ -7253,7 +7253,7 @@ error: H5Tclose(ftype_id); H5Tclose(mtype_id); if (buf) - HDfree(buf); + free(buf); } H5E_END_TRY; return FAIL; @@ -7593,21 +7593,21 @@ test_missing_chunk(hid_t file) TESTING("Read dataset with unwritten chunk & undefined fill value"); /* Set up data arrays */ - if (NULL == (wdata = (int *)HDcalloc(MISSING_CHUNK_DIM, sizeof(int)))) + if (NULL == (wdata = (int *)calloc(MISSING_CHUNK_DIM, sizeof(int)))) TEST_ERROR; - if (NULL == (rdata = (int *)HDcalloc(MISSING_CHUNK_DIM, sizeof(int)))) + if (NULL == (rdata = (int *)calloc(MISSING_CHUNK_DIM, sizeof(int)))) TEST_ERROR; - if (NULL == (wdata2_bytes = (int *)HDcalloc(MISSING_CHUNK_DIM * MISSING_CHUNK_DIM, sizeof(int)))) + if (NULL == (wdata2_bytes = (int *)calloc(MISSING_CHUNK_DIM * MISSING_CHUNK_DIM, sizeof(int)))) TEST_ERROR; - if (NULL == (wdata2 = (int **)HDcalloc(MISSING_CHUNK_DIM, sizeof(wdata2_bytes)))) + if (NULL == (wdata2 = (int **)calloc(MISSING_CHUNK_DIM, sizeof(wdata2_bytes)))) TEST_ERROR; for (i = 0; i < MISSING_CHUNK_DIM; i++) wdata2[i] = wdata2_bytes + (i * MISSING_CHUNK_DIM); - if (NULL == (rdata2_bytes = (int *)HDcalloc(MISSING_CHUNK_DIM * MISSING_CHUNK_DIM, sizeof(int)))) + if (NULL == (rdata2_bytes = (int *)calloc(MISSING_CHUNK_DIM * MISSING_CHUNK_DIM, sizeof(int)))) TEST_ERROR; - if (NULL == (rdata2 = (int **)HDcalloc(MISSING_CHUNK_DIM, sizeof(rdata2_bytes)))) + if (NULL == (rdata2 = (int **)calloc(MISSING_CHUNK_DIM, sizeof(rdata2_bytes)))) TEST_ERROR; for (i = 0; i < MISSING_CHUNK_DIM; i++) rdata2[i] = rdata2_bytes + (i * MISSING_CHUNK_DIM); @@ -7721,14 +7721,14 @@ test_missing_chunk(hid_t file) for (u = 0; u < MISSING_CHUNK_DIM; u++) { if ((u % 10) >= 5) { if (rdata[u] != 911) { - HDprintf(" Line %d: Incorrect value, rdata[%u]=%d\n", __LINE__, (unsigned)u, rdata[u]); + printf(" Line %d: Incorrect value, rdata[%u]=%d\n", __LINE__, (unsigned)u, rdata[u]); TEST_ERROR; } /* end if */ } /* end if */ else { if (rdata[u] != wdata[u]) { - HDprintf(" Line %d: Incorrect value, wdata[%u]=%d, rdata[%u]=%d\n", __LINE__, (unsigned)u, - wdata[u], (unsigned)u, rdata[u]); + printf(" Line %d: Incorrect value, wdata[%u]=%d, rdata[%u]=%d\n", __LINE__, (unsigned)u, + wdata[u], (unsigned)u, rdata[u]); TEST_ERROR; } /* end if */ } /* end else */ @@ -7740,16 +7740,16 @@ test_missing_chunk(hid_t file) if ((i % 10) >= 5 || (j % 10) >= 5) { if (rdata2[i][j] != 911) { - HDprintf(" Line %d: Incorrect value, rdata2[%u][%u] = %d\n", __LINE__, (unsigned)i, - (unsigned)j, rdata2[i][j]); + printf(" Line %d: Incorrect value, rdata2[%u][%u] = %d\n", __LINE__, (unsigned)i, + (unsigned)j, rdata2[i][j]); TEST_ERROR; } /* end if */ } /* end if */ else { if (rdata2[i][j] != wdata2[i][j]) { - HDprintf(" Line %d: Incorrect value, wdata2[%u][%u] = %d, rdata2[%u][%u] = %d\n", - __LINE__, (unsigned)i, (unsigned)j, wdata2[i][j], (unsigned)i, (unsigned)j, - rdata2[i][j]); + printf(" Line %d: Incorrect value, wdata2[%u][%u] = %d, rdata2[%u][%u] = %d\n", + __LINE__, (unsigned)i, (unsigned)j, wdata2[i][j], (unsigned)i, (unsigned)j, + rdata2[i][j]); TEST_ERROR; } /* end if */ } /* end else */ @@ -7770,12 +7770,12 @@ test_missing_chunk(hid_t file) if (H5Dclose(did2) < 0) TEST_ERROR; - HDfree(rdata); - HDfree(wdata); - HDfree(rdata2); - HDfree(wdata2); - HDfree(rdata2_bytes); - HDfree(wdata2_bytes); + free(rdata); + free(wdata); + free(rdata2); + free(wdata2); + free(rdata2_bytes); + free(wdata2_bytes); PASSED(); return SUCCEED; @@ -7794,12 +7794,12 @@ error: } H5E_END_TRY; - HDfree(rdata); - HDfree(wdata); - HDfree(rdata2); - HDfree(wdata2); - HDfree(rdata2_bytes); - HDfree(wdata2_bytes); + free(rdata); + free(wdata); + free(rdata2); + free(wdata2); + free(rdata2_bytes); + free(wdata2_bytes); return FAIL; } /* end test_missing_chunk() */ @@ -7850,7 +7850,7 @@ make_random_offset_and_increment(long nelts, long *offsetp, long *incp) long inc; long maxinc; - HDassert(0 < nelts); + assert(0 < nelts); *offsetp = HDrandom() % nelts; @@ -7907,7 +7907,7 @@ test_random_chunks_real(const char *testname, hbool_t early_alloc, hid_t fapl) TESTING(testname); - HDassert(NPOINTS < 100); + assert(NPOINTS < 100); h5_fixname(FILENAME[6], fapl, filename, sizeof filename); @@ -7953,7 +7953,7 @@ test_random_chunks_real(const char *testname, hbool_t early_alloc, hid_t fapl) H5_CHECKED_ASSIGN(chunk_row, int, ofs / cols, long); H5_CHECKED_ASSIGN(chunk_col, int, ofs % cols, long); ofs = (ofs + inc) % (rows * cols); - HDassert(!check2[chunk_row][chunk_col]); + assert(!check2[chunk_row][chunk_col]); wbuf[i] = check2[chunk_row][chunk_col] = chunk_row + chunk_col + 1; coord[i][0] = (hsize_t)chunk_row * csize[0]; @@ -8029,10 +8029,10 @@ test_random_chunks_real(const char *testname, hbool_t early_alloc, hid_t fapl) /* Verify that written and read data are the same */ for (i = 0; i < NPOINTS; i++) if (rbuf[i] != wbuf[i]) { - HDprintf(" Line %d: Incorrect value, wbuf[%u]=%d, rbuf[%u]=%d\n", __LINE__, (unsigned)i, - wbuf[i], (unsigned)i, rbuf[i]); - HDprintf(" coord[%u] = {%lu, %lu}\n", (unsigned)i, (unsigned long)coord[i][0], - (unsigned long)coord[i][1]); + printf(" Line %d: Incorrect value, wbuf[%u]=%d, rbuf[%u]=%d\n", __LINE__, (unsigned)i, wbuf[i], + (unsigned)i, rbuf[i]); + printf(" coord[%u] = {%lu, %lu}\n", (unsigned)i, (unsigned long)coord[i][0], + (unsigned long)coord[i][1]); TEST_ERROR; } /* end if */ @@ -8113,7 +8113,7 @@ test_random_chunks_real(const char *testname, hbool_t early_alloc, hid_t fapl) H5_CHECKED_ASSIGN(chunk_row, int, ofs / cols, long); H5_CHECKED_ASSIGN(chunk_col, int, ofs % cols, long); ofs = (ofs + inc) % (rows * cols); - HDassert(!check2[chunk_row][chunk_col]); + assert(!check2[chunk_row][chunk_col]); wbuf[i] = check2[chunk_row][chunk_col] = chunk_row + chunk_col + 1; coord[i][0] = (hsize_t)chunk_row * csize[0]; @@ -8171,8 +8171,8 @@ test_random_chunks_real(const char *testname, hbool_t early_alloc, hid_t fapl) /* Verify that written and read data are the same */ for (i = 0; i < NPOINTS; i++) if (rbuf[i] != wbuf[i]) { - HDprintf(" Line %d: Incorrect value, wbuf[%u]=%d, rbuf[%u]=%d\n", __LINE__, (unsigned)i, - wbuf[i], (unsigned)i, rbuf[i]); + printf(" Line %d: Incorrect value, wbuf[%u]=%d, rbuf[%u]=%d\n", __LINE__, (unsigned)i, wbuf[i], + (unsigned)i, rbuf[i]); TEST_ERROR; } /* end if */ @@ -8251,7 +8251,7 @@ test_random_chunks_real(const char *testname, hbool_t early_alloc, hid_t fapl) H5_CHECKED_ASSIGN(chunk_row, int, ofs / cols, long); H5_CHECKED_ASSIGN(chunk_col, int, ofs % cols, long); ofs = (ofs + inc) % (rows * cols); - HDassert(!check2[chunk_row][chunk_col]); + assert(!check2[chunk_row][chunk_col]); wbuf[i] = check2[chunk_row][chunk_col] = chunk_row + chunk_col + 1; coord[i][0] = (hsize_t)chunk_row * csize[0]; @@ -8309,8 +8309,8 @@ test_random_chunks_real(const char *testname, hbool_t early_alloc, hid_t fapl) /* Verify that written and read data are the same */ for (i = 0; i < NPOINTS; i++) if (rbuf[i] != wbuf[i]) { - HDprintf(" Line %d: Incorrect value, wbuf[%u]=%d, rbuf[%u]=%d\n", __LINE__, (unsigned)i, - wbuf[i], (unsigned)i, rbuf[i]); + printf(" Line %d: Incorrect value, wbuf[%u]=%d, rbuf[%u]=%d\n", __LINE__, (unsigned)i, wbuf[i], + (unsigned)i, rbuf[i]); TEST_ERROR; } /* end if */ @@ -8429,13 +8429,13 @@ test_deprec(hid_t file) dims[0] = 256; dims[1] = 512; space = H5Screate_simple(2, dims, NULL); - HDassert(space >= 0); + assert(space >= 0); /* Create a small data space for compact dataset */ small_dims[0] = 16; small_dims[1] = 8; small_space = H5Screate_simple(2, small_dims, NULL); - HDassert(space >= 0); + assert(space >= 0); /* * Create a dataset using the default dataset creation properties. We're @@ -8494,7 +8494,7 @@ test_deprec(hid_t file) * layout. */ create_parms = H5Pcreate(H5P_DATASET_CREATE); - HDassert(create_parms >= 0); + assert(create_parms >= 0); /* Add the deflate filter, if available */ #if defined H5_HAVE_FILTER_DEFLATE @@ -8530,7 +8530,7 @@ test_deprec(hid_t file) csize[0] = dims[0] * 2; csize[1] = dims[1] * 2; status = H5Pset_chunk(create_parms, 2, csize); - HDassert(status >= 0); + assert(status >= 0); H5E_BEGIN_TRY { dataset = H5Dcreate1(file, DSET_DEPREC_NAME_CHUNKED, H5T_NATIVE_DOUBLE, space, create_parms); @@ -8545,7 +8545,7 @@ test_deprec(hid_t file) csize[0] = 5; csize[1] = 100; status = H5Pset_chunk(create_parms, 2, csize); - HDassert(status >= 0); + assert(status >= 0); if ((dataset = H5Dcreate1(file, DSET_DEPREC_NAME_CHUNKED, H5T_NATIVE_DOUBLE, space, create_parms)) < 0) goto error; @@ -8570,11 +8570,11 @@ test_deprec(hid_t file) * Create a compact dataset, then close it. */ create_parms = H5Pcreate(H5P_DATASET_CREATE); - HDassert(create_parms >= 0); + assert(create_parms >= 0); status = H5Pset_layout(create_parms, H5D_COMPACT); - HDassert(status >= 0); + assert(status >= 0); status = H5Pset_alloc_time(create_parms, H5D_ALLOC_TIME_EARLY); - HDassert(status >= 0); + assert(status >= 0); if ((dataset = H5Dcreate1(file, DSET_DEPREC_NAME_COMPACT, H5T_NATIVE_DOUBLE, small_space, create_parms)) < 0) @@ -9067,25 +9067,24 @@ test_big_chunks_bypass_cache(hid_t fapl) h5_fixname(FILENAME[9], fapl, filename, sizeof filename); /* Set up data arrays */ - if (NULL == - (t_wdata_bytes = (int *)HDcalloc((BYPASS_CHUNK_DIM / 2) * (BYPASS_CHUNK_DIM / 2), sizeof(int)))) + if (NULL == (t_wdata_bytes = (int *)calloc((BYPASS_CHUNK_DIM / 2) * (BYPASS_CHUNK_DIM / 2), sizeof(int)))) TEST_ERROR; - if (NULL == (t_wdata = (int **)HDcalloc((BYPASS_CHUNK_DIM / 2), sizeof(t_wdata_bytes)))) + if (NULL == (t_wdata = (int **)calloc((BYPASS_CHUNK_DIM / 2), sizeof(t_wdata_bytes)))) TEST_ERROR; for (i = 0; i < (BYPASS_CHUNK_DIM / 2); i++) t_wdata[i] = t_wdata_bytes + (i * (BYPASS_CHUNK_DIM / 2)); - if (NULL == (t_rdata1_bytes = (int *)HDcalloc(BYPASS_DIM * BYPASS_DIM, sizeof(int)))) + if (NULL == (t_rdata1_bytes = (int *)calloc(BYPASS_DIM * BYPASS_DIM, sizeof(int)))) TEST_ERROR; - if (NULL == (t_rdata1 = (int **)HDcalloc(BYPASS_DIM, sizeof(t_rdata1_bytes)))) + if (NULL == (t_rdata1 = (int **)calloc(BYPASS_DIM, sizeof(t_rdata1_bytes)))) TEST_ERROR; for (i = 0; i < BYPASS_DIM; i++) t_rdata1[i] = t_rdata1_bytes + (i * BYPASS_DIM); if (NULL == - (t_rdata2_bytes = (int *)HDcalloc((BYPASS_CHUNK_DIM / 2) * (BYPASS_CHUNK_DIM / 2), sizeof(int)))) + (t_rdata2_bytes = (int *)calloc((BYPASS_CHUNK_DIM / 2) * (BYPASS_CHUNK_DIM / 2), sizeof(int)))) TEST_ERROR; - if (NULL == (t_rdata2 = (int **)HDcalloc((BYPASS_CHUNK_DIM / 2), sizeof(t_rdata2_bytes)))) + if (NULL == (t_rdata2 = (int **)calloc((BYPASS_CHUNK_DIM / 2), sizeof(t_rdata2_bytes)))) TEST_ERROR; for (i = 0; i < (BYPASS_CHUNK_DIM / 2); i++) t_rdata2[i] = t_rdata2_bytes + (i * (BYPASS_CHUNK_DIM / 2)); @@ -9189,11 +9188,11 @@ test_big_chunks_bypass_cache(hid_t fapl) FAIL_STACK_ERROR; /* Allocate buffers */ - if (NULL == (wdata = (int *)HDmalloc(sizeof(int) * (BYPASS_CHUNK_DIM / 2)))) + if (NULL == (wdata = (int *)malloc(sizeof(int) * (BYPASS_CHUNK_DIM / 2)))) TEST_ERROR; - if (NULL == (rdata1 = (int *)HDmalloc(sizeof(int) * BYPASS_DIM))) + if (NULL == (rdata1 = (int *)malloc(sizeof(int) * BYPASS_DIM))) TEST_ERROR; - if (NULL == (rdata2 = (int *)HDmalloc(sizeof(int) * (BYPASS_CHUNK_DIM / 2)))) + if (NULL == (rdata2 = (int *)malloc(sizeof(int) * (BYPASS_CHUNK_DIM / 2)))) TEST_ERROR; /* Initialize data to write for 1-D dataset */ @@ -9237,17 +9236,16 @@ test_big_chunks_bypass_cache(hid_t fapl) /* Verify data for the first 1-D dataset */ for (i = 0; i < BYPASS_CHUNK_DIM / 2; i++) if (rdata1[i] != i) { - HDprintf(" Read different values than written in the 1st chunk.\n"); - HDprintf(" At line %d and index %d, rdata1 = %d. It should be %d.\n", __LINE__, i, rdata1[i], - i); + printf(" Read different values than written in the 1st chunk.\n"); + printf(" At line %d and index %d, rdata1 = %d. It should be %d.\n", __LINE__, i, rdata1[i], i); TEST_ERROR; } /* end if */ for (j = BYPASS_CHUNK_DIM / 2; j < BYPASS_DIM; j++) if (rdata1[j] != fvalue) { - HDprintf(" Read different values than written in the 2nd chunk.\n"); - HDprintf(" At line %d and index %d, rdata1 = %d. It should be %d.\n", __LINE__, i, rdata1[i], - fvalue); + printf(" Read different values than written in the 2nd chunk.\n"); + printf(" At line %d and index %d, rdata1 = %d. It should be %d.\n", __LINE__, i, rdata1[i], + fvalue); TEST_ERROR; } /* end if */ @@ -9255,18 +9253,18 @@ test_big_chunks_bypass_cache(hid_t fapl) for (i = 0; i < BYPASS_CHUNK_DIM / 2; i++) for (j = 0; j < BYPASS_CHUNK_DIM / 2; j++) if (t_rdata1[i][j] != j) { - HDprintf(" Read different values than written in the 1st chunk.\n"); - HDprintf(" At line %d and index (%d, %d), t_rdata1 = %d. It should be %d.\n", __LINE__, i, - j, t_rdata1[i][j], j); + printf(" Read different values than written in the 1st chunk.\n"); + printf(" At line %d and index (%d, %d), t_rdata1 = %d. It should be %d.\n", __LINE__, i, j, + t_rdata1[i][j], j); TEST_ERROR; } /* end if */ for (i = BYPASS_CHUNK_DIM / 2; i < BYPASS_DIM; i++) for (j = BYPASS_CHUNK_DIM / 2; j < BYPASS_DIM; j++) if (t_rdata1[i][j] != fvalue) { - HDprintf(" Read different values than written in the 2nd chunk.\n"); - HDprintf(" At line %d and index (%d, %d), t_rdata1 = %d. It should be %d.\n", __LINE__, i, - j, t_rdata1[i][j], fvalue); + printf(" Read different values than written in the 2nd chunk.\n"); + printf(" At line %d and index (%d, %d), t_rdata1 = %d. It should be %d.\n", __LINE__, i, j, + t_rdata1[i][j], fvalue); TEST_ERROR; } /* end if */ @@ -9320,9 +9318,8 @@ test_big_chunks_bypass_cache(hid_t fapl) /* Verify data for the second 1-D dataset */ for (i = 0; i < BYPASS_CHUNK_DIM / 2; i++) if (rdata2[i] != i) { - HDprintf(" Read different values than written in the chunk.\n"); - HDprintf(" At line %d and index %d, rdata2 = %d. It should be %d.\n", __LINE__, i, rdata2[i], - i); + printf(" Read different values than written in the chunk.\n"); + printf(" At line %d and index %d, rdata2 = %d. It should be %d.\n", __LINE__, i, rdata2[i], i); TEST_ERROR; } /* end if */ @@ -9330,9 +9327,9 @@ test_big_chunks_bypass_cache(hid_t fapl) for (i = 0; i < BYPASS_CHUNK_DIM / 2; i++) for (j = 0; j < BYPASS_CHUNK_DIM / 2; j++) if (t_rdata2[i][j] != j) { - HDprintf(" Read different values than written in the chunk.\n"); - HDprintf(" At line %d and index (%d, %d), t_rdata2 = %d. It should be %d.\n", __LINE__, i, - j, t_rdata2[i][j], j); + printf(" Read different values than written in the chunk.\n"); + printf(" At line %d and index (%d, %d), t_rdata2 = %d. It should be %d.\n", __LINE__, i, j, + t_rdata2[i][j], j); TEST_ERROR; } /* end if */ @@ -9355,15 +9352,15 @@ test_big_chunks_bypass_cache(hid_t fapl) FAIL_STACK_ERROR; /* Release buffers */ - HDfree(wdata); - HDfree(rdata1); - HDfree(rdata2); - HDfree(t_wdata); - HDfree(t_rdata1); - HDfree(t_rdata2); - HDfree(t_wdata_bytes); - HDfree(t_rdata1_bytes); - HDfree(t_rdata2_bytes); + free(wdata); + free(rdata1); + free(rdata2); + free(t_wdata); + free(t_rdata1); + free(t_rdata2); + free(t_wdata_bytes); + free(t_rdata1_bytes); + free(t_rdata2_bytes); PASSED(); return SUCCEED; @@ -9382,15 +9379,15 @@ error: } H5E_END_TRY; - HDfree(wdata); - HDfree(rdata1); - HDfree(rdata2); - HDfree(t_wdata); - HDfree(t_rdata1); - HDfree(t_rdata2); - HDfree(t_wdata_bytes); - HDfree(t_rdata1_bytes); - HDfree(t_rdata2_bytes); + free(wdata); + free(rdata1); + free(rdata2); + free(t_wdata); + free(t_rdata1); + free(t_rdata2); + free(t_wdata_bytes); + free(t_rdata1_bytes); + free(t_rdata2_bytes); return FAIL; } /* end test_big_chunks_bypass_cache() */ @@ -9988,16 +9985,16 @@ test_chunk_fast_bug1(hid_t fapl) h5_fixname(FILENAME[10], fapl, filename, sizeof filename); /* Set up data array */ - if (NULL == (wbuf_bytes = (unsigned *)HDcalloc(40 * 20, sizeof(unsigned)))) + if (NULL == (wbuf_bytes = (unsigned *)calloc(40 * 20, sizeof(unsigned)))) TEST_ERROR; - if (NULL == (wbuf = (unsigned **)HDcalloc(40, sizeof(wbuf_bytes)))) + if (NULL == (wbuf = (unsigned **)calloc(40, sizeof(wbuf_bytes)))) TEST_ERROR; for (i = 0; i < 40; i++) wbuf[i] = wbuf_bytes + (i * 20); - if (NULL == (rbuf_bytes = (unsigned *)HDcalloc(40 * 20, sizeof(unsigned)))) + if (NULL == (rbuf_bytes = (unsigned *)calloc(40 * 20, sizeof(unsigned)))) TEST_ERROR; - if (NULL == (rbuf = (unsigned **)HDcalloc(40, sizeof(rbuf_bytes)))) + if (NULL == (rbuf = (unsigned **)calloc(40, sizeof(rbuf_bytes)))) TEST_ERROR; for (i = 0; i < 40; i++) rbuf[i] = rbuf_bytes + (i * 20); @@ -10073,10 +10070,10 @@ test_chunk_fast_bug1(hid_t fapl) if (H5Sclose(sid) < 0) FAIL_STACK_ERROR; - HDfree(wbuf); - HDfree(rbuf); - HDfree(wbuf_bytes); - HDfree(rbuf_bytes); + free(wbuf); + free(rbuf); + free(wbuf_bytes); + free(rbuf_bytes); PASSED(); return SUCCEED; @@ -10091,10 +10088,10 @@ error: } H5E_END_TRY; - HDfree(wbuf); - HDfree(rbuf); - HDfree(wbuf_bytes); - HDfree(rbuf_bytes); + free(wbuf); + free(rbuf); + free(wbuf_bytes); + free(rbuf_bytes); return FAIL; } /* end test_chunk_fast_bug1() */ @@ -10786,30 +10783,30 @@ test_fixed_array(hid_t fapl) h5_fixname(FILENAME[12], fapl, filename, sizeof filename); /* Set up 2D data arrays */ - if (NULL == (chunks_bytes = (int *)HDcalloc(12 * 6, sizeof(int)))) + if (NULL == (chunks_bytes = (int *)calloc(12 * 6, sizeof(int)))) TEST_ERROR; - if (NULL == (chunks = (int **)HDcalloc(12, sizeof(chunks_bytes)))) + if (NULL == (chunks = (int **)calloc(12, sizeof(chunks_bytes)))) TEST_ERROR; for (i = 0; i < 12; i++) chunks[i] = chunks_bytes + (i * 6); - if (NULL == (chunks_big_bytes = (int *)HDcalloc(125 * 20, sizeof(int)))) + if (NULL == (chunks_big_bytes = (int *)calloc(125 * 20, sizeof(int)))) TEST_ERROR; - if (NULL == (chunks_big = (int **)HDcalloc(125, sizeof(chunks_big_bytes)))) + if (NULL == (chunks_big = (int **)calloc(125, sizeof(chunks_big_bytes)))) TEST_ERROR; for (i = 0; i < 125; i++) chunks_big[i] = chunks_big_bytes + (i * 20); - if (NULL == (coord_bytes = (hsize_t *)HDcalloc(POINTS * 2, sizeof(hsize_t)))) + if (NULL == (coord_bytes = (hsize_t *)calloc(POINTS * 2, sizeof(hsize_t)))) TEST_ERROR; - if (NULL == (coord = (hsize_t **)HDcalloc(POINTS, sizeof(coord_bytes)))) + if (NULL == (coord = (hsize_t **)calloc(POINTS, sizeof(coord_bytes)))) TEST_ERROR; for (i = 0; i < POINTS; i++) coord[i] = coord_bytes + (i * 2); - if (NULL == (coord_big_bytes = (hsize_t *)HDcalloc(POINTS_BIG * 2, sizeof(hsize_t)))) + if (NULL == (coord_big_bytes = (hsize_t *)calloc(POINTS_BIG * 2, sizeof(hsize_t)))) TEST_ERROR; - if (NULL == (coord_big = (hsize_t **)HDcalloc(POINTS_BIG, sizeof(coord_big_bytes)))) + if (NULL == (coord_big = (hsize_t **)calloc(POINTS_BIG, sizeof(coord_big_bytes)))) TEST_ERROR; for (i = 0; i < POINTS_BIG; i++) coord_big[i] = coord_big_bytes + (i * 2); @@ -10829,9 +10826,9 @@ test_fixed_array(hid_t fapl) TEST_ERROR; /* Allocate the "big" buffers */ - if (NULL == (wbuf_big = (int *)HDmalloc(sizeof(int) * POINTS_BIG))) + if (NULL == (wbuf_big = (int *)malloc(sizeof(int) * POINTS_BIG))) TEST_ERROR; - if (NULL == (rbuf_big = (int *)HDmalloc(sizeof(int) * POINTS_BIG))) + if (NULL == (rbuf_big = (int *)malloc(sizeof(int) * POINTS_BIG))) TEST_ERROR; #ifdef H5_HAVE_FILTER_DEFLATE @@ -10882,7 +10879,7 @@ test_fixed_array(hid_t fapl) H5_CHECKED_ASSIGN(chunk_row, int, ofs / cols, long); H5_CHECKED_ASSIGN(chunk_col, int, ofs % cols, long); ofs = (ofs + inc) % (rows * cols); - HDassert(!chunks[chunk_row][chunk_col]); + assert(!chunks[chunk_row][chunk_col]); wbuf[i] = chunks[chunk_row][chunk_col] = chunk_row + chunk_col + 1; coord[i][0] = (hsize_t)chunk_row * chunk_dim2[0]; @@ -11032,7 +11029,7 @@ test_fixed_array(hid_t fapl) H5_CHECKED_ASSIGN(chunk_row, int, ofs / cols, long); H5_CHECKED_ASSIGN(chunk_col, int, ofs % cols, long); ofs = (ofs + inc) % (rows * cols); - HDassert(!chunks_big[chunk_row][chunk_col]); + assert(!chunks_big[chunk_row][chunk_col]); wbuf_big[i] = chunks_big[chunk_row][chunk_col] = chunk_row + chunk_col + 1; coord_big[i][0] = (hsize_t)chunk_row * chunk_dim2[0]; @@ -11084,8 +11081,8 @@ test_fixed_array(hid_t fapl) /* Verify that written and read data are the same */ for (i = 0; i < POINTS; i++) if (rbuf[i] != wbuf[i]) { - HDprintf(" Line %d: Incorrect value, wbuf[%u]=%d, rbuf[%u]=%d\n", __LINE__, - (unsigned)i, wbuf[i], (unsigned)i, rbuf[i]); + printf(" Line %d: Incorrect value, wbuf[%u]=%d, rbuf[%u]=%d\n", __LINE__, (unsigned)i, + wbuf[i], (unsigned)i, rbuf[i]); TEST_ERROR; } /* end if */ @@ -11120,8 +11117,8 @@ test_fixed_array(hid_t fapl) /* Verify that written and read data are the same */ for (i = 0; i < POINTS; i++) if (rbuf[i] != wbuf[i]) { - HDprintf(" Line %d: Incorrect value, wbuf[%u]=%d, rbuf[%u]=%d\n", __LINE__, - (unsigned)i, wbuf[i], (unsigned)i, rbuf[i]); + printf(" Line %d: Incorrect value, wbuf[%u]=%d, rbuf[%u]=%d\n", __LINE__, (unsigned)i, + wbuf[i], (unsigned)i, rbuf[i]); TEST_ERROR; } /* end if */ @@ -11154,8 +11151,8 @@ test_fixed_array(hid_t fapl) /* Verify that written and read data are the same */ for (i = 0; i < POINTS_BIG; i++) if (rbuf_big[i] != wbuf_big[i]) { - HDprintf(" Line %d: Incorrect value, wbuf_bif[%u]=%d, rbuf_big[%u]=%d\n", __LINE__, - (unsigned)i, wbuf_big[i], (unsigned)i, rbuf_big[i]); + printf(" Line %d: Incorrect value, wbuf_bif[%u]=%d, rbuf_big[%u]=%d\n", __LINE__, + (unsigned)i, wbuf_big[i], (unsigned)i, rbuf_big[i]); TEST_ERROR; } /* end if */ @@ -11193,17 +11190,17 @@ test_fixed_array(hid_t fapl) #endif /* H5_HAVE_FILTER_DEFLATE */ /* Release buffers */ - HDfree(wbuf_big); - HDfree(rbuf_big); - - HDfree(chunks); - HDfree(chunks_big); - HDfree(coord); - HDfree(coord_big); - HDfree(chunks_bytes); - HDfree(chunks_big_bytes); - HDfree(coord_bytes); - HDfree(coord_big_bytes); + free(wbuf_big); + free(rbuf_big); + + free(chunks); + free(chunks_big); + free(coord); + free(coord_big); + free(chunks_bytes); + free(chunks_big_bytes); + free(coord_bytes); + free(coord_big_bytes); PASSED(); return SUCCEED; @@ -11219,16 +11216,16 @@ error: } H5E_END_TRY; - HDfree(wbuf_big); - HDfree(rbuf_big); - HDfree(chunks); - HDfree(chunks_big); - HDfree(coord); - HDfree(coord_big); - HDfree(chunks_bytes); - HDfree(chunks_big_bytes); - HDfree(coord_bytes); - HDfree(coord_big_bytes); + free(wbuf_big); + free(rbuf_big); + free(chunks); + free(chunks_big); + free(coord); + free(coord_big); + free(chunks_bytes); + free(chunks_big_bytes); + free(coord_bytes); + free(coord_big_bytes); return FAIL; } /* end test_fixed_array() */ @@ -11307,13 +11304,13 @@ test_single_chunk(hid_t fapl) TEST_ERROR; /* Allocate the buffers */ - if (NULL == (wbuf = (int *)HDmalloc(sizeof(int) * (DSET_DIM1 * DSET_DIM2)))) + if (NULL == (wbuf = (int *)malloc(sizeof(int) * (DSET_DIM1 * DSET_DIM2)))) TEST_ERROR; - if (NULL == (rbuf = (int *)HDmalloc(sizeof(int) * (DSET_DIM1 * DSET_DIM2)))) + if (NULL == (rbuf = (int *)malloc(sizeof(int) * (DSET_DIM1 * DSET_DIM2)))) TEST_ERROR; - if (NULL == (t_wbuf = (int *)HDmalloc(sizeof(int) * (DSET_TMP_DIM1 * DSET_TMP_DIM2)))) + if (NULL == (t_wbuf = (int *)malloc(sizeof(int) * (DSET_TMP_DIM1 * DSET_TMP_DIM2)))) TEST_ERROR; - if (NULL == (t_rbuf = (int *)HDmalloc(sizeof(int) * (DSET_TMP_DIM1 * DSET_TMP_DIM2)))) + if (NULL == (t_rbuf = (int *)malloc(sizeof(int) * (DSET_TMP_DIM1 * DSET_TMP_DIM2)))) TEST_ERROR; for (i = n = 0; i < (DSET_DIM1 * DSET_DIM2); i++) @@ -11442,8 +11439,8 @@ test_single_chunk(hid_t fapl) /* Verify that written and read data are the same */ for (i = 0; i < (DSET_DIM1 * DSET_DIM2); i++) if (rbuf[i] != wbuf[i]) { - HDprintf(" Line %d: Incorrect value, wbuf[%u]=%d, rbuf[%u]=%d\n", __LINE__, - (unsigned)i, wbuf[i], (unsigned)i, rbuf[i]); + printf(" Line %d: Incorrect value, wbuf[%u]=%d, rbuf[%u]=%d\n", __LINE__, (unsigned)i, + wbuf[i], (unsigned)i, rbuf[i]); TEST_ERROR; } /* end if */ @@ -11455,7 +11452,7 @@ test_single_chunk(hid_t fapl) if ((did = H5Dopen2(fid, DSET_SINGLE_NOMAX, H5P_DEFAULT)) < 0) TEST_ERROR; - HDmemset(rbuf, 0, sizeof(int) * (DSET_DIM1 * DSET_DIM2)); + memset(rbuf, 0, sizeof(int) * (DSET_DIM1 * DSET_DIM2)); /* Read from dataset */ if (H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, t_rbuf) < 0) @@ -11464,8 +11461,8 @@ test_single_chunk(hid_t fapl) /* Verify that written and read data are the same */ for (i = 0; i < (DSET_TMP_DIM1 * DSET_TMP_DIM2); i++) if (t_rbuf[i] != t_wbuf[i]) { - HDprintf(" Line %d: Incorrect value, t_wbuf[%u]=%d, t_rbuf[%u]=%d\n", __LINE__, - (unsigned)i, t_wbuf[i], (unsigned)i, t_rbuf[i]); + printf(" Line %d: Incorrect value, t_wbuf[%u]=%d, t_rbuf[%u]=%d\n", __LINE__, + (unsigned)i, t_wbuf[i], (unsigned)i, t_rbuf[i]); TEST_ERROR; } /* end if */ @@ -11497,10 +11494,10 @@ test_single_chunk(hid_t fapl) #endif /* H5_HAVE_FILTER_DEFLATE */ /* Release buffers */ - HDfree(wbuf); - HDfree(rbuf); - HDfree(t_wbuf); - HDfree(t_rbuf); + free(wbuf); + free(rbuf); + free(t_wbuf); + free(t_rbuf); PASSED(); return SUCCEED; @@ -11518,13 +11515,13 @@ error: } H5E_END_TRY; if (wbuf) - HDfree(wbuf); + free(wbuf); if (rbuf) - HDfree(rbuf); + free(rbuf); if (t_wbuf) - HDfree(t_wbuf); + free(t_wbuf); if (t_rbuf) - HDfree(t_rbuf); + free(t_rbuf); return FAIL; } /* end test_single_chunk() */ @@ -12538,7 +12535,7 @@ test_bt2_hdr_fd(const char *env_h5_driver, hid_t fapl) TESTING("Version 2 B-tree chunk index header flush dependencies handled correctly"); /* Initialize struct */ - HDmemset(&info, 0, sizeof(info)); + memset(&info, 0, sizeof(info)); /* Skip this test if SWMR I/O is not supported for the VFD specified * by the environment variable. @@ -12695,7 +12692,7 @@ test_storage_size(hid_t fapl) FAIL_STACK_ERROR; /* Initialize buffer to zeroes */ - HDmemset(wdata, 0, sizeof(wdata)); + memset(wdata, 0, sizeof(wdata)); /* write elements to dataset */ if (H5Dwrite(dsid, H5T_NATIVE_INT, sid, sid, H5P_DEFAULT, wdata) < 0) @@ -12744,7 +12741,7 @@ test_storage_size(hid_t fapl) FAIL_STACK_ERROR; /* Initialize buffer to zeroes */ - HDmemset(wdata, 0, sizeof(wdata)); + memset(wdata, 0, sizeof(wdata)); /* write elements to dataset */ if (H5Dwrite(dsid, H5T_NATIVE_INT, sid, sid, H5P_DEFAULT, wdata) < 0) @@ -12805,7 +12802,7 @@ test_storage_size(hid_t fapl) FAIL_STACK_ERROR; /* Initialize buffer to zeroes */ - HDmemset(wdata, 0, sizeof(wdata)); + memset(wdata, 0, sizeof(wdata)); /* write elements to dataset */ if (H5Dwrite(dsid, H5T_NATIVE_INT, sid, sid, H5P_DEFAULT, wdata) < 0) @@ -12866,7 +12863,7 @@ test_storage_size(hid_t fapl) FAIL_STACK_ERROR; /* Initialize buffer to zeroes */ - HDmemset(wdata, 0, sizeof(wdata)); + memset(wdata, 0, sizeof(wdata)); /* write elements to dataset */ if (H5Dwrite(dsid, H5T_NATIVE_INT, sid, sid, H5P_DEFAULT, wdata) < 0) @@ -12927,7 +12924,7 @@ test_storage_size(hid_t fapl) FAIL_STACK_ERROR; /* Initialize buffer to zeroes */ - HDmemset(wdata, 0, sizeof(wdata)); + memset(wdata, 0, sizeof(wdata)); /* write elements to dataset */ if (H5Dwrite(dsid, H5T_NATIVE_INT, sid, sid, H5P_DEFAULT, wdata) < 0) @@ -12988,7 +12985,7 @@ test_storage_size(hid_t fapl) FAIL_STACK_ERROR; /* Initialize buffer to zeroes */ - HDmemset(wdata, 0, sizeof(wdata)); + memset(wdata, 0, sizeof(wdata)); /* write elements to dataset */ if (H5Dwrite(dsid, H5T_NATIVE_INT, sid, sid, H5P_DEFAULT, wdata) < 0) @@ -13049,7 +13046,7 @@ test_storage_size(hid_t fapl) FAIL_STACK_ERROR; /* Initialize buffer to zeroes */ - HDmemset(wdata, 0, sizeof(wdata)); + memset(wdata, 0, sizeof(wdata)); /* write elements to dataset */ if (H5Dwrite(dsid, H5T_NATIVE_INT, sid, sid, H5P_DEFAULT, wdata) < 0) @@ -13242,8 +13239,8 @@ typedef struct scatter_info_t { if (ARR[i][j][k] != EXP[i][j][k]) { \ H5_FAILED(); \ AT(); \ - HDprintf(" " #ARR "[%d][%d][%d] == %d, " #EXP "[%d][%d][%d] == %d\n", i, j, k, \ - ARR[i][j][k], i, j, k, EXP[i][j][k]); \ + printf(" " #ARR "[%d][%d][%d] == %d, " #EXP "[%d][%d][%d] == %d\n", i, j, k, \ + ARR[i][j][k], i, j, k, EXP[i][j][k]); \ goto error; \ } @@ -13255,7 +13252,7 @@ scatter_cb(void **src_buf /*out*/, size_t *src_buf_bytes_used /*out*/, void *_sc /* Calculate number of elements */ nelmts = MIN(scatter_info->block, scatter_info->size); - HDassert(nelmts > 0); + assert(nelmts > 0); /* Set output variables */ *src_buf = (void *)scatter_info->src_buf; @@ -13308,14 +13305,14 @@ test_scatter(void) TEST_ERROR; /* Initialize dst_buf and expect_dst_buf */ - (void)HDmemset(expect_dst_buf, 0, sizeof(expect_dst_buf)); + (void)memset(expect_dst_buf, 0, sizeof(expect_dst_buf)); for (i = 0; i < 8; i++) expect_dst_buf[0][0][i] = src_buf[i]; /* Loop over buffer sizes */ for (src_buf_size = 1; src_buf_size <= 9; src_buf_size++) { /* Reset dst_buf */ - (void)HDmemset(dst_buf, 0, sizeof(dst_buf)); + (void)memset(dst_buf, 0, sizeof(dst_buf)); /* Set up scatter info */ scatter_info.src_buf = src_buf; @@ -13344,7 +13341,7 @@ test_scatter(void) TEST_ERROR; /* Initialize expect_dst_buf */ - (void)HDmemset(expect_dst_buf, 0, sizeof(expect_dst_buf)); + (void)memset(expect_dst_buf, 0, sizeof(expect_dst_buf)); src_i = 0; for (i = 3; i < 5; i++) for (j = 2; j < 5; j++) @@ -13354,7 +13351,7 @@ test_scatter(void) /* Loop over buffer sizes */ for (src_buf_size = 1; src_buf_size <= 13; src_buf_size++) { /* Reset dst_buf */ - (void)HDmemset(dst_buf, 0, sizeof(dst_buf)); + (void)memset(dst_buf, 0, sizeof(dst_buf)); /* Set up scatter info */ scatter_info.src_buf = src_buf; @@ -13392,7 +13389,7 @@ test_scatter(void) /* Iterate over block containing selection, checking if each element is in * selection. Note that the algorithm used here (if statement) would not * work for overlapping hyperslabs. */ - (void)HDmemset(expect_dst_buf, 0, sizeof(expect_dst_buf)); + (void)memset(expect_dst_buf, 0, sizeof(expect_dst_buf)); src_i = 0; for (i = 1; i < 8; i++) for (j = 1; j < 4; j++) @@ -13408,7 +13405,7 @@ test_scatter(void) /* Loop over buffer sizes */ for (src_buf_size = 1; src_buf_size <= 37; src_buf_size++) { /* Reset dst_buf */ - (void)HDmemset(dst_buf, 0, sizeof(dst_buf)); + (void)memset(dst_buf, 0, sizeof(dst_buf)); /* Set up scatter info */ scatter_info.src_buf = src_buf; @@ -13447,7 +13444,7 @@ test_scatter(void) /* Initialize expect_dst_buf */ /* Iterate over block containing selection, checking if each element is in * selection. */ - (void)HDmemset(expect_dst_buf, 0, sizeof(expect_dst_buf)); + (void)memset(expect_dst_buf, 0, sizeof(expect_dst_buf)); src_i = 0; for (i = 1; i < 4; i++) for (j = 1; j < 4; j++) @@ -13463,7 +13460,7 @@ test_scatter(void) /* Loop over buffer sizes */ for (src_buf_size = 1; src_buf_size <= 17; src_buf_size++) { /* Reset dst_buf */ - (void)HDmemset(dst_buf, 0, sizeof(dst_buf)); + (void)memset(dst_buf, 0, sizeof(dst_buf)); /* Set up scatter info */ scatter_info.src_buf = src_buf; @@ -13488,14 +13485,14 @@ test_scatter(void) /* Initialize expect_dst_buf */ /* Iterate over block containing selection, checking if each element is in * selection. */ - (void)HDmemset(expect_dst_buf, 0, sizeof(expect_dst_buf)); + (void)memset(expect_dst_buf, 0, sizeof(expect_dst_buf)); for (i = 0; i < (int)(sizeof(point) / sizeof(point[0])); i++) expect_dst_buf[point[i][0]][point[i][1]][point[i][2]] = src_buf[i]; /* Loop over buffer sizes */ for (src_buf_size = 1; src_buf_size <= 5; src_buf_size++) { /* Reset dst_buf */ - (void)HDmemset(dst_buf, 0, sizeof(dst_buf)); + (void)memset(dst_buf, 0, sizeof(dst_buf)); /* Set up scatter info */ scatter_info.src_buf = src_buf; @@ -13554,7 +13551,7 @@ gather_cb(const void *dst_buf, size_t dst_buf_bytes_used, void *_gather_info) size_t nelmts; /* Number of elements in src_buf */ int i; /* Local index variable */ - HDassert(dst_buf_bytes_used > 0); + assert(dst_buf_bytes_used > 0); /* Calculate number of elements */ nelmts = dst_buf_bytes_used / sizeof(gather_info->expect_dst_buf[0]); @@ -13629,14 +13626,14 @@ test_gather(void) TEST_ERROR; /* Initialize expect_dst_buf */ - (void)HDmemset(expect_dst_buf, 0, sizeof(expect_dst_buf)); + (void)memset(expect_dst_buf, 0, sizeof(expect_dst_buf)); for (i = 0; i < 8; i++) expect_dst_buf[i] = src_buf[0][0][i]; /* Loop over buffer sizes */ for (dst_buf_size = 1; dst_buf_size <= 9; dst_buf_size++) { /* Reset dst_buf */ - (void)HDmemset(dst_buf, 0, sizeof(dst_buf)); + (void)memset(dst_buf, 0, sizeof(dst_buf)); /* Initialize gather_info */ gather_info.expect_dst_buf = expect_dst_buf; @@ -13657,7 +13654,7 @@ test_gather(void) /* Loop over buffer sizes */ for (dst_buf_size = 8; dst_buf_size <= 9; dst_buf_size++) { /* Reset dst_buf */ - (void)HDmemset(dst_buf, 0, sizeof(dst_buf)); + (void)memset(dst_buf, 0, sizeof(dst_buf)); /* Gather data */ if (H5Dgather(sid, src_buf, H5T_NATIVE_INT, dst_buf_size * sizeof(dst_buf[0]), dst_buf, NULL, NULL) < @@ -13673,7 +13670,7 @@ test_gather(void) /* Test with a dst_buf_size that is not a multiple of the datatype size */ /* Reset dst_buf */ dst_buf_size = 7; - (void)HDmemset(dst_buf, 0, sizeof(dst_buf)); + (void)memset(dst_buf, 0, sizeof(dst_buf)); /* Initialize gather_info */ gather_info.expect_dst_buf = expect_dst_buf; @@ -13703,7 +13700,7 @@ test_gather(void) TEST_ERROR; /* Initialize expect_dst_buf */ - (void)HDmemset(expect_dst_buf, 0, sizeof(expect_dst_buf)); + (void)memset(expect_dst_buf, 0, sizeof(expect_dst_buf)); dst_i = 0; for (i = 3; i < 5; i++) for (j = 2; j < 5; j++) @@ -13713,7 +13710,7 @@ test_gather(void) /* Loop over buffer sizes */ for (dst_buf_size = 1; dst_buf_size <= 13; dst_buf_size++) { /* Reset dst_buf */ - (void)HDmemset(dst_buf, 0, sizeof(dst_buf)); + (void)memset(dst_buf, 0, sizeof(dst_buf)); /* Initialize gather_info */ gather_info.expect_dst_buf = expect_dst_buf; @@ -13753,7 +13750,7 @@ test_gather(void) /* Iterate over block containing selection, checking if each element is in * selection. Note that the algorithm used here (if statement) would not * work for overlapping hyperslabs. */ - (void)HDmemset(expect_dst_buf, 0, sizeof(expect_dst_buf)); + (void)memset(expect_dst_buf, 0, sizeof(expect_dst_buf)); dst_i = 0; for (i = 1; i < 8; i++) for (j = 1; j < 4; j++) @@ -13769,7 +13766,7 @@ test_gather(void) /* Loop over buffer sizes */ for (dst_buf_size = 1; dst_buf_size <= 37; dst_buf_size++) { /* Reset dst_buf */ - (void)HDmemset(dst_buf, 0, sizeof(dst_buf)); + (void)memset(dst_buf, 0, sizeof(dst_buf)); /* Initialize gather_info */ gather_info.expect_dst_buf = expect_dst_buf; @@ -13810,7 +13807,7 @@ test_gather(void) /* Initialize expect_dst_buf */ /* Iterate over block containing selection, checking if each element is in * selection. */ - (void)HDmemset(expect_dst_buf, 0, sizeof(expect_dst_buf)); + (void)memset(expect_dst_buf, 0, sizeof(expect_dst_buf)); dst_i = 0; for (i = 1; i < 4; i++) for (j = 1; j < 4; j++) @@ -13826,7 +13823,7 @@ test_gather(void) /* Loop over buffer sizes */ for (dst_buf_size = 1; dst_buf_size <= 17; dst_buf_size++) { /* Reset dst_buf */ - (void)HDmemset(dst_buf, 0, sizeof(dst_buf)); + (void)memset(dst_buf, 0, sizeof(dst_buf)); /* Initialize gather_info */ gather_info.expect_dst_buf = expect_dst_buf; @@ -13853,14 +13850,14 @@ test_gather(void) /* Initialize expect_dst_buf */ /* Iterate over block containing selection, checking if each element is in * selection. */ - (void)HDmemset(expect_dst_buf, 0, sizeof(expect_dst_buf)); + (void)memset(expect_dst_buf, 0, sizeof(expect_dst_buf)); for (i = 0; i < (int)(sizeof(point) / sizeof(point[0])); i++) expect_dst_buf[i] = src_buf[point[i][0]][point[i][1]][point[i][2]]; /* Loop over buffer sizes */ for (dst_buf_size = 1; dst_buf_size <= 5; dst_buf_size++) { /* Reset dst_buf */ - (void)HDmemset(dst_buf, 0, sizeof(dst_buf)); + (void)memset(dst_buf, 0, sizeof(dst_buf)); /* Initialize gather_info */ gather_info.expect_dst_buf = expect_dst_buf; @@ -13916,7 +13913,7 @@ scatter_error_cb_fail(void **src_buf /*out*/, size_t *src_buf_bytes_used /*out*/ /* Calculate number of elements */ nelmts = MIN(scatter_info->block, scatter_info->size); - HDassert(nelmts > 0); + assert(nelmts > 0); /* Set output variables */ *src_buf = (void *)scatter_info->src_buf; @@ -13933,7 +13930,7 @@ scatter_error_cb_null(void **src_buf /*out*/, size_t *src_buf_bytes_used /*out*/ /* Calculate number of elements */ nelmts = MIN(scatter_info->block, scatter_info->size); - HDassert(nelmts > 0); + assert(nelmts > 0); /* Set output variables */ *src_buf = NULL; @@ -14177,7 +14174,7 @@ test_gather_error(void) TEST_ERROR; /* Initialize expect_dst_buf */ - (void)HDmemset(expect_dst_buf, 0, sizeof(expect_dst_buf)); + (void)memset(expect_dst_buf, 0, sizeof(expect_dst_buf)); for (i = 0; i < 6; i++) expect_dst_buf[i] = src_buf[i + 2]; @@ -14522,7 +14519,7 @@ dls_01_main(void) if (NULL == h5_fixname(FILENAME[23], H5P_DEFAULT, filename, sizeof(filename))) TEST_ERROR; - buffer = (char *)HDcalloc(DLS_01_DIMS, DLS_01_STR_SIZE); + buffer = (char *)calloc(DLS_01_DIMS, DLS_01_STR_SIZE); if (NULL == buffer) TEST_ERROR; @@ -14568,7 +14565,7 @@ dls_01_main(void) if (status != 0) TEST_ERROR; - HDfree(buffer); + free(buffer); PASSED(); @@ -14576,7 +14573,7 @@ dls_01_main(void) error: if (buffer) - HDfree(buffer); + free(buffer); return FAIL; } /* end dls_01_main() */ @@ -15057,7 +15054,7 @@ test_h5s_block(void) FAIL_STACK_ERROR; /* Reset the memory buffer */ - HDmemset(buf, 0, sizeof(buf)); + memset(buf, 0, sizeof(buf)); /* Read the entire dataset */ if (H5Dread(dset_id, H5T_NATIVE_INT, H5S_BLOCK, H5S_ALL, H5P_DEFAULT, buf) < 0) @@ -15238,7 +15235,7 @@ test_h5s_plist(void) FAIL_STACK_ERROR; /* Reset the memory buffer */ - HDmemset(buf, 0, sizeof(buf)); + memset(buf, 0, sizeof(buf)); /* Read the entire dataset */ if (H5Dread(dset_id, H5T_NATIVE_INT, H5S_BLOCK, H5S_ALL, H5P_DEFAULT, buf) < 0) @@ -15250,7 +15247,7 @@ test_h5s_plist(void) TEST_ERROR; /* Reset the memory buffer */ - HDmemset(buf, 0, sizeof(buf)); + memset(buf, 0, sizeof(buf)); /* Set valid selection in DXPL */ if (H5Pset_dataset_io_hyperslab_selection(dxpl_id, 1, H5S_SELECT_SET, &start, &stride, &count, &block) < @@ -15267,7 +15264,7 @@ test_h5s_plist(void) TEST_ERROR; /* Reset the memory buffer */ - HDmemset(buf, 0, sizeof(buf)); + memset(buf, 0, sizeof(buf)); /* Check for copying property list w/selection */ if ((dxpl_id_copy = H5Pcopy(dxpl_id)) < 0) @@ -15468,7 +15465,7 @@ test_0sized_dset_metadata_alloc(hid_t fapl_id) FAIL_STACK_ERROR; /* Retrieve & verify the dataset's index info */ - HDmemset(&nat_info, 0, sizeof(nat_info)); + memset(&nat_info, 0, sizeof(nat_info)); if (H5Oget_native_info(dset_id, &nat_info, H5O_NATIVE_INFO_META_SIZE) < 0) FAIL_STACK_ERROR; if (0 != nat_info.meta_size.obj.index_size) @@ -15507,7 +15504,7 @@ test_0sized_dset_metadata_alloc(hid_t fapl_id) FAIL_STACK_ERROR; /* Retrieve & verify the dataset's index info */ - HDmemset(&nat_info, 0, sizeof(nat_info)); + memset(&nat_info, 0, sizeof(nat_info)); if (H5Oget_native_info(dset_id, &nat_info, H5O_NATIVE_INFO_META_SIZE) < 0) FAIL_STACK_ERROR; if (0 == nat_info.meta_size.obj.index_size) @@ -15596,33 +15593,33 @@ main(void) /* Initialize global arrays */ /* points */ - if (NULL == (points_data = (int *)HDcalloc(DSET_DIM1 * DSET_DIM2, sizeof(int)))) + if (NULL == (points_data = (int *)calloc(DSET_DIM1 * DSET_DIM2, sizeof(int)))) TEST_ERROR; - if (NULL == (points = (int **)HDcalloc(DSET_DIM1, sizeof(points_data)))) + if (NULL == (points = (int **)calloc(DSET_DIM1, sizeof(points_data)))) TEST_ERROR; for (i = 0; i < DSET_DIM1; i++) points[i] = points_data + (i * DSET_DIM2); /* check */ - if (NULL == (check_data = (int *)HDcalloc(DSET_DIM1 * DSET_DIM2, sizeof(int)))) + if (NULL == (check_data = (int *)calloc(DSET_DIM1 * DSET_DIM2, sizeof(int)))) TEST_ERROR; - if (NULL == (check = (int **)HDcalloc(DSET_DIM1, sizeof(check_data)))) + if (NULL == (check = (int **)calloc(DSET_DIM1, sizeof(check_data)))) TEST_ERROR; for (i = 0; i < DSET_DIM1; i++) check[i] = check_data + (i * DSET_DIM2); /* points_dbl */ - if (NULL == (points_dbl_data = (double *)HDcalloc(DSET_DIM1 * DSET_DIM2, sizeof(double)))) + if (NULL == (points_dbl_data = (double *)calloc(DSET_DIM1 * DSET_DIM2, sizeof(double)))) TEST_ERROR; - if (NULL == (points_dbl = (double **)HDcalloc(DSET_DIM1, sizeof(points_dbl_data)))) + if (NULL == (points_dbl = (double **)calloc(DSET_DIM1, sizeof(points_dbl_data)))) TEST_ERROR; for (i = 0; i < DSET_DIM1; i++) points_dbl[i] = points_dbl_data + (i * DSET_DIM2); /* check_dbl */ - if (NULL == (check_dbl_data = (double *)HDcalloc(DSET_DIM1 * DSET_DIM2, sizeof(double)))) + if (NULL == (check_dbl_data = (double *)calloc(DSET_DIM1 * DSET_DIM2, sizeof(double)))) TEST_ERROR; - if (NULL == (check_dbl = (double **)HDcalloc(DSET_DIM1, sizeof(check_dbl_data)))) + if (NULL == (check_dbl = (double **)calloc(DSET_DIM1, sizeof(check_dbl_data)))) TEST_ERROR; for (i = 0; i < DSET_DIM1; i++) check_dbl[i] = check_dbl_data + (i * DSET_DIM2); @@ -15835,37 +15832,37 @@ main(void) if (nerrors) goto error; - HDprintf("All dataset tests passed.\n"); + printf("All dataset tests passed.\n"); #ifdef H5_HAVE_FILTER_SZIP if (GetTestCleanup()) HDremove(NOENCODER_COPY_FILENAME); #endif /* H5_HAVE_FILTER_SZIP */ h5_cleanup(FILENAME, fapl); - HDfree(points); - HDfree(check); - HDfree(points_dbl); - HDfree(check_dbl); + free(points); + free(check); + free(points_dbl); + free(check_dbl); - HDfree(points_data); - HDfree(check_data); - HDfree(points_dbl_data); - HDfree(check_dbl_data); + free(points_data); + free(check_data); + free(points_dbl_data); + free(check_dbl_data); - HDexit(EXIT_SUCCESS); + exit(EXIT_SUCCESS); error: - HDfree(points); - HDfree(check); - HDfree(points_dbl); - HDfree(check_dbl); + free(points); + free(check); + free(points_dbl); + free(check_dbl); - HDfree(points_data); - HDfree(check_data); - HDfree(points_dbl_data); - HDfree(check_dbl_data); + free(points_data); + free(check_data); + free(points_dbl_data); + free(check_dbl_data); nerrors = MAX(1, nerrors); - HDprintf("***** %d DATASET TEST%s FAILED! *****\n", nerrors, 1 == nerrors ? "" : "S"); - HDexit(EXIT_FAILURE); + printf("***** %d DATASET TEST%s FAILED! *****\n", nerrors, 1 == nerrors ? "" : "S"); + exit(EXIT_FAILURE); } /* end main() */ diff --git a/test/dt_arith.c b/test/dt_arith.c index a26945f..c7b72cb 100644 --- a/test/dt_arith.c +++ b/test/dt_arith.c @@ -99,8 +99,8 @@ typedef enum dtype_t { static int without_hardware_g = 0; /* Allocates memory aligned on a certain boundary. */ -#define aligned_malloc(Z) ((void *)((char *)HDmalloc(ALIGNMENT + Z) + ALIGNMENT)) -#define aligned_free(M) HDfree((char *)(M)-ALIGNMENT) +#define aligned_malloc(Z) ((void *)((char *)malloc(ALIGNMENT + Z) + ALIGNMENT)) +#define aligned_free(M) free((char *)(M)-ALIGNMENT) /* Initialize source buffer of integer for integer->integer and integer->floating-point conversion test. * This algorithm is mainly to avoid any casting and comparison between source and destination types @@ -116,8 +116,8 @@ static int without_hardware_g = 0; NELMTS = SRC_PREC * 3; \ BUF = (unsigned char *)aligned_malloc(NELMTS * MAX(SRC_SIZE, DST_SIZE)); \ SAVED = (unsigned char *)aligned_malloc(NELMTS * MAX(SRC_SIZE, DST_SIZE)); \ - HDmemset(BUF, 0, NELMTS *MAX(SRC_SIZE, DST_SIZE)); \ - HDmemset(SAVED, 0, NELMTS *MAX(SRC_SIZE, DST_SIZE)); \ + memset(BUF, 0, NELMTS *MAX(SRC_SIZE, DST_SIZE)); \ + memset(SAVED, 0, NELMTS *MAX(SRC_SIZE, DST_SIZE)); \ \ buf_p = BUF; \ saved_p = SAVED; \ @@ -126,14 +126,14 @@ static int without_hardware_g = 0; /*VALUE2 ascends from 00000000, to 00000011, 00000111,..., until 11111111.*/ \ for (n = 0; n < SRC_PREC; n++) { \ { \ - HDmemcpy(buf_p, &value1, SRC_SIZE); \ - HDmemcpy(saved_p, &value1, SRC_SIZE); \ + memcpy(buf_p, &value1, SRC_SIZE); \ + memcpy(saved_p, &value1, SRC_SIZE); \ buf_p += SRC_SIZE; \ saved_p += SRC_SIZE; \ } \ { \ - HDmemcpy(buf_p, &value2, SRC_SIZE); \ - HDmemcpy(saved_p, &value2, SRC_SIZE); \ + memcpy(buf_p, &value2, SRC_SIZE); \ + memcpy(saved_p, &value2, SRC_SIZE); \ buf_p += SRC_SIZE; \ saved_p += SRC_SIZE; \ } \ @@ -152,8 +152,8 @@ static int without_hardware_g = 0; /* VALUE2 descends from 11111111 to 11111110, 11111100, ..., until 10000000. */ \ for (n = 0; n < SRC_PREC - 1; n++) { \ { \ - HDmemcpy(buf_p, &value2, SRC_SIZE); \ - HDmemcpy(saved_p, &value2, SRC_SIZE); \ + memcpy(buf_p, &value2, SRC_SIZE); \ + memcpy(saved_p, &value2, SRC_SIZE); \ buf_p += SRC_SIZE; \ saved_p += SRC_SIZE; \ } \ @@ -233,8 +233,8 @@ static int without_hardware_g = 0; /* Allocate buffers */ \ BUF = (unsigned char *)aligned_malloc(NELMTS * MAX(SRC_SIZE, DST_SIZE)); \ SAVED = (unsigned char *)aligned_malloc(NELMTS * MAX(SRC_SIZE, DST_SIZE)); \ - HDmemset(BUF, 0, NELMTS *MAX(SRC_SIZE, DST_SIZE)); \ - HDmemset(SAVED, 0, NELMTS *MAX(SRC_SIZE, DST_SIZE)); \ + memset(BUF, 0, NELMTS *MAX(SRC_SIZE, DST_SIZE)); \ + memset(SAVED, 0, NELMTS *MAX(SRC_SIZE, DST_SIZE)); \ \ buf_p = BUF; \ saved_p = SAVED; \ @@ -244,15 +244,15 @@ static int without_hardware_g = 0; value2 = -SRC_MIN; \ for (n = 0; n < num_norm; n++) { \ if (value1 < SRC_MAX) { /*positive*/ \ - HDmemcpy(buf_p, &value1, SRC_SIZE); \ - HDmemcpy(saved_p, &value1, SRC_SIZE); \ + memcpy(buf_p, &value1, SRC_SIZE); \ + memcpy(saved_p, &value1, SRC_SIZE); \ value1 *= multiply; \ buf_p += SRC_SIZE; \ saved_p += SRC_SIZE; \ } \ if (value2 > -SRC_MAX) { /*negative*/ \ - HDmemcpy(buf_p, &value2, SRC_SIZE); \ - HDmemcpy(saved_p, &value2, SRC_SIZE); \ + memcpy(buf_p, &value2, SRC_SIZE); \ + memcpy(saved_p, &value2, SRC_SIZE); \ value2 *= multiply; \ buf_p += SRC_SIZE; \ saved_p += SRC_SIZE; \ @@ -260,14 +260,14 @@ static int without_hardware_g = 0; } \ \ value1 = SRC_MAX; /*maximal value*/ \ - HDmemcpy(buf_p, &value1, SRC_SIZE); \ - HDmemcpy(saved_p, &value1, SRC_SIZE); \ + memcpy(buf_p, &value1, SRC_SIZE); \ + memcpy(saved_p, &value1, SRC_SIZE); \ buf_p += SRC_SIZE; \ saved_p += SRC_SIZE; \ \ value2 = -SRC_MAX; /*negative value*/ \ - HDmemcpy(buf_p, &value2, SRC_SIZE); \ - HDmemcpy(saved_p, &value2, SRC_SIZE); \ + memcpy(buf_p, &value2, SRC_SIZE); \ + memcpy(saved_p, &value2, SRC_SIZE); \ buf_p += SRC_SIZE; \ saved_p += SRC_SIZE; \ } @@ -288,25 +288,25 @@ static int without_hardware_g = 0; /* Allocate buffers */ \ BUF = (unsigned char *)aligned_malloc(NELMTS * MAX(SRC_SIZE, DST_SIZE)); \ SAVED = (unsigned char *)aligned_malloc(NELMTS * MAX(SRC_SIZE, DST_SIZE)); \ - HDmemset(BUF, 0, NELMTS *MAX(SRC_SIZE, DST_SIZE)); \ - HDmemset(SAVED, 0, NELMTS *MAX(SRC_SIZE, DST_SIZE)); \ + memset(BUF, 0, NELMTS *MAX(SRC_SIZE, DST_SIZE)); \ + memset(SAVED, 0, NELMTS *MAX(SRC_SIZE, DST_SIZE)); \ \ - tmp1 = (unsigned char *)HDcalloc((size_t)1, (size_t)SRC_SIZE); \ - tmp2 = (unsigned char *)HDcalloc((size_t)1, (size_t)SRC_SIZE); \ + tmp1 = (unsigned char *)calloc((size_t)1, (size_t)SRC_SIZE); \ + tmp2 = (unsigned char *)calloc((size_t)1, (size_t)SRC_SIZE); \ \ buf_p = BUF; \ saved_p = SAVED; \ \ /*Denormalized values. Exponent is 0. Let mantissa starts from 00000001, 00000011, \ *00000111,..., until 11111111.*/ \ - HDmemset(tmp1, 0, SRC_SIZE); \ - HDmemset(tmp2, 0, SRC_SIZE); \ + memset(tmp1, 0, SRC_SIZE); \ + memset(tmp2, 0, SRC_SIZE); \ H5T__bit_set(tmp2, SRC_PREC - 1, (size_t)1, TRUE); /*the negative value*/ \ for (n = 0; n < SRC_MANT_DIG - 1; n++) { \ H5T__bit_set(tmp1, n, (size_t)1, TRUE); /*turn on 1 bit each time*/ \ CHANGE_ORDER(tmp1, SRC_ORDR, SRC_SIZE); /*change order for big endian*/ \ - HDmemcpy(buf_p, tmp1, SRC_SIZE); \ - HDmemcpy(saved_p, tmp1, SRC_SIZE); \ + memcpy(buf_p, tmp1, SRC_SIZE); \ + memcpy(saved_p, tmp1, SRC_SIZE); \ CHANGE_ORDER(tmp1, SRC_ORDR, SRC_SIZE); /*change back the order for bit operation*/ \ buf_p += SRC_SIZE; \ saved_p += SRC_SIZE; \ @@ -314,14 +314,14 @@ static int without_hardware_g = 0; /*negative values*/ \ H5T__bit_set(tmp2, n, (size_t)1, TRUE); \ CHANGE_ORDER(tmp2, SRC_ORDR, SRC_SIZE); \ - HDmemcpy(buf_p, tmp2, SRC_SIZE); \ - HDmemcpy(saved_p, tmp2, SRC_SIZE); \ + memcpy(buf_p, tmp2, SRC_SIZE); \ + memcpy(saved_p, tmp2, SRC_SIZE); \ CHANGE_ORDER(tmp2, SRC_ORDR, SRC_SIZE); \ buf_p += SRC_SIZE; \ saved_p += SRC_SIZE; \ } \ - HDfree(tmp1); \ - HDfree(tmp2); \ + free(tmp1); \ + free(tmp2); \ } /* Allocate buffer and initialize it with floating-point special values, +/-0, +/-infinity, @@ -340,24 +340,24 @@ static int without_hardware_g = 0; /* Allocate buffers */ \ BUF = (unsigned char *)aligned_malloc(NELMTS * MAX(SRC_SIZE, DST_SIZE)); \ SAVED = (unsigned char *)aligned_malloc(NELMTS * MAX(SRC_SIZE, DST_SIZE)); \ - HDmemset(BUF, 0, NELMTS *MAX(SRC_SIZE, DST_SIZE)); \ - HDmemset(SAVED, 0, NELMTS *MAX(SRC_SIZE, DST_SIZE)); \ - value = (unsigned char *)HDcalloc(SRC_SIZE, sizeof(unsigned char)); \ + memset(BUF, 0, NELMTS *MAX(SRC_SIZE, DST_SIZE)); \ + memset(SAVED, 0, NELMTS *MAX(SRC_SIZE, DST_SIZE)); \ + value = (unsigned char *)calloc(SRC_SIZE, sizeof(unsigned char)); \ \ buf_p = BUF; \ \ /* +0 */ \ H5T__bit_set(value, (size_t)0, SRC_PREC, FALSE); \ - HDmemcpy(buf_p, value, SRC_SIZE * sizeof(unsigned char)); \ + memcpy(buf_p, value, SRC_SIZE * sizeof(unsigned char)); \ buf_p += SRC_SIZE; \ \ for (n = 0; n < 2; n++) { \ if (n == 1) { \ - HDmemset(value, 0, SRC_SIZE * sizeof(unsigned char)); \ + memset(value, 0, SRC_SIZE * sizeof(unsigned char)); \ /* -0 */ \ H5T__bit_set(value, (size_t)(SRC_PREC - 1), (size_t)1, TRUE); \ CHANGE_ORDER(value, SRC_ORDR, SRC_SIZE); /*change order for big endian*/ \ - HDmemcpy(buf_p, value, SRC_SIZE * sizeof(unsigned char)); \ + memcpy(buf_p, value, SRC_SIZE * sizeof(unsigned char)); \ CHANGE_ORDER(value, SRC_ORDR, SRC_SIZE); /*change back the order for bit operation*/ \ buf_p += SRC_SIZE; \ } \ @@ -365,27 +365,27 @@ static int without_hardware_g = 0; /* +/-infinity */ \ H5T__bit_set(value, (size_t)(SRC_MANT_DIG - 1), SRC_PREC - SRC_MANT_DIG, TRUE); \ CHANGE_ORDER(value, SRC_ORDR, SRC_SIZE); /*change order for big endian*/ \ - HDmemcpy(buf_p, value, SRC_SIZE * sizeof(unsigned char)); \ + memcpy(buf_p, value, SRC_SIZE * sizeof(unsigned char)); \ CHANGE_ORDER(value, SRC_ORDR, SRC_SIZE); /*change back the order for bit operation*/ \ buf_p += SRC_SIZE; \ \ /* +/-SNaN */ \ H5T__bit_set(value, (size_t)0, (size_t)1, TRUE); \ CHANGE_ORDER(value, SRC_ORDR, SRC_SIZE); /*change order for big endian*/ \ - HDmemcpy(buf_p, value, SRC_SIZE * sizeof(unsigned char)); \ + memcpy(buf_p, value, SRC_SIZE * sizeof(unsigned char)); \ CHANGE_ORDER(value, SRC_ORDR, SRC_SIZE); /*change back the order for bit operation*/ \ buf_p += SRC_SIZE; \ \ /* +/-QNaN */ \ H5T__bit_set(value, (size_t)(SRC_MANT_DIG - 2), (size_t)1, TRUE); \ CHANGE_ORDER(value, SRC_ORDR, SRC_SIZE); /*change order for big endian*/ \ - HDmemcpy(buf_p, value, SRC_SIZE * sizeof(unsigned char)); \ + memcpy(buf_p, value, SRC_SIZE * sizeof(unsigned char)); \ CHANGE_ORDER(value, SRC_ORDR, SRC_SIZE); /*change back the order for bit operation*/ \ buf_p += SRC_SIZE; \ } \ \ - HDmemcpy(SAVED, BUF, NELMTS *MAX(SRC_SIZE, DST_SIZE)); \ - HDfree(value); \ + memcpy(SAVED, BUF, NELMTS *MAX(SRC_SIZE, DST_SIZE)); \ + free(value); \ } static hbool_t overflows(unsigned char *origin_bits, hid_t src_id, size_t dst_num_bits); @@ -414,7 +414,7 @@ fpe_handler(int H5_ATTR_UNUSED signo) HDputs(" Remaining tests could not be run."); HDputs(" Please turn off SIGFPE on overflows and try again."); #endif - HDexit(255); + exit(255); } /*------------------------------------------------------------------------- @@ -522,7 +522,7 @@ test_hard_query(void) /* Verify the conversion from int to float is a hard conversion. */ if (H5Tcompiler_conv(H5T_NATIVE_INT, H5T_NATIVE_FLOAT) != TRUE) { H5_FAILED(); - HDprintf("Can't query conversion function\n"); + printf("Can't query conversion function\n"); goto error; } @@ -532,7 +532,7 @@ test_hard_query(void) (H5T_conv_t)((void (*)(void))H5T__conv_int_float)); if (H5Tcompiler_conv(H5T_NATIVE_INT, H5T_NATIVE_FLOAT) != FALSE) { H5_FAILED(); - HDprintf("Can't query conversion function\n"); + printf("Can't query conversion function\n"); goto error; } @@ -542,7 +542,7 @@ test_hard_query(void) (H5T_conv_t)((void (*)(void))H5T__conv_int_float)); if (H5Tcompiler_conv(H5T_NATIVE_INT, H5T_NATIVE_FLOAT) != TRUE) { H5_FAILED(); - HDprintf("Can't query conversion function\n"); + printf("Can't query conversion function\n"); goto error; } @@ -637,7 +637,7 @@ test_particular_fp_integer(void) if ((dxpl_id = H5Pcreate(H5P_DATASET_XFER)) < 0) { H5_FAILED(); - HDprintf("Can't create data transfer property list\n"); + printf("Can't create data transfer property list\n"); goto error; } @@ -645,28 +645,28 @@ test_particular_fp_integer(void) endian = H5Tget_order(H5T_NATIVE_DOUBLE); src_size1 = H5Tget_size(H5T_NATIVE_DOUBLE); dst_size1 = H5Tget_size(H5T_NATIVE_SCHAR); - buf1 = (unsigned char *)HDcalloc((size_t)1, (size_t)MAX(src_size1, dst_size1)); - saved_buf1 = (unsigned char *)HDcalloc((size_t)1, (size_t)MAX(src_size1, dst_size1)); + buf1 = (unsigned char *)calloc((size_t)1, (size_t)MAX(src_size1, dst_size1)); + saved_buf1 = (unsigned char *)calloc((size_t)1, (size_t)MAX(src_size1, dst_size1)); - HDmemcpy(buf1, &src_d, src_size1); - HDmemcpy(saved_buf1, &src_d, src_size1); + memcpy(buf1, &src_d, src_size1); + memcpy(saved_buf1, &src_d, src_size1); /* Register exception handling function and signal the destination is "signed char". */ flag = 1; if (H5Pset_type_conv_cb(dxpl_id, expt_handle, &flag) < 0) { H5_FAILED(); - HDprintf("Can't register conversion callback\n"); + printf("Can't register conversion callback\n"); goto error; } /* Do conversion */ if (H5Tconvert(H5T_NATIVE_DOUBLE, H5T_NATIVE_SCHAR, (size_t)1, buf1, NULL, dxpl_id) < 0) { H5_FAILED(); - HDprintf("Can't convert data\n"); + printf("Can't convert data\n"); goto error; } - HDmemcpy(&dst_c, buf1, dst_size1); + memcpy(&dst_c, buf1, dst_size1); /* Print errors */ if (dst_c != SCHAR_MAX) { @@ -676,29 +676,29 @@ test_particular_fp_integer(void) if (0 == fails_this_test++) H5_FAILED(); - HDprintf(" test double to signed char:\n"); - HDprintf(" src = "); + printf(" test double to signed char:\n"); + printf(" src = "); for (j = 0; j < src_size1; j++) - HDprintf(" %02x", saved_buf1[ENDIAN(src_size1, j, endian)]); + printf(" %02x", saved_buf1[ENDIAN(src_size1, j, endian)]); - HDmemcpy(&x, saved_buf1, src_size1); - HDprintf(" %29.20e\n", x); + memcpy(&x, saved_buf1, src_size1); + printf(" %29.20e\n", x); - HDprintf(" dst = "); + printf(" dst = "); for (j = 0; j < dst_size1; j++) - HDprintf(" %02x", buf1[ENDIAN(dst_size1, j, endian)]); + printf(" %02x", buf1[ENDIAN(dst_size1, j, endian)]); - HDmemcpy(&y, buf1, dst_size1); - HDprintf(" %29d\n", y); + memcpy(&y, buf1, dst_size1); + printf(" %29d\n", y); } /* Test conversion from float (the value is INT_MAX) to int. */ src_size2 = H5Tget_size(H5T_NATIVE_FLOAT); dst_size2 = H5Tget_size(H5T_NATIVE_INT); - buf2 = (unsigned char *)HDcalloc((size_t)1, (size_t)MAX(src_size2, dst_size2)); - saved_buf2 = (unsigned char *)HDcalloc((size_t)1, (size_t)MAX(src_size2, dst_size2)); - HDmemcpy(buf2, &src_f, src_size2); - HDmemcpy(saved_buf2, &src_f, src_size2); + buf2 = (unsigned char *)calloc((size_t)1, (size_t)MAX(src_size2, dst_size2)); + saved_buf2 = (unsigned char *)calloc((size_t)1, (size_t)MAX(src_size2, dst_size2)); + memcpy(buf2, &src_f, src_size2); + memcpy(saved_buf2, &src_f, src_size2); /* signal exception handling function that the destination is "int". */ flag = 0; @@ -706,11 +706,11 @@ test_particular_fp_integer(void) /* Do conversion */ if (H5Tconvert(H5T_NATIVE_FLOAT, H5T_NATIVE_INT, (size_t)1, buf2, NULL, dxpl_id) < 0) { H5_FAILED(); - HDprintf("Can't convert data\n"); + printf("Can't convert data\n"); goto error; } - HDmemcpy(&dst_i, buf2, dst_size2); + memcpy(&dst_i, buf2, dst_size2); /* Print errors */ if (dst_i != fill_value) { @@ -720,20 +720,20 @@ test_particular_fp_integer(void) if (0 == fails_this_test++) H5_FAILED(); - HDprintf(" test float to int:\n"); - HDprintf(" src = "); + printf(" test float to int:\n"); + printf(" src = "); for (j = 0; j < src_size2; j++) - HDprintf(" %02x", saved_buf2[ENDIAN(src_size2, j, endian)]); + printf(" %02x", saved_buf2[ENDIAN(src_size2, j, endian)]); - HDmemcpy(&x, saved_buf2, src_size2); - HDprintf(" %29.20e\n", (double)x); + memcpy(&x, saved_buf2, src_size2); + printf(" %29.20e\n", (double)x); - HDprintf(" dst = "); + printf(" dst = "); for (j = 0; j < dst_size2; j++) - HDprintf(" %02x", buf2[ENDIAN(dst_size2, j, endian)]); + printf(" %02x", buf2[ENDIAN(dst_size2, j, endian)]); - HDmemcpy(&y, buf2, dst_size2); - HDprintf(" %29d\n", y); + memcpy(&y, buf2, dst_size2); + printf(" %29d\n", y); } if (fails_this_test) @@ -741,37 +741,37 @@ test_particular_fp_integer(void) if (H5Pclose(dxpl_id) < 0) { H5_FAILED(); - HDprintf("Can't close property list\n"); + printf("Can't close property list\n"); goto error; } if (buf1) - HDfree(buf1); + free(buf1); if (buf2) - HDfree(buf2); + free(buf2); if (saved_buf1) - HDfree(saved_buf1); + free(saved_buf1); if (saved_buf2) - HDfree(saved_buf2); + free(saved_buf2); PASSED(); return 0; error: - HDfflush(stdout); + fflush(stdout); H5E_BEGIN_TRY { H5Pclose(dxpl_id); } H5E_END_TRY; if (buf1) - HDfree(buf1); + free(buf1); if (buf2) - HDfree(buf2); + free(buf2); if (saved_buf1) - HDfree(saved_buf1); + free(saved_buf1); if (saved_buf2) - HDfree(saved_buf2); + free(saved_buf2); /* Restore the default error handler (set in h5_reset()) */ h5_restore_err(); @@ -818,25 +818,25 @@ test_derived_flt(void) h5_fixname(FILENAME[0], H5P_DEFAULT, filename, sizeof filename); if ((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf("Can't create file\n"); + printf("Can't create file\n"); goto error; } if ((dxpl_id = H5Pcreate(H5P_DATASET_XFER)) < 0) { H5_FAILED(); - HDprintf("Can't create data transfer property list\n"); + printf("Can't create data transfer property list\n"); goto error; } if ((tid1 = H5Tcopy(H5T_IEEE_F64LE)) < 0) { H5_FAILED(); - HDprintf("Can't copy data type\n"); + printf("Can't copy data type\n"); goto error; } if ((tid2 = H5Tcopy(H5T_IEEE_F32LE)) < 0) { H5_FAILED(); - HDprintf("Can't copy data type\n"); + printf("Can't copy data type\n"); goto error; } @@ -860,44 +860,44 @@ test_derived_flt(void) *-----------------------------------------------------------------------*/ if (H5Tset_fields(tid1, (size_t)44, (size_t)34, (size_t)10, (size_t)3, (size_t)31) < 0) { H5_FAILED(); - HDprintf("Can't set fields\n"); + printf("Can't set fields\n"); goto error; } if (H5Tset_offset(tid1, (size_t)3) < 0) { H5_FAILED(); - HDprintf("Can't set offset\n"); + printf("Can't set offset\n"); goto error; } if (H5Tset_precision(tid1, (size_t)42) < 0) { H5_FAILED(); - HDprintf("Can't set precision 1\n"); + printf("Can't set precision 1\n"); goto error; } if (H5Tset_size(tid1, (size_t)7) < 0) { H5_FAILED(); - HDprintf("Can't set size\n"); + printf("Can't set size\n"); goto error; } if (H5Tset_ebias(tid1, (size_t)511) < 0) { H5_FAILED(); - HDprintf("Can't set exponent bias\n"); + printf("Can't set exponent bias\n"); goto error; } if (H5Tset_pad(tid1, H5T_PAD_ZERO, H5T_PAD_ZERO) < 0) { H5_FAILED(); - HDprintf("Can't set padding\n"); + printf("Can't set padding\n"); goto error; } if (H5Tcommit2(file, "new float type 1", tid1, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf("Can't set inpad\n"); + printf("Can't set inpad\n"); goto error; } if (H5Tclose(tid1) < 0) { H5_FAILED(); - HDprintf("Can't close datatype\n"); + printf("Can't close datatype\n"); goto error; } @@ -905,33 +905,33 @@ test_derived_flt(void) FAIL_PUTS_ERROR("Can't open datatype"); if (H5Tget_fields(tid1, &spos, &epos, &esize, &mpos, &msize) < 0) { H5_FAILED(); - HDprintf("Can't get fields\n"); + printf("Can't get fields\n"); goto error; } if (spos != 44 || epos != 34 || esize != 10 || mpos != 3 || msize != 31) { H5_FAILED(); - HDprintf("Wrong field values\n"); + printf("Wrong field values\n"); goto error; } if (H5Tget_precision(tid1) != 42) { H5_FAILED(); - HDprintf("Can't get precision or wrong precision\n"); + printf("Can't get precision or wrong precision\n"); goto error; } if (H5Tget_offset(tid1) != 3) { H5_FAILED(); - HDprintf("Can't get offset or wrong offset\n"); + printf("Can't get offset or wrong offset\n"); goto error; } if ((size = H5Tget_size(tid1)) != 7) { H5_FAILED(); - HDprintf("Can't get size or wrong size\n"); + printf("Can't get size or wrong size\n"); goto error; } if (H5Tget_ebias(tid1) != 511) { H5_FAILED(); - HDprintf("Can't get exponent bias or wrong bias\n"); + printf("Can't get exponent bias or wrong bias\n"); goto error; } @@ -941,11 +941,11 @@ test_derived_flt(void) */ src_size = H5Tget_size(H5T_NATIVE_INT); endian = H5Tget_order(H5T_NATIVE_INT); - buf = (unsigned char *)HDmalloc(nelmts * (MAX(src_size, size))); - saved_buf = (unsigned char *)HDmalloc(nelmts * src_size); - HDmemset(buf, 0, nelmts * MAX(src_size, size)); - HDmemset(saved_buf, 0, nelmts * src_size); - aligned = (int *)HDcalloc((size_t)1, src_size); + buf = (unsigned char *)malloc(nelmts * (MAX(src_size, size))); + saved_buf = (unsigned char *)malloc(nelmts * src_size); + memset(buf, 0, nelmts * MAX(src_size, size)); + memset(saved_buf, 0, nelmts * src_size); + aligned = (int *)calloc((size_t)1, src_size); for (i = 0; i < nelmts * src_size; i++) buf[i] = saved_buf[i] = (unsigned char)HDrand(); @@ -954,13 +954,13 @@ test_derived_flt(void) * The mantissa is big enough to retain the integer's precision. */ if (H5Tconvert(H5T_NATIVE_INT, tid1, nelmts, buf, NULL, dxpl_id) < 0) { H5_FAILED(); - HDprintf("Can't convert data\n"); + printf("Can't convert data\n"); goto error; } /* Convert data from the derived floating-point type back to native integer. */ if (H5Tconvert(tid1, H5T_NATIVE_INT, nelmts, buf, NULL, dxpl_id) < 0) { H5_FAILED(); - HDprintf("Can't convert data\n"); + printf("Can't convert data\n"); goto error; } @@ -976,25 +976,25 @@ test_derived_flt(void) if (0 == fails_this_test++) { HDsnprintf(str, sizeof(str), "\nTesting random sw derived floating-point -> derived floating-point conversions"); - HDprintf("%-70s", str); - HDfflush(stdout); + printf("%-70s", str); + fflush(stdout); H5_FAILED(); } - HDprintf(" test %u elmt %u: \n", 1, (unsigned)i); + printf(" test %u elmt %u: \n", 1, (unsigned)i); - HDprintf(" src = "); + printf(" src = "); for (j = 0; j < src_size; j++) - HDprintf(" %02x", saved_buf[i * src_size + ENDIAN(src_size, j, endian)]); + printf(" %02x", saved_buf[i * src_size + ENDIAN(src_size, j, endian)]); - HDmemcpy(aligned, saved_buf + i * sizeof(int), sizeof(int)); - HDprintf(" %29d\n", *aligned); + memcpy(aligned, saved_buf + i * sizeof(int), sizeof(int)); + printf(" %29d\n", *aligned); - HDprintf(" dst = "); + printf(" dst = "); for (j = 0; j < src_size; j++) - HDprintf(" %02x", buf[i * src_size + ENDIAN(src_size, j, endian)]); + printf(" %02x", buf[i * src_size + ENDIAN(src_size, j, endian)]); - HDmemcpy(aligned, buf + i * sizeof(int), sizeof(int)); - HDprintf(" %29d\n", *aligned); + memcpy(aligned, buf + i * sizeof(int), sizeof(int)); + printf(" %29d\n", *aligned); if (fails_this_test >= max_fails) { HDputs(" maximum failures reached, aborting test..."); @@ -1003,9 +1003,9 @@ test_derived_flt(void) } fails_this_test = 0; - HDfree(buf); - HDfree(saved_buf); - HDfree(aligned); + free(buf); + free(saved_buf); + free(aligned); buf = NULL; saved_buf = NULL; aligned = NULL; @@ -1021,43 +1021,43 @@ test_derived_flt(void) *--------------------------------------------------------------------------*/ if (H5Tset_fields(tid2, (size_t)23, (size_t)16, (size_t)7, (size_t)0, (size_t)16) < 0) { H5_FAILED(); - HDprintf("Can't set fields\n"); + printf("Can't set fields\n"); goto error; } if (H5Tset_offset(tid2, (size_t)0) < 0) { H5_FAILED(); - HDprintf("Can't set offset\n"); + printf("Can't set offset\n"); goto error; } if (H5Tset_precision(tid2, (size_t)24) < 0) { H5_FAILED(); - HDprintf("Can't set precision 2\n"); + printf("Can't set precision 2\n"); goto error; } if (H5Tset_size(tid2, (size_t)3) < 0) { H5_FAILED(); - HDprintf("Can't set size\n"); + printf("Can't set size\n"); goto error; } if (H5Tset_ebias(tid2, (size_t)63) < 0) { H5_FAILED(); - HDprintf("Can't set size\n"); + printf("Can't set size\n"); goto error; } if (H5Tset_pad(tid2, H5T_PAD_ZERO, H5T_PAD_ZERO) < 0) { H5_FAILED(); - HDprintf("Can't set padding\n"); + printf("Can't set padding\n"); goto error; } if (H5Tcommit2(file, "new float type 2", tid2, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf("Can't set inpad\n"); + printf("Can't set inpad\n"); goto error; } if (H5Tclose(tid2) < 0) { H5_FAILED(); - HDprintf("Can't close datatype\n"); + printf("Can't close datatype\n"); goto error; } @@ -1065,33 +1065,33 @@ test_derived_flt(void) FAIL_PUTS_ERROR("Can't open datatype"); if (H5Tget_fields(tid2, &spos, &epos, &esize, &mpos, &msize) < 0) { H5_FAILED(); - HDprintf("Can't get fields\n"); + printf("Can't get fields\n"); goto error; } if (spos != 23 || epos != 16 || esize != 7 || mpos != 0 || msize != 16) { H5_FAILED(); - HDprintf("Wrong field values\n"); + printf("Wrong field values\n"); goto error; } if (H5Tget_precision(tid2) != 24) { H5_FAILED(); - HDprintf("Can't get precision or wrong precision\n"); + printf("Can't get precision or wrong precision\n"); goto error; } if (H5Tget_offset(tid2) != 0) { H5_FAILED(); - HDprintf("Can't get offset or wrong offset\n"); + printf("Can't get offset or wrong offset\n"); goto error; } if ((size = H5Tget_size(tid2)) != 3) { H5_FAILED(); - HDprintf("Can't get size or wrong size\n"); + printf("Can't get size or wrong size\n"); goto error; } if (H5Tget_ebias(tid2) != 63) { H5_FAILED(); - HDprintf("Can't get exponent bias or wrong bias\n"); + printf("Can't get exponent bias or wrong bias\n"); goto error; } @@ -1102,10 +1102,10 @@ test_derived_flt(void) src_size = H5Tget_size(tid2); dst_size = H5Tget_size(tid1); endian = H5Tget_order(tid2); - buf = (unsigned char *)HDmalloc(nelmts * (MAX(src_size, dst_size))); - saved_buf = (unsigned char *)HDmalloc(nelmts * src_size); - HDmemset(buf, 0, nelmts * MAX(src_size, dst_size)); - HDmemset(saved_buf, 0, nelmts * src_size); + buf = (unsigned char *)malloc(nelmts * (MAX(src_size, dst_size))); + saved_buf = (unsigned char *)malloc(nelmts * src_size); + memset(buf, 0, nelmts * MAX(src_size, dst_size)); + memset(saved_buf, 0, nelmts * src_size); for (i = 0; i < nelmts * src_size; i++) buf[i] = saved_buf[i] = (unsigned char)HDrand(); @@ -1115,13 +1115,13 @@ test_derived_flt(void) * the precision and exponent power. */ if (H5Tconvert(tid2, tid1, nelmts, buf, NULL, dxpl_id) < 0) { H5_FAILED(); - HDprintf("Can't convert data\n"); + printf("Can't convert data\n"); goto error; } /* Convert data from the 1st back to the 2nd derived floating-point type. */ if (H5Tconvert(tid1, tid2, nelmts, buf, NULL, dxpl_id) < 0) { H5_FAILED(); - HDprintf("Can't convert data\n"); + printf("Can't convert data\n"); goto error; } @@ -1145,21 +1145,21 @@ test_derived_flt(void) if (0 == fails_this_test++) { HDsnprintf(str, sizeof(str), "\nTesting random sw derived floating-point -> derived floating-point conversions"); - HDprintf("%-70s", str); - HDfflush(stdout); + printf("%-70s", str); + fflush(stdout); H5_FAILED(); } - HDprintf(" test %u elmt %u: \n", 1, (unsigned)i); + printf(" test %u elmt %u: \n", 1, (unsigned)i); - HDprintf(" src = "); + printf(" src = "); for (j = 0; j < src_size; j++) - HDprintf(" %02x", saved_buf[i * src_size + ENDIAN(src_size, j, endian)]); - HDprintf("\n"); + printf(" %02x", saved_buf[i * src_size + ENDIAN(src_size, j, endian)]); + printf("\n"); - HDprintf(" dst = "); + printf(" dst = "); for (j = 0; j < src_size; j++) - HDprintf(" %02x", buf[i * src_size + ENDIAN(src_size, j, endian)]); - HDprintf("\n"); + printf(" %02x", buf[i * src_size + ENDIAN(src_size, j, endian)]); + printf("\n"); if (fails_this_test >= max_fails) { HDputs(" maximum failures reached, aborting test..."); @@ -1168,31 +1168,31 @@ test_derived_flt(void) } if (buf) - HDfree(buf); + free(buf); if (saved_buf) - HDfree(saved_buf); + free(saved_buf); if (H5Tclose(tid1) < 0) { H5_FAILED(); - HDprintf("Can't close datatype\n"); + printf("Can't close datatype\n"); goto error; } if (H5Tclose(tid2) < 0) { H5_FAILED(); - HDprintf("Can't close datatype\n"); + printf("Can't close datatype\n"); goto error; } if (H5Pclose(dxpl_id) < 0) { H5_FAILED(); - HDprintf("Can't close property list\n"); + printf("Can't close property list\n"); goto error; } if (H5Fclose(file) < 0) { H5_FAILED(); - HDprintf("Can't close file\n"); + printf("Can't close file\n"); goto error; } /* end if */ @@ -1207,12 +1207,12 @@ test_derived_flt(void) error: if (buf) - HDfree(buf); + free(buf); if (saved_buf) - HDfree(saved_buf); + free(saved_buf); if (aligned) - HDfree(aligned); - HDfflush(stdout); + free(aligned); + fflush(stdout); H5E_BEGIN_TRY { H5Tclose(tid1); @@ -1265,25 +1265,25 @@ test_derived_integer(void) h5_fixname(FILENAME[1], H5P_DEFAULT, filename, sizeof filename); if ((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf("Can't create file\n"); + printf("Can't create file\n"); goto error; } if ((dxpl_id = H5Pcreate(H5P_DATASET_XFER)) < 0) { H5_FAILED(); - HDprintf("Can't create data transfer property list\n"); + printf("Can't create data transfer property list\n"); goto error; } if ((tid1 = H5Tcopy(H5T_STD_I32LE)) < 0) { H5_FAILED(); - HDprintf("Can't copy data type\n"); + printf("Can't copy data type\n"); goto error; } if ((tid2 = H5Tcopy(H5T_STD_U64LE)) < 0) { H5_FAILED(); - HDprintf("Can't copy data type\n"); + printf("Can't copy data type\n"); goto error; } @@ -1301,37 +1301,37 @@ test_derived_integer(void) *--------------------------------------------------------------------------*/ if (H5Tset_offset(tid1, (size_t)0) < 0) { H5_FAILED(); - HDprintf("Can't set offset\n"); + printf("Can't set offset\n"); goto error; } if (H5Tset_size(tid1, (size_t)3) < 0) { H5_FAILED(); - HDprintf("Can't set size\n"); + printf("Can't set size\n"); goto error; } if (H5Tset_precision(tid1, (size_t)24) < 0) { H5_FAILED(); - HDprintf("Can't set precision\n"); + printf("Can't set precision\n"); goto error; } if (H5Tset_order(tid1, H5T_ORDER_BE) < 0) { H5_FAILED(); - HDprintf("Can't set order\n"); + printf("Can't set order\n"); goto error; } if (H5Tcommit2(file, "new integer type 1", tid1, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf("Can't commit data type\n"); + printf("Can't commit data type\n"); goto error; } if (H5Tclose(tid1) < 0) { H5_FAILED(); - HDprintf("Can't close datatype\n"); + printf("Can't close datatype\n"); goto error; } @@ -1339,22 +1339,22 @@ test_derived_integer(void) FAIL_PUTS_ERROR("Can't open datatype"); if (H5Tget_precision(tid1) != 24) { H5_FAILED(); - HDprintf("Can't get precision or wrong precision\n"); + printf("Can't get precision or wrong precision\n"); goto error; } if (H5Tget_offset(tid1) != 0) { H5_FAILED(); - HDprintf("Can't get offset or wrong offset\n"); + printf("Can't get offset or wrong offset\n"); goto error; } if (H5Tget_size(tid1) != 3) { H5_FAILED(); - HDprintf("Can't get size or wrong size\n"); + printf("Can't get size or wrong size\n"); goto error; } if (H5Tget_order(tid1) != H5T_ORDER_BE) { H5_FAILED(); - HDprintf("Can't get order or wrong order\n"); + printf("Can't get order or wrong order\n"); goto error; } @@ -1368,31 +1368,31 @@ test_derived_integer(void) *--------------------------------------------------------------------------*/ if (H5Tset_precision(tid2, (size_t)48) < 0) { H5_FAILED(); - HDprintf("Can't set precision\n"); + printf("Can't set precision\n"); goto error; } if (H5Tset_offset(tid2, (size_t)10) < 0) { H5_FAILED(); - HDprintf("Can't set offset\n"); + printf("Can't set offset\n"); goto error; } if (H5Tset_sign(tid2, H5T_SGN_2) < 0) { H5_FAILED(); - HDprintf("Can't set offset\n"); + printf("Can't set offset\n"); goto error; } if (H5Tcommit2(file, "new integer type 2", tid2, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf("Can't commit data type\n"); + printf("Can't commit data type\n"); goto error; } if (H5Tclose(tid2) < 0) { H5_FAILED(); - HDprintf("Can't close datatype\n"); + printf("Can't close datatype\n"); goto error; } @@ -1400,22 +1400,22 @@ test_derived_integer(void) FAIL_PUTS_ERROR("Can't open datatype"); if (H5Tget_precision(tid2) != 48) { H5_FAILED(); - HDprintf("Can't get precision or wrong precision\n"); + printf("Can't get precision or wrong precision\n"); goto error; } if (H5Tget_offset(tid2) != 10) { H5_FAILED(); - HDprintf("Can't get offset or wrong offset\n"); + printf("Can't get offset or wrong offset\n"); goto error; } if (H5Tget_size(tid2) != 8) { H5_FAILED(); - HDprintf("Can't get size or wrong size\n"); + printf("Can't get size or wrong size\n"); goto error; } if (H5Tget_sign(tid2) != H5T_SGN_2) { H5_FAILED(); - HDprintf("Can't get sign or wrong sign\n"); + printf("Can't get sign or wrong sign\n"); goto error; } @@ -1426,10 +1426,10 @@ test_derived_integer(void) src_size = H5Tget_size(tid1); dst_size = H5Tget_size(tid2); endian = H5Tget_order(tid1); - buf = (unsigned char *)HDmalloc(nelmts * (MAX(src_size, dst_size))); - saved_buf = (unsigned char *)HDmalloc(nelmts * src_size); - HDmemset(buf, 0, nelmts * MAX(src_size, dst_size)); - HDmemset(saved_buf, 0, nelmts * src_size); + buf = (unsigned char *)malloc(nelmts * (MAX(src_size, dst_size))); + saved_buf = (unsigned char *)malloc(nelmts * src_size); + memset(buf, 0, nelmts * MAX(src_size, dst_size)); + memset(saved_buf, 0, nelmts * src_size); for (i = 0; i < nelmts * src_size; i++) buf[i] = saved_buf[i] = (unsigned char)HDrand(); @@ -1439,13 +1439,13 @@ test_derived_integer(void) * the 1st type's precision. */ if (H5Tconvert(tid1, tid2, nelmts, buf, NULL, dxpl_id) < 0) { H5_FAILED(); - HDprintf("Can't convert data\n"); + printf("Can't convert data\n"); goto error; } /* Convert data from the 2nd back to the 1st derived integer type. */ if (H5Tconvert(tid2, tid1, nelmts, buf, NULL, dxpl_id) < 0) { H5_FAILED(); - HDprintf("Can't convert data\n"); + printf("Can't convert data\n"); goto error; } @@ -1461,21 +1461,21 @@ test_derived_integer(void) if (0 == fails_this_test++) { HDsnprintf(str, sizeof(str), "\nTesting random sw derived integer -> derived integer conversions"); - HDprintf("%-70s", str); - HDfflush(stdout); + printf("%-70s", str); + fflush(stdout); H5_FAILED(); } - HDprintf(" test %u elmt %u: \n", 1, (unsigned)i); + printf(" test %u elmt %u: \n", 1, (unsigned)i); - HDprintf(" src = "); + printf(" src = "); for (j = 0; j < src_size; j++) - HDprintf(" %02x", saved_buf[i * src_size + ENDIAN(src_size, j, endian)]); - HDprintf("\n"); + printf(" %02x", saved_buf[i * src_size + ENDIAN(src_size, j, endian)]); + printf("\n"); - HDprintf(" dst = "); + printf(" dst = "); for (j = 0; j < src_size; j++) - HDprintf(" %02x", buf[i * src_size + ENDIAN(src_size, j, endian)]); - HDprintf("\n"); + printf(" %02x", buf[i * src_size + ENDIAN(src_size, j, endian)]); + printf("\n"); if (fails_this_test >= max_fails) { HDputs(" maximum failures reached, aborting test..."); @@ -1485,30 +1485,30 @@ test_derived_integer(void) if (H5Tclose(tid1) < 0) { H5_FAILED(); - HDprintf("Can't close datatype\n"); + printf("Can't close datatype\n"); goto error; } if (H5Tclose(tid2) < 0) { H5_FAILED(); - HDprintf("Can't close datatype\n"); + printf("Can't close datatype\n"); goto error; } if (H5Pclose(dxpl_id) < 0) { H5_FAILED(); - HDprintf("Can't close property list\n"); + printf("Can't close property list\n"); goto error; } if (H5Fclose(file) < 0) { H5_FAILED(); - HDprintf("Can't close file\n"); + printf("Can't close file\n"); goto error; } /* end if */ - HDfree(buf); - HDfree(saved_buf); + free(buf); + free(saved_buf); PASSED(); @@ -1521,10 +1521,10 @@ test_derived_integer(void) error: if (buf) - HDfree(buf); + free(buf); if (saved_buf) - HDfree(saved_buf); - HDfflush(stdout); + free(saved_buf); + fflush(stdout); H5E_BEGIN_TRY { H5Tclose(tid1); @@ -1692,15 +1692,15 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst) /* Sanity checks */ if (OTHER == src_type || OTHER == dst_type) { HDsnprintf(str, sizeof(str), "Testing %s %s -> %s conversions", name, src_type_name, dst_type_name); - HDprintf("%-70s", str); + printf("%-70s", str); H5_FAILED(); HDputs(" Unknown data type."); goto error; } else { HDsnprintf(str, sizeof(str), "Testing %s %s -> %s conversions", name, src_type_name, dst_type_name); - HDprintf("%-70s", str); - HDfflush(stdout); + printf("%-70s", str); + fflush(stdout); fails_this_test = 0; } @@ -1712,7 +1712,7 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst) dst_nbits = H5Tget_precision(dst); /* not 8*dst_size, esp on J90 - QAK */ src_sign = H5Tget_sign(src); dst_sign = H5Tget_sign(dst); - aligned = HDcalloc((size_t)1, sizeof(long long)); + aligned = calloc((size_t)1, sizeof(long long)); /* Allocate and initialize the source buffer through macro INIT_INTEGER. The BUF * will be used for the conversion while the SAVED buffer will be @@ -1761,43 +1761,43 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst) hw = (unsigned char *)&hw_char; switch (src_type) { case INT_SCHAR: - HDmemcpy(aligned, saved + j * sizeof(signed char), sizeof(signed char)); + memcpy(aligned, saved + j * sizeof(signed char), sizeof(signed char)); hw_char = (signed char)(*((signed char *)aligned)); break; case INT_UCHAR: - HDmemcpy(aligned, saved + j * sizeof(unsigned char), sizeof(unsigned char)); + memcpy(aligned, saved + j * sizeof(unsigned char), sizeof(unsigned char)); hw_char = (signed char)(*((unsigned char *)aligned)); break; case INT_SHORT: - HDmemcpy(aligned, saved + j * sizeof(short), sizeof(short)); + memcpy(aligned, saved + j * sizeof(short), sizeof(short)); hw_char = (signed char)(*((short *)aligned)); break; case INT_USHORT: - HDmemcpy(aligned, saved + j * sizeof(unsigned short), sizeof(unsigned short)); + memcpy(aligned, saved + j * sizeof(unsigned short), sizeof(unsigned short)); hw_char = (signed char)(*((unsigned short *)aligned)); break; case INT_INT: - HDmemcpy(aligned, saved + j * sizeof(int), sizeof(int)); + memcpy(aligned, saved + j * sizeof(int), sizeof(int)); hw_char = (signed char)(*((int *)aligned)); break; case INT_UINT: - HDmemcpy(aligned, saved + j * sizeof(unsigned), sizeof(unsigned)); + memcpy(aligned, saved + j * sizeof(unsigned), sizeof(unsigned)); hw_char = (signed char)(*((unsigned *)aligned)); break; case INT_LONG: - HDmemcpy(aligned, saved + j * sizeof(long), sizeof(long)); + memcpy(aligned, saved + j * sizeof(long), sizeof(long)); hw_char = (signed char)(*((long *)aligned)); break; case INT_ULONG: - HDmemcpy(aligned, saved + j * sizeof(unsigned long), sizeof(unsigned long)); + memcpy(aligned, saved + j * sizeof(unsigned long), sizeof(unsigned long)); hw_char = (signed char)(*((unsigned long *)aligned)); break; case INT_LLONG: - HDmemcpy(aligned, saved + j * sizeof(long long), sizeof(long long)); + memcpy(aligned, saved + j * sizeof(long long), sizeof(long long)); hw_char = (signed char)(*((long long *)aligned)); break; case INT_ULLONG: - HDmemcpy(aligned, saved + j * sizeof(unsigned long long), sizeof(unsigned long long)); + memcpy(aligned, saved + j * sizeof(unsigned long long), sizeof(unsigned long long)); hw_char = (signed char)(*((unsigned long long *)aligned)); break; case FLT_FLOAT: @@ -1805,7 +1805,7 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst) case FLT_LDOUBLE: case OTHER: default: - HDassert(0 && "Unknown type"); + assert(0 && "Unknown type"); break; } } @@ -1813,43 +1813,43 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst) hw = (unsigned char *)&hw_uchar; switch (src_type) { case INT_SCHAR: - HDmemcpy(aligned, saved + j * sizeof(signed char), sizeof(signed char)); + memcpy(aligned, saved + j * sizeof(signed char), sizeof(signed char)); hw_uchar = (unsigned char)(*((signed char *)aligned)); break; case INT_UCHAR: - HDmemcpy(aligned, saved + j * sizeof(unsigned char), sizeof(unsigned char)); + memcpy(aligned, saved + j * sizeof(unsigned char), sizeof(unsigned char)); hw_uchar = (unsigned char)(*((unsigned char *)aligned)); break; case INT_SHORT: - HDmemcpy(aligned, saved + j * sizeof(short), sizeof(short)); + memcpy(aligned, saved + j * sizeof(short), sizeof(short)); hw_uchar = (unsigned char)(*((short *)aligned)); break; case INT_USHORT: - HDmemcpy(aligned, saved + j * sizeof(unsigned short), sizeof(unsigned short)); + memcpy(aligned, saved + j * sizeof(unsigned short), sizeof(unsigned short)); hw_uchar = (unsigned char)(*((unsigned short *)aligned)); break; case INT_INT: - HDmemcpy(aligned, saved + j * sizeof(int), sizeof(int)); + memcpy(aligned, saved + j * sizeof(int), sizeof(int)); hw_uchar = (unsigned char)(*((int *)aligned)); break; case INT_UINT: - HDmemcpy(aligned, saved + j * sizeof(unsigned), sizeof(unsigned)); + memcpy(aligned, saved + j * sizeof(unsigned), sizeof(unsigned)); hw_uchar = (unsigned char)(*((unsigned *)aligned)); break; case INT_LONG: - HDmemcpy(aligned, saved + j * sizeof(long), sizeof(long)); + memcpy(aligned, saved + j * sizeof(long), sizeof(long)); hw_uchar = (unsigned char)(*((long *)aligned)); break; case INT_ULONG: - HDmemcpy(aligned, saved + j * sizeof(unsigned long), sizeof(unsigned long)); + memcpy(aligned, saved + j * sizeof(unsigned long), sizeof(unsigned long)); hw_uchar = (unsigned char)(*((unsigned long *)aligned)); break; case INT_LLONG: - HDmemcpy(aligned, saved + j * sizeof(long long), sizeof(long long)); + memcpy(aligned, saved + j * sizeof(long long), sizeof(long long)); hw_uchar = (unsigned char)(*((long long *)aligned)); break; case INT_ULLONG: - HDmemcpy(aligned, saved + j * sizeof(unsigned long long), sizeof(unsigned long long)); + memcpy(aligned, saved + j * sizeof(unsigned long long), sizeof(unsigned long long)); hw_uchar = (unsigned char)(*((unsigned long long *)aligned)); break; case FLT_FLOAT: @@ -1857,7 +1857,7 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst) case FLT_LDOUBLE: case OTHER: default: - HDassert(0 && "Unknown type"); + assert(0 && "Unknown type"); break; } } @@ -1865,43 +1865,43 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst) hw = (unsigned char *)&hw_short; switch (src_type) { case INT_SCHAR: - HDmemcpy(aligned, saved + j * sizeof(char), sizeof(char)); + memcpy(aligned, saved + j * sizeof(char), sizeof(char)); hw_short = (short)(*((char *)aligned)); break; case INT_UCHAR: - HDmemcpy(aligned, saved + j * sizeof(unsigned char), sizeof(unsigned char)); + memcpy(aligned, saved + j * sizeof(unsigned char), sizeof(unsigned char)); hw_short = (short)(*((unsigned char *)aligned)); break; case INT_SHORT: - HDmemcpy(aligned, saved + j * sizeof(short), sizeof(short)); + memcpy(aligned, saved + j * sizeof(short), sizeof(short)); hw_short = (short)(*((short *)aligned)); break; case INT_USHORT: - HDmemcpy(aligned, saved + j * sizeof(unsigned short), sizeof(unsigned short)); + memcpy(aligned, saved + j * sizeof(unsigned short), sizeof(unsigned short)); hw_short = (short)(*((unsigned short *)aligned)); break; case INT_INT: - HDmemcpy(aligned, saved + j * sizeof(int), sizeof(int)); + memcpy(aligned, saved + j * sizeof(int), sizeof(int)); hw_short = (short)(*((int *)aligned)); break; case INT_UINT: - HDmemcpy(aligned, saved + j * sizeof(unsigned), sizeof(unsigned)); + memcpy(aligned, saved + j * sizeof(unsigned), sizeof(unsigned)); hw_short = (short)(*((unsigned *)aligned)); break; case INT_LONG: - HDmemcpy(aligned, saved + j * sizeof(long), sizeof(long)); + memcpy(aligned, saved + j * sizeof(long), sizeof(long)); hw_short = (short)(*((long *)aligned)); break; case INT_ULONG: - HDmemcpy(aligned, saved + j * sizeof(unsigned long), sizeof(unsigned long)); + memcpy(aligned, saved + j * sizeof(unsigned long), sizeof(unsigned long)); hw_short = (short)(*((unsigned long *)aligned)); break; case INT_LLONG: - HDmemcpy(aligned, saved + j * sizeof(long long), sizeof(long long)); + memcpy(aligned, saved + j * sizeof(long long), sizeof(long long)); hw_short = (short)(*((long long *)aligned)); break; case INT_ULLONG: - HDmemcpy(aligned, saved + j * sizeof(unsigned long long), sizeof(unsigned long long)); + memcpy(aligned, saved + j * sizeof(unsigned long long), sizeof(unsigned long long)); hw_short = (short)(*((unsigned long long *)aligned)); break; @@ -1910,7 +1910,7 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst) case FLT_LDOUBLE: case OTHER: default: - HDassert(0 && "Unknown type"); + assert(0 && "Unknown type"); break; } } @@ -1918,43 +1918,43 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst) hw = (unsigned char *)&hw_ushort; switch (src_type) { case INT_SCHAR: - HDmemcpy(aligned, saved + j * sizeof(signed char), sizeof(signed char)); + memcpy(aligned, saved + j * sizeof(signed char), sizeof(signed char)); hw_ushort = (unsigned short)(*((signed char *)aligned)); break; case INT_UCHAR: - HDmemcpy(aligned, saved + j * sizeof(unsigned char), sizeof(unsigned char)); + memcpy(aligned, saved + j * sizeof(unsigned char), sizeof(unsigned char)); hw_ushort = (unsigned short)(*((unsigned char *)aligned)); break; case INT_SHORT: - HDmemcpy(aligned, saved + j * sizeof(short), sizeof(short)); + memcpy(aligned, saved + j * sizeof(short), sizeof(short)); hw_ushort = (unsigned short)(*((short *)aligned)); break; case INT_USHORT: - HDmemcpy(aligned, saved + j * sizeof(unsigned short), sizeof(unsigned short)); + memcpy(aligned, saved + j * sizeof(unsigned short), sizeof(unsigned short)); hw_ushort = (unsigned short)(*((unsigned short *)aligned)); break; case INT_INT: - HDmemcpy(aligned, saved + j * sizeof(int), sizeof(int)); + memcpy(aligned, saved + j * sizeof(int), sizeof(int)); hw_ushort = (unsigned short)(*((int *)aligned)); break; case INT_UINT: - HDmemcpy(aligned, saved + j * sizeof(unsigned), sizeof(unsigned)); + memcpy(aligned, saved + j * sizeof(unsigned), sizeof(unsigned)); hw_ushort = (unsigned short)(*((unsigned *)aligned)); break; case INT_LONG: - HDmemcpy(aligned, saved + j * sizeof(long), sizeof(long)); + memcpy(aligned, saved + j * sizeof(long), sizeof(long)); hw_ushort = (unsigned short)(*((long *)aligned)); break; case INT_ULONG: - HDmemcpy(aligned, saved + j * sizeof(unsigned long), sizeof(unsigned long)); + memcpy(aligned, saved + j * sizeof(unsigned long), sizeof(unsigned long)); hw_ushort = (unsigned short)(*((unsigned long *)aligned)); break; case INT_LLONG: - HDmemcpy(aligned, saved + j * sizeof(long long), sizeof(long long)); + memcpy(aligned, saved + j * sizeof(long long), sizeof(long long)); hw_ushort = (unsigned short)(*((long long *)aligned)); break; case INT_ULLONG: - HDmemcpy(aligned, saved + j * sizeof(unsigned long long), sizeof(unsigned long long)); + memcpy(aligned, saved + j * sizeof(unsigned long long), sizeof(unsigned long long)); hw_ushort = (unsigned short)(*((unsigned long long *)aligned)); break; case FLT_FLOAT: @@ -1962,7 +1962,7 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst) case FLT_LDOUBLE: case OTHER: default: - HDassert(0 && "Unknown type"); + assert(0 && "Unknown type"); break; } } @@ -1970,43 +1970,43 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst) hw = (unsigned char *)&hw_int; switch (src_type) { case INT_SCHAR: - HDmemcpy(aligned, saved + j * sizeof(signed char), sizeof(signed char)); + memcpy(aligned, saved + j * sizeof(signed char), sizeof(signed char)); hw_int = (int)(*((signed char *)aligned)); break; case INT_UCHAR: - HDmemcpy(aligned, saved + j * sizeof(unsigned char), sizeof(unsigned char)); + memcpy(aligned, saved + j * sizeof(unsigned char), sizeof(unsigned char)); hw_int = (int)(*((unsigned char *)aligned)); break; case INT_SHORT: - HDmemcpy(aligned, saved + j * sizeof(short), sizeof(short)); + memcpy(aligned, saved + j * sizeof(short), sizeof(short)); hw_int = (int)(*((short *)aligned)); break; case INT_USHORT: - HDmemcpy(aligned, saved + j * sizeof(unsigned short), sizeof(unsigned short)); + memcpy(aligned, saved + j * sizeof(unsigned short), sizeof(unsigned short)); hw_int = (int)(*((unsigned short *)aligned)); break; case INT_INT: - HDmemcpy(aligned, saved + j * sizeof(int), sizeof(int)); + memcpy(aligned, saved + j * sizeof(int), sizeof(int)); hw_int = (int)(*((int *)aligned)); break; case INT_UINT: - HDmemcpy(aligned, saved + j * sizeof(unsigned), sizeof(unsigned)); + memcpy(aligned, saved + j * sizeof(unsigned), sizeof(unsigned)); hw_int = (int)(*((unsigned *)aligned)); break; case INT_LONG: - HDmemcpy(aligned, saved + j * sizeof(long), sizeof(long)); + memcpy(aligned, saved + j * sizeof(long), sizeof(long)); hw_int = (int)(*((long *)aligned)); break; case INT_ULONG: - HDmemcpy(aligned, saved + j * sizeof(unsigned long), sizeof(unsigned long)); + memcpy(aligned, saved + j * sizeof(unsigned long), sizeof(unsigned long)); hw_int = (int)(*((unsigned long *)aligned)); break; case INT_LLONG: - HDmemcpy(aligned, saved + j * sizeof(long long), sizeof(long long)); + memcpy(aligned, saved + j * sizeof(long long), sizeof(long long)); hw_int = (int)(*((long long *)aligned)); break; case INT_ULLONG: - HDmemcpy(aligned, saved + j * sizeof(unsigned long long), sizeof(unsigned long long)); + memcpy(aligned, saved + j * sizeof(unsigned long long), sizeof(unsigned long long)); hw_int = (int)(*((unsigned long long *)aligned)); break; case FLT_FLOAT: @@ -2014,7 +2014,7 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst) case FLT_LDOUBLE: case OTHER: default: - HDassert(0 && "Unknown type"); + assert(0 && "Unknown type"); break; } } @@ -2022,43 +2022,43 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst) hw = (unsigned char *)&hw_uint; switch (src_type) { case INT_SCHAR: - HDmemcpy(aligned, saved + j * sizeof(signed char), sizeof(signed char)); + memcpy(aligned, saved + j * sizeof(signed char), sizeof(signed char)); hw_uint = (unsigned int)(*((signed char *)aligned)); break; case INT_UCHAR: - HDmemcpy(aligned, saved + j * sizeof(unsigned char), sizeof(unsigned char)); + memcpy(aligned, saved + j * sizeof(unsigned char), sizeof(unsigned char)); hw_uint = (unsigned int)(*((unsigned char *)aligned)); break; case INT_SHORT: - HDmemcpy(aligned, saved + j * sizeof(short), sizeof(short)); + memcpy(aligned, saved + j * sizeof(short), sizeof(short)); hw_uint = (unsigned int)(*((short *)aligned)); break; case INT_USHORT: - HDmemcpy(aligned, saved + j * sizeof(unsigned short), sizeof(unsigned short)); + memcpy(aligned, saved + j * sizeof(unsigned short), sizeof(unsigned short)); hw_uint = (unsigned int)(*((unsigned short *)aligned)); break; case INT_INT: - HDmemcpy(aligned, saved + j * sizeof(int), sizeof(int)); + memcpy(aligned, saved + j * sizeof(int), sizeof(int)); hw_uint = (unsigned int)(*((int *)aligned)); break; case INT_UINT: - HDmemcpy(aligned, saved + j * sizeof(unsigned), sizeof(unsigned)); + memcpy(aligned, saved + j * sizeof(unsigned), sizeof(unsigned)); hw_uint = (unsigned int)(*((unsigned *)aligned)); break; case INT_LONG: - HDmemcpy(aligned, saved + j * sizeof(long), sizeof(long)); + memcpy(aligned, saved + j * sizeof(long), sizeof(long)); hw_uint = (unsigned int)(*((long *)aligned)); break; case INT_ULONG: - HDmemcpy(aligned, saved + j * sizeof(unsigned long), sizeof(unsigned long)); + memcpy(aligned, saved + j * sizeof(unsigned long), sizeof(unsigned long)); hw_uint = (unsigned int)(*((unsigned long *)aligned)); break; case INT_LLONG: - HDmemcpy(aligned, saved + j * sizeof(long long), sizeof(long long)); + memcpy(aligned, saved + j * sizeof(long long), sizeof(long long)); hw_uint = (unsigned int)(*((long long *)aligned)); break; case INT_ULLONG: - HDmemcpy(aligned, saved + j * sizeof(unsigned long long), sizeof(unsigned long long)); + memcpy(aligned, saved + j * sizeof(unsigned long long), sizeof(unsigned long long)); hw_uint = (unsigned int)(*((unsigned long long *)aligned)); break; case FLT_FLOAT: @@ -2066,7 +2066,7 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst) case FLT_LDOUBLE: case OTHER: default: - HDassert(0 && "Unknown type"); + assert(0 && "Unknown type"); break; } } @@ -2074,43 +2074,43 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst) hw = (unsigned char *)&hw_long; switch (src_type) { case INT_SCHAR: - HDmemcpy(aligned, saved + j * sizeof(signed char), sizeof(signed char)); + memcpy(aligned, saved + j * sizeof(signed char), sizeof(signed char)); hw_long = (long int)(*((signed char *)aligned)); break; case INT_UCHAR: - HDmemcpy(aligned, saved + j * sizeof(unsigned char), sizeof(unsigned char)); + memcpy(aligned, saved + j * sizeof(unsigned char), sizeof(unsigned char)); hw_long = (long int)(*((unsigned char *)aligned)); break; case INT_SHORT: - HDmemcpy(aligned, saved + j * sizeof(short), sizeof(short)); + memcpy(aligned, saved + j * sizeof(short), sizeof(short)); hw_long = (long int)(*((short *)aligned)); break; case INT_USHORT: - HDmemcpy(aligned, saved + j * sizeof(unsigned short), sizeof(unsigned short)); + memcpy(aligned, saved + j * sizeof(unsigned short), sizeof(unsigned short)); hw_long = (long int)(*((unsigned short *)aligned)); break; case INT_INT: - HDmemcpy(aligned, saved + j * sizeof(int), sizeof(int)); + memcpy(aligned, saved + j * sizeof(int), sizeof(int)); hw_long = (long int)(*((int *)aligned)); break; case INT_UINT: - HDmemcpy(aligned, saved + j * sizeof(unsigned), sizeof(unsigned)); + memcpy(aligned, saved + j * sizeof(unsigned), sizeof(unsigned)); hw_long = (long int)(*((unsigned *)aligned)); break; case INT_LONG: - HDmemcpy(aligned, saved + j * sizeof(long), sizeof(long)); + memcpy(aligned, saved + j * sizeof(long), sizeof(long)); hw_long = (long int)(*((long *)aligned)); break; case INT_ULONG: - HDmemcpy(aligned, saved + j * sizeof(unsigned long), sizeof(unsigned long)); + memcpy(aligned, saved + j * sizeof(unsigned long), sizeof(unsigned long)); hw_long = (long int)(*((unsigned long *)aligned)); break; case INT_LLONG: - HDmemcpy(aligned, saved + j * sizeof(long long), sizeof(long long)); + memcpy(aligned, saved + j * sizeof(long long), sizeof(long long)); hw_long = (long int)(*((long long *)aligned)); break; case INT_ULLONG: - HDmemcpy(aligned, saved + j * sizeof(unsigned long long), sizeof(unsigned long long)); + memcpy(aligned, saved + j * sizeof(unsigned long long), sizeof(unsigned long long)); hw_long = (long int)(*((unsigned long long *)aligned)); break; case FLT_FLOAT: @@ -2118,7 +2118,7 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst) case FLT_LDOUBLE: case OTHER: default: - HDassert(0 && "Unknown type"); + assert(0 && "Unknown type"); break; } } @@ -2126,43 +2126,43 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst) hw = (unsigned char *)&hw_ulong; switch (src_type) { case INT_SCHAR: - HDmemcpy(aligned, saved + j * sizeof(signed char), sizeof(signed char)); + memcpy(aligned, saved + j * sizeof(signed char), sizeof(signed char)); hw_ulong = (unsigned long)(*((signed char *)aligned)); break; case INT_UCHAR: - HDmemcpy(aligned, saved + j * sizeof(unsigned char), sizeof(unsigned char)); + memcpy(aligned, saved + j * sizeof(unsigned char), sizeof(unsigned char)); hw_ulong = (unsigned long)(*((unsigned char *)aligned)); break; case INT_SHORT: - HDmemcpy(aligned, saved + j * sizeof(short), sizeof(short)); + memcpy(aligned, saved + j * sizeof(short), sizeof(short)); hw_ulong = (unsigned long)(*((short *)aligned)); break; case INT_USHORT: - HDmemcpy(aligned, saved + j * sizeof(unsigned short), sizeof(unsigned short)); + memcpy(aligned, saved + j * sizeof(unsigned short), sizeof(unsigned short)); hw_ulong = (unsigned long)(*((unsigned short *)aligned)); break; case INT_INT: - HDmemcpy(aligned, saved + j * sizeof(int), sizeof(int)); + memcpy(aligned, saved + j * sizeof(int), sizeof(int)); hw_ulong = (unsigned long)(*((int *)aligned)); break; case INT_UINT: - HDmemcpy(aligned, saved + j * sizeof(unsigned), sizeof(unsigned)); + memcpy(aligned, saved + j * sizeof(unsigned), sizeof(unsigned)); hw_ulong = (unsigned long)(*((unsigned *)aligned)); break; case INT_LONG: - HDmemcpy(aligned, saved + j * sizeof(long), sizeof(long)); + memcpy(aligned, saved + j * sizeof(long), sizeof(long)); hw_ulong = (unsigned long)(*((long *)aligned)); break; case INT_ULONG: - HDmemcpy(aligned, saved + j * sizeof(unsigned long), sizeof(unsigned long)); + memcpy(aligned, saved + j * sizeof(unsigned long), sizeof(unsigned long)); hw_ulong = (unsigned long)(*((unsigned long *)aligned)); break; case INT_LLONG: - HDmemcpy(aligned, saved + j * sizeof(long long), sizeof(long long)); + memcpy(aligned, saved + j * sizeof(long long), sizeof(long long)); hw_ulong = (unsigned long)(*((long long *)aligned)); break; case INT_ULLONG: - HDmemcpy(aligned, saved + j * sizeof(unsigned long long), sizeof(unsigned long long)); + memcpy(aligned, saved + j * sizeof(unsigned long long), sizeof(unsigned long long)); hw_ulong = (unsigned long)(*((unsigned long long *)aligned)); break; case FLT_FLOAT: @@ -2170,7 +2170,7 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst) case FLT_LDOUBLE: case OTHER: default: - HDassert(0 && "Unknown type"); + assert(0 && "Unknown type"); break; } } @@ -2178,43 +2178,43 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst) hw = (unsigned char *)&hw_llong; switch (src_type) { case INT_SCHAR: - HDmemcpy(aligned, saved + j * sizeof(char), sizeof(char)); + memcpy(aligned, saved + j * sizeof(char), sizeof(char)); hw_llong = (long long)(*((char *)aligned)); break; case INT_UCHAR: - HDmemcpy(aligned, saved + j * sizeof(unsigned char), sizeof(unsigned char)); + memcpy(aligned, saved + j * sizeof(unsigned char), sizeof(unsigned char)); hw_llong = (long long)(*((unsigned char *)aligned)); break; case INT_SHORT: - HDmemcpy(aligned, saved + j * sizeof(short), sizeof(short)); + memcpy(aligned, saved + j * sizeof(short), sizeof(short)); hw_llong = (long long)(*((short *)aligned)); break; case INT_USHORT: - HDmemcpy(aligned, saved + j * sizeof(unsigned short), sizeof(unsigned short)); + memcpy(aligned, saved + j * sizeof(unsigned short), sizeof(unsigned short)); hw_llong = (long long)(*((unsigned short *)aligned)); break; case INT_INT: - HDmemcpy(aligned, saved + j * sizeof(int), sizeof(int)); + memcpy(aligned, saved + j * sizeof(int), sizeof(int)); hw_llong = (long long)(*((int *)aligned)); break; case INT_UINT: - HDmemcpy(aligned, saved + j * sizeof(unsigned), sizeof(unsigned)); + memcpy(aligned, saved + j * sizeof(unsigned), sizeof(unsigned)); hw_llong = (long long)(*((unsigned *)aligned)); break; case INT_LONG: - HDmemcpy(aligned, saved + j * sizeof(long), sizeof(long)); + memcpy(aligned, saved + j * sizeof(long), sizeof(long)); hw_llong = (long long)(*((long *)aligned)); break; case INT_ULONG: - HDmemcpy(aligned, saved + j * sizeof(unsigned long), sizeof(unsigned long)); + memcpy(aligned, saved + j * sizeof(unsigned long), sizeof(unsigned long)); hw_llong = (long long)(*((unsigned long *)aligned)); break; case INT_LLONG: - HDmemcpy(aligned, saved + j * sizeof(long long), sizeof(long long)); + memcpy(aligned, saved + j * sizeof(long long), sizeof(long long)); hw_llong = (long long)(*((long long *)aligned)); break; case INT_ULLONG: - HDmemcpy(aligned, saved + j * sizeof(unsigned long long), sizeof(unsigned long long)); + memcpy(aligned, saved + j * sizeof(unsigned long long), sizeof(unsigned long long)); hw_llong = (long long)(*((unsigned long long *)aligned)); break; case FLT_FLOAT: @@ -2222,7 +2222,7 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst) case FLT_LDOUBLE: case OTHER: default: - HDassert(0 && "Unknown type"); + assert(0 && "Unknown type"); break; } } @@ -2230,43 +2230,43 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst) hw = (unsigned char *)&hw_ullong; switch (src_type) { case INT_SCHAR: - HDmemcpy(aligned, saved + j * sizeof(signed char), sizeof(signed char)); + memcpy(aligned, saved + j * sizeof(signed char), sizeof(signed char)); hw_ullong = (unsigned long long)(*((signed char *)aligned)); break; case INT_UCHAR: - HDmemcpy(aligned, saved + j * sizeof(unsigned char), sizeof(unsigned char)); + memcpy(aligned, saved + j * sizeof(unsigned char), sizeof(unsigned char)); hw_ullong = (unsigned long long)(*((unsigned char *)aligned)); break; case INT_SHORT: - HDmemcpy(aligned, saved + j * sizeof(short), sizeof(short)); + memcpy(aligned, saved + j * sizeof(short), sizeof(short)); hw_ullong = (unsigned long long)(*((short *)aligned)); break; case INT_USHORT: - HDmemcpy(aligned, saved + j * sizeof(unsigned short), sizeof(unsigned short)); + memcpy(aligned, saved + j * sizeof(unsigned short), sizeof(unsigned short)); hw_ullong = (unsigned long long)(*((unsigned short *)aligned)); break; case INT_INT: - HDmemcpy(aligned, saved + j * sizeof(int), sizeof(int)); + memcpy(aligned, saved + j * sizeof(int), sizeof(int)); hw_ullong = (unsigned long long)(*((int *)aligned)); break; case INT_UINT: - HDmemcpy(aligned, saved + j * sizeof(unsigned), sizeof(unsigned)); + memcpy(aligned, saved + j * sizeof(unsigned), sizeof(unsigned)); hw_ullong = (unsigned long long)(*((unsigned *)aligned)); break; case INT_LONG: - HDmemcpy(aligned, saved + j * sizeof(long), sizeof(long)); + memcpy(aligned, saved + j * sizeof(long), sizeof(long)); hw_ullong = (unsigned long long)(*((long *)aligned)); break; case INT_ULONG: - HDmemcpy(aligned, saved + j * sizeof(unsigned long), sizeof(unsigned long)); + memcpy(aligned, saved + j * sizeof(unsigned long), sizeof(unsigned long)); hw_ullong = (unsigned long long)(*((unsigned long *)aligned)); break; case INT_LLONG: - HDmemcpy(aligned, saved + j * sizeof(long long), sizeof(long long)); + memcpy(aligned, saved + j * sizeof(long long), sizeof(long long)); hw_ullong = (unsigned long long)(*((long long *)aligned)); break; case INT_ULLONG: - HDmemcpy(aligned, saved + j * sizeof(unsigned long long), sizeof(unsigned long long)); + memcpy(aligned, saved + j * sizeof(unsigned long long), sizeof(unsigned long long)); hw_ullong = (unsigned long long)(*((unsigned long long *)aligned)); break; case FLT_FLOAT: @@ -2274,13 +2274,13 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst) case FLT_LDOUBLE: case OTHER: default: - HDassert(0 && "Unknown type"); + assert(0 && "Unknown type"); break; } } /* Make certain that there isn't some weird number of destination bits */ - HDassert(dst_nbits % 8 == 0); + assert(dst_nbits % 8 == 0); /* Are the two results the same? */ for (k = (dst_size - (dst_nbits / 8)); k < dst_size; k++) @@ -2404,157 +2404,157 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst) /* Print errors */ if (0 == fails_this_test++) H5_FAILED(); - HDprintf(" elmt %u\n", (unsigned)j); + printf(" elmt %u\n", (unsigned)j); - HDprintf(" src = "); + printf(" src = "); for (k = 0; k < src_size; k++) - HDprintf(" %02x", saved[j * src_size + ENDIAN(src_size, k, endian)]); - HDprintf("%*s", (int)(3 * MAX(0, (ssize_t)dst_size - (ssize_t)src_size)), ""); + printf(" %02x", saved[j * src_size + ENDIAN(src_size, k, endian)]); + printf("%*s", (int)(3 * MAX(0, (ssize_t)dst_size - (ssize_t)src_size)), ""); switch (src_type) { case INT_SCHAR: - HDmemcpy(aligned, saved + j * sizeof(signed char), sizeof(signed char)); - HDprintf(" %29d\n", (int)*((signed char *)aligned)); + memcpy(aligned, saved + j * sizeof(signed char), sizeof(signed char)); + printf(" %29d\n", (int)*((signed char *)aligned)); break; case INT_UCHAR: - HDmemcpy(aligned, saved + j * sizeof(unsigned char), sizeof(unsigned char)); - HDprintf(" %29u\n", (unsigned)*((unsigned char *)aligned)); + memcpy(aligned, saved + j * sizeof(unsigned char), sizeof(unsigned char)); + printf(" %29u\n", (unsigned)*((unsigned char *)aligned)); break; case INT_SHORT: - HDmemcpy(aligned, saved + j * sizeof(short), sizeof(short)); - HDprintf(" %29hd\n", *((short *)aligned)); + memcpy(aligned, saved + j * sizeof(short), sizeof(short)); + printf(" %29hd\n", *((short *)aligned)); break; case INT_USHORT: - HDmemcpy(aligned, saved + j * sizeof(unsigned short), sizeof(unsigned short)); - HDprintf(" %29hu\n", *((unsigned short *)aligned)); + memcpy(aligned, saved + j * sizeof(unsigned short), sizeof(unsigned short)); + printf(" %29hu\n", *((unsigned short *)aligned)); break; case INT_INT: - HDmemcpy(aligned, saved + j * sizeof(int), sizeof(int)); - HDprintf(" %29d\n", *((int *)aligned)); + memcpy(aligned, saved + j * sizeof(int), sizeof(int)); + printf(" %29d\n", *((int *)aligned)); break; case INT_UINT: - HDmemcpy(aligned, saved + j * sizeof(unsigned), sizeof(unsigned)); - HDprintf(" %29u\n", *((unsigned *)aligned)); + memcpy(aligned, saved + j * sizeof(unsigned), sizeof(unsigned)); + printf(" %29u\n", *((unsigned *)aligned)); break; case INT_LONG: - HDmemcpy(aligned, saved + j * sizeof(long), sizeof(long)); - HDprintf(" %29ld\n", *((long *)aligned)); + memcpy(aligned, saved + j * sizeof(long), sizeof(long)); + printf(" %29ld\n", *((long *)aligned)); break; case INT_ULONG: - HDmemcpy(aligned, saved + j * sizeof(unsigned long), sizeof(unsigned long)); - HDprintf(" %29lu\n", *((unsigned long *)aligned)); + memcpy(aligned, saved + j * sizeof(unsigned long), sizeof(unsigned long)); + printf(" %29lu\n", *((unsigned long *)aligned)); break; case INT_LLONG: - HDmemcpy(aligned, saved + j * sizeof(long long), sizeof(long long)); - HDfprintf(stdout, " %29lld\n", *((long long *)aligned)); + memcpy(aligned, saved + j * sizeof(long long), sizeof(long long)); + fprintf(stdout, " %29lld\n", *((long long *)aligned)); break; case INT_ULLONG: - HDmemcpy(aligned, saved + j * sizeof(unsigned long long), sizeof(unsigned long long)); - HDfprintf(stdout, " %29llu\n", *((unsigned long long *)aligned)); + memcpy(aligned, saved + j * sizeof(unsigned long long), sizeof(unsigned long long)); + fprintf(stdout, " %29llu\n", *((unsigned long long *)aligned)); break; case FLT_FLOAT: case FLT_DOUBLE: case FLT_LDOUBLE: case OTHER: default: - HDassert(0 && "Unknown type"); + assert(0 && "Unknown type"); break; } - HDprintf(" dst = "); + printf(" dst = "); for (k = 0; k < dst_size; k++) - HDprintf(" %02x", buf[j * dst_size + ENDIAN(dst_size, k, endian)]); - HDprintf("%*s", (int)(3 * MAX(0, (ssize_t)src_size - (ssize_t)dst_size)), ""); + printf(" %02x", buf[j * dst_size + ENDIAN(dst_size, k, endian)]); + printf("%*s", (int)(3 * MAX(0, (ssize_t)src_size - (ssize_t)dst_size)), ""); switch (dst_type) { case INT_SCHAR: - HDmemcpy(aligned, buf + j * sizeof(signed char), sizeof(signed char)); - HDprintf(" %29d\n", (int)*((signed char *)aligned)); + memcpy(aligned, buf + j * sizeof(signed char), sizeof(signed char)); + printf(" %29d\n", (int)*((signed char *)aligned)); break; case INT_UCHAR: - HDmemcpy(aligned, buf + j * sizeof(unsigned char), sizeof(unsigned char)); - HDprintf(" %29u\n", (unsigned)*((unsigned char *)aligned)); + memcpy(aligned, buf + j * sizeof(unsigned char), sizeof(unsigned char)); + printf(" %29u\n", (unsigned)*((unsigned char *)aligned)); break; case INT_SHORT: - HDmemcpy(aligned, buf + j * sizeof(short), sizeof(short)); - HDprintf(" %29hd\n", *((short *)aligned)); + memcpy(aligned, buf + j * sizeof(short), sizeof(short)); + printf(" %29hd\n", *((short *)aligned)); break; case INT_USHORT: - HDmemcpy(aligned, buf + j * sizeof(unsigned short), sizeof(unsigned short)); - HDprintf(" %29hu\n", *((unsigned short *)aligned)); + memcpy(aligned, buf + j * sizeof(unsigned short), sizeof(unsigned short)); + printf(" %29hu\n", *((unsigned short *)aligned)); break; case INT_INT: - HDmemcpy(aligned, buf + j * sizeof(int), sizeof(int)); - HDprintf(" %29d\n", *((int *)aligned)); + memcpy(aligned, buf + j * sizeof(int), sizeof(int)); + printf(" %29d\n", *((int *)aligned)); break; case INT_UINT: - HDmemcpy(aligned, buf + j * sizeof(unsigned), sizeof(unsigned)); - HDprintf(" %29u\n", *((unsigned *)aligned)); + memcpy(aligned, buf + j * sizeof(unsigned), sizeof(unsigned)); + printf(" %29u\n", *((unsigned *)aligned)); break; case INT_LONG: - HDmemcpy(aligned, buf + j * sizeof(long), sizeof(long)); - HDprintf(" %29ld\n", *((long *)aligned)); + memcpy(aligned, buf + j * sizeof(long), sizeof(long)); + printf(" %29ld\n", *((long *)aligned)); break; case INT_ULONG: - HDmemcpy(aligned, buf + j * sizeof(unsigned long), sizeof(unsigned long)); - HDprintf(" %29lu\n", *((unsigned long *)aligned)); + memcpy(aligned, buf + j * sizeof(unsigned long), sizeof(unsigned long)); + printf(" %29lu\n", *((unsigned long *)aligned)); break; case INT_LLONG: - HDmemcpy(aligned, buf + j * sizeof(long long), sizeof(long long)); - HDfprintf(stdout, " %29lld\n", *((long long *)aligned)); + memcpy(aligned, buf + j * sizeof(long long), sizeof(long long)); + fprintf(stdout, " %29lld\n", *((long long *)aligned)); break; case INT_ULLONG: - HDmemcpy(aligned, buf + j * sizeof(long long), sizeof(unsigned long long)); - HDfprintf(stdout, " %29llu\n", *((unsigned long long *)aligned)); + memcpy(aligned, buf + j * sizeof(long long), sizeof(unsigned long long)); + fprintf(stdout, " %29llu\n", *((unsigned long long *)aligned)); break; case FLT_FLOAT: case FLT_DOUBLE: case FLT_LDOUBLE: case OTHER: default: - HDassert(0 && "Unknown type"); + assert(0 && "Unknown type"); break; } - HDprintf(" ans = "); + printf(" ans = "); for (k = 0; k < dst_size; k++) - HDprintf(" %02x", hw[ENDIAN(dst_size, k, endian)]); - HDprintf("%*s", (int)(3 * MAX(0, (ssize_t)src_size - (ssize_t)dst_size)), ""); + printf(" %02x", hw[ENDIAN(dst_size, k, endian)]); + printf("%*s", (int)(3 * MAX(0, (ssize_t)src_size - (ssize_t)dst_size)), ""); switch (dst_type) { case INT_SCHAR: - HDprintf(" %29d\n", (int)*((signed char *)((void *)hw))); + printf(" %29d\n", (int)*((signed char *)((void *)hw))); break; case INT_UCHAR: - HDprintf(" %29u\n", (unsigned)*((unsigned char *)((void *)hw))); + printf(" %29u\n", (unsigned)*((unsigned char *)((void *)hw))); break; case INT_SHORT: - HDprintf(" %29hd\n", *((short *)((void *)hw))); + printf(" %29hd\n", *((short *)((void *)hw))); break; case INT_USHORT: - HDprintf(" %29hu\n", *((unsigned short *)((void *)hw))); + printf(" %29hu\n", *((unsigned short *)((void *)hw))); break; case INT_INT: - HDprintf(" %29d\n", *((int *)((void *)hw))); + printf(" %29d\n", *((int *)((void *)hw))); break; case INT_UINT: - HDprintf(" %29u\n", *((unsigned *)((void *)hw))); + printf(" %29u\n", *((unsigned *)((void *)hw))); break; case INT_LONG: - HDprintf(" %29ld\n", *((long *)((void *)hw))); + printf(" %29ld\n", *((long *)((void *)hw))); break; case INT_ULONG: - HDprintf(" %29lu\n", *((unsigned long *)((void *)hw))); + printf(" %29lu\n", *((unsigned long *)((void *)hw))); break; case INT_LLONG: - HDfprintf(stdout, " %29lld\n", *((long long *)((void *)hw))); + fprintf(stdout, " %29lld\n", *((long long *)((void *)hw))); break; case INT_ULLONG: - HDfprintf(stdout, " %29llu\n", *((unsigned long long *)((void *)hw))); + fprintf(stdout, " %29llu\n", *((unsigned long long *)((void *)hw))); break; case FLT_FLOAT: case FLT_DOUBLE: case FLT_LDOUBLE: case OTHER: default: - HDassert(0 && "Unknown type"); + assert(0 && "Unknown type"); break; } @@ -2572,8 +2572,8 @@ done: if (saved) aligned_free(saved); if (aligned) - HDfree(aligned); - HDfflush(stdout); + free(aligned); + fflush(stdout); /* Restore the default error handler (set in h5_reset()) */ h5_restore_err(); @@ -2588,8 +2588,8 @@ error: if (saved) aligned_free(saved); if (aligned) - HDfree(aligned); - HDfflush(stdout); + free(aligned); + fflush(stdout); /* Restore the default error handler (set in h5_reset()) */ h5_restore_err(); @@ -2621,11 +2621,11 @@ test_conv_int_2(void) hid_t src_type, dst_type; char *buf; - HDprintf("%-70s", "Testing overlap calculations"); - HDfflush(stdout); + printf("%-70s", "Testing overlap calculations"); + fflush(stdout); - buf = (char *)HDcalloc(TMP_BUF_DIM1, TMP_BUF_DIM2); - HDassert(buf); + buf = (char *)calloc(TMP_BUF_DIM1, TMP_BUF_DIM2); + assert(buf); for (i = 1; i <= TMP_BUF_DIM1; i++) { for (j = 1; j <= TMP_BUF_DIM1; j++) { @@ -2648,7 +2648,7 @@ test_conv_int_2(void) } } PASSED(); - HDfree(buf); + free(buf); return 0; } @@ -2672,18 +2672,18 @@ my_isnan(dtype_t type, void *val) if (FLT_FLOAT == type) { float x = 0.0; - HDmemcpy(&x, val, sizeof(float)); + memcpy(&x, val, sizeof(float)); retval = isnan(x); } else if (FLT_DOUBLE == type) { double x = 0.0; - HDmemcpy(&x, val, sizeof(double)); + memcpy(&x, val, sizeof(double)); retval = isnan(x); #if H5_SIZEOF_LONG_DOUBLE != H5_SIZEOF_DOUBLE } else if (FLT_LDOUBLE == type) { long double x = 0.0L; - HDmemcpy(&x, val, sizeof(long double)); + memcpy(&x, val, sizeof(long double)); retval = isnan(x); #endif } @@ -2699,20 +2699,20 @@ my_isnan(dtype_t type, void *val) if (FLT_FLOAT == type) { float x = 0.0; - HDmemcpy(&x, val, sizeof(float)); + memcpy(&x, val, sizeof(float)); HDsnprintf(s, sizeof(s), "%g", (double)x); } else if (FLT_DOUBLE == type) { double x = 0.0; - HDmemcpy(&x, val, sizeof(double)); + memcpy(&x, val, sizeof(double)); HDsnprintf(s, sizeof(s), "%g", x); #if H5_SIZEOF_LONG_DOUBLE != H5_SIZEOF_DOUBLE } else if (FLT_LDOUBLE == type) { long double x = 0.0L; - HDmemcpy(&x, val, sizeof(long double)); + memcpy(&x, val, sizeof(long double)); HDsnprintf(s, sizeof(s), "%Lg", x); #endif } @@ -2746,7 +2746,7 @@ my_isinf(int endian, const unsigned char *val, size_t size, size_t mpos, size_t int retval = 0; size_t i; - bits = (unsigned char *)HDcalloc((size_t)1, size); + bits = (unsigned char *)calloc((size_t)1, size); for (i = 0; i < size; i++) bits[size - (i + 1)] = *(val + ENDIAN(size, i, endian)); @@ -2755,7 +2755,7 @@ my_isinf(int endian, const unsigned char *val, size_t size, size_t mpos, size_t H5T__bit_find(bits, epos, esize, H5T_BIT_LSB, 0) < 0) retval = 1; - HDfree(bits); + free(bits); return retval; } @@ -2822,8 +2822,8 @@ test_conv_flt_1(const char *name, int run_test, hid_t src, hid_t dst) * fork here and let the child run the test and return the number of * failures with the exit status. */ - HDfflush(stdout); - HDfflush(stderr); + fflush(stdout); + fflush(stderr); if ((child_pid = HDfork()) < 0) { HDperror("fork"); return 1; @@ -2911,7 +2911,7 @@ test_conv_flt_1(const char *name, int run_test, hid_t src, hid_t dst) HDsnprintf(str, sizeof(str), "Testing %s denormalized %s -> %s conversions", name, src_type_name, dst_type_name); - HDprintf("%-70s", str); + printf("%-70s", str); H5_FAILED(); HDputs(" Unknown data type."); goto error; @@ -2930,8 +2930,8 @@ test_conv_flt_1(const char *name, int run_test, hid_t src, hid_t dst) HDsnprintf(str, sizeof(str), "Testing %s denormalized %s -> %s conversions", name, src_type_name, dst_type_name); - HDprintf("%-70s", str); - HDfflush(stdout); + printf("%-70s", str); + fflush(stdout); fails_this_test = 0; } @@ -2947,7 +2947,7 @@ test_conv_flt_1(const char *name, int run_test, hid_t src, hid_t dst) dendian = H5Tget_order(dst); /* Allocate buffers */ - aligned = HDcalloc((size_t)1, MAX(sizeof(long double), sizeof(double))); + aligned = calloc((size_t)1, MAX(sizeof(long double), sizeof(double))); /* Allocate and initialize the source buffer through macro INIT_FP_NORM or INIT_FP_SPECIAL. * The BUF will be used for the conversion while the SAVED buffer will be used for @@ -3032,7 +3032,7 @@ test_conv_flt_1(const char *name, int run_test, hid_t src, hid_t dst) /* The hardware conversion */ /* Check for underflow when src is a "larger" float than dst.*/ if (FLT_FLOAT == src_type) { - HDmemcpy(aligned, saved + j * sizeof(float), sizeof(float)); + memcpy(aligned, saved + j * sizeof(float), sizeof(float)); if (FLT_FLOAT == dst_type) { hw_f = *((float *)aligned); hw = (unsigned char *)&hw_f; @@ -3049,7 +3049,7 @@ test_conv_flt_1(const char *name, int run_test, hid_t src, hid_t dst) } } else if (FLT_DOUBLE == src_type) { - HDmemcpy(aligned, saved + j * sizeof(double), sizeof(double)); + memcpy(aligned, saved + j * sizeof(double), sizeof(double)); if (FLT_FLOAT == dst_type) { hw_f = (float)(*((double *)aligned)); hw = (unsigned char *)&hw_f; @@ -3069,7 +3069,7 @@ test_conv_flt_1(const char *name, int run_test, hid_t src, hid_t dst) #if H5_SIZEOF_LONG_DOUBLE != H5_SIZEOF_DOUBLE } else { - HDmemcpy(aligned, saved + j * sizeof(long double), sizeof(long double)); + memcpy(aligned, saved + j * sizeof(long double), sizeof(long double)); if (FLT_FLOAT == dst_type) { hw_f = (float)*((long double *)aligned); hw = (unsigned char *)&hw_f; @@ -3158,7 +3158,7 @@ test_conv_flt_1(const char *name, int run_test, hid_t src, hid_t dst) if (FLT_FLOAT == dst_type) { float x = 0.0; - HDmemcpy(&x, &buf[j * dst_size], sizeof(float)); + memcpy(&x, &buf[j * dst_size], sizeof(float)); if (underflow && HDfabsf(x) <= FLT_MIN && HDfabsf(hw_f) <= FLT_MIN) continue; /* all underflowed, no error */ if (overflow && my_isinf(dendian, buf + j * sizeof(float), dst_size, dst_mpos, dst_msize, @@ -3169,7 +3169,7 @@ test_conv_flt_1(const char *name, int run_test, hid_t src, hid_t dst) } else if (FLT_DOUBLE == dst_type) { double x = 0.0; - HDmemcpy(&x, &buf[j * dst_size], sizeof(double)); + memcpy(&x, &buf[j * dst_size], sizeof(double)); if (underflow && HDfabs(x) <= DBL_MIN && HDfabs(hw_d) <= DBL_MIN) continue; /* all underflowed, no error */ if (overflow && my_isinf(dendian, buf + j * sizeof(double), dst_size, dst_mpos, dst_msize, @@ -3181,7 +3181,7 @@ test_conv_flt_1(const char *name, int run_test, hid_t src, hid_t dst) } else { long double x = 0.0L; - HDmemcpy(&x, &buf[j * dst_size], sizeof(long double)); + memcpy(&x, &buf[j * dst_size], sizeof(long double)); /* dst is largest float, no need to check underflow. */ check_mant[0] = (double)HDfrexpl(x, check_expo + 0); check_mant[1] = (double)HDfrexpl(hw_ld, check_expo + 1); @@ -3220,63 +3220,63 @@ test_conv_flt_1(const char *name, int run_test, hid_t src, hid_t dst) H5_WARNING(); } } - HDprintf(" elmt %u\n", (unsigned)j); + printf(" elmt %u\n", (unsigned)j); - HDprintf(" src ="); + printf(" src ="); for (k = 0; k < src_size; k++) - HDprintf(" %02x", saved[j * src_size + ENDIAN(src_size, k, sendian)]); - HDprintf("%*s", (int)(3 * MAX(0, (ssize_t)dst_size - (ssize_t)src_size)), ""); + printf(" %02x", saved[j * src_size + ENDIAN(src_size, k, sendian)]); + printf("%*s", (int)(3 * MAX(0, (ssize_t)dst_size - (ssize_t)src_size)), ""); if (FLT_FLOAT == src_type) { float x = 0.0; - HDmemcpy(&x, &saved[j * src_size], sizeof(float)); - HDprintf(" %29.20e\n", (double)x); + memcpy(&x, &saved[j * src_size], sizeof(float)); + printf(" %29.20e\n", (double)x); } else if (FLT_DOUBLE == src_type) { double x = 0.0; - HDmemcpy(&x, &saved[j * src_size], sizeof(double)); - HDprintf(" %29.20e\n", x); + memcpy(&x, &saved[j * src_size], sizeof(double)); + printf(" %29.20e\n", x); #if H5_SIZEOF_LONG_DOUBLE != H5_SIZEOF_DOUBLE } else { long double x = 0.0L; - HDmemcpy(&x, &saved[j * src_size], sizeof(long double)); - HDfprintf(stdout, " %29.20Le\n", x); + memcpy(&x, &saved[j * src_size], sizeof(long double)); + fprintf(stdout, " %29.20Le\n", x); #endif } - HDprintf(" dst ="); + printf(" dst ="); for (k = 0; k < dst_size; k++) - HDprintf(" %02x", buf[j * dst_size + ENDIAN(dst_size, k, dendian)]); - HDprintf("%*s", (int)(3 * MAX(0, (ssize_t)src_size - (ssize_t)dst_size)), ""); + printf(" %02x", buf[j * dst_size + ENDIAN(dst_size, k, dendian)]); + printf("%*s", (int)(3 * MAX(0, (ssize_t)src_size - (ssize_t)dst_size)), ""); if (FLT_FLOAT == dst_type) { float x = 0.0; - HDmemcpy(&x, &buf[j * dst_size], sizeof(float)); - HDprintf(" %29.20e\n", (double)x); + memcpy(&x, &buf[j * dst_size], sizeof(float)); + printf(" %29.20e\n", (double)x); } else if (FLT_DOUBLE == dst_type) { double x = 0.0; - HDmemcpy(&x, &buf[j * dst_size], sizeof(double)); - HDprintf(" %29.20e\n", x); + memcpy(&x, &buf[j * dst_size], sizeof(double)); + printf(" %29.20e\n", x); #if H5_SIZEOF_LONG_DOUBLE != H5_SIZEOF_DOUBLE } else { long double x = 0.0L; - HDmemcpy(&x, &buf[j * dst_size], sizeof(long double)); - HDfprintf(stdout, " %29.20Le\n", x); + memcpy(&x, &buf[j * dst_size], sizeof(long double)); + fprintf(stdout, " %29.20Le\n", x); #endif } - HDprintf(" ans ="); + printf(" ans ="); for (k = 0; k < dst_size; k++) - HDprintf(" %02x", hw[ENDIAN(dst_size, k, dendian)]); - HDprintf("%*s", (int)(3 * MAX(0, (ssize_t)src_size - (ssize_t)dst_size)), ""); + printf(" %02x", hw[ENDIAN(dst_size, k, dendian)]); + printf("%*s", (int)(3 * MAX(0, (ssize_t)src_size - (ssize_t)dst_size)), ""); if (FLT_FLOAT == dst_type) - HDprintf(" %29.20e\n", (double)hw_f); + printf(" %29.20e\n", (double)hw_f); else if (FLT_DOUBLE == dst_type) - HDprintf(" %29.20e\n", hw_d); + printf(" %29.20e\n", hw_d); #if H5_SIZEOF_LONG_DOUBLE != H5_SIZEOF_DOUBLE else - HDfprintf(stdout, " %29.20Le\n", hw_ld); + fprintf(stdout, " %29.20Le\n", hw_ld); #endif /* If the source is normalized values, print out error message; if it is @@ -3301,14 +3301,14 @@ done: if (saved) aligned_free(saved); if (aligned) - HDfree(aligned); - HDfflush(stdout); + free(aligned); + fflush(stdout); #ifdef HANDLE_SIGFPE if (run_test == TEST_NOOP || run_test == TEST_NORMAL) - HDexit(MIN((int)fails_all_tests, 254)); + exit(MIN((int)fails_all_tests, 254)); else if (run_test == TEST_DENORM || run_test == TEST_SPECIAL) - HDexit(EXIT_SUCCESS); - HDassert(0 && "Should not reach this point!"); + exit(EXIT_SUCCESS); + assert(0 && "Should not reach this point!"); return 1; #else /* Restore the default error handler (set in h5_reset()) */ @@ -3330,14 +3330,14 @@ error: if (saved) aligned_free(saved); if (aligned) - HDfree(aligned); - HDfflush(stdout); + free(aligned); + fflush(stdout); #ifdef HANDLE_SIGFPE if (run_test == TEST_NOOP || run_test == TEST_NORMAL) - HDexit(MIN(MAX((int)fails_all_tests, 1), 254)); + exit(MIN(MAX((int)fails_all_tests, 1), 254)); else if (run_test == TEST_DENORM || run_test == TEST_SPECIAL) - HDexit(EXIT_FAILURE); - HDassert(0 && "Should not reach this point!"); + exit(EXIT_FAILURE); + assert(0 && "Should not reach this point!"); return 1; #else /* Restore the default error handler (set in h5_reset()) */ @@ -3539,7 +3539,7 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst) /* Sanity checks */ if (OTHER == src_type || OTHER == dst_type) { HDsnprintf(str, sizeof(str), "Testing %s %s -> %s conversions", name, src_type_name, dst_type_name); - HDprintf("%-70s", str); + printf("%-70s", str); H5_FAILED(); HDputs(" Unknown data type."); goto error; @@ -3550,7 +3550,7 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst) INT_LLONG == src_type || INT_ULLONG == src_type) && (FLT_FLOAT != dst_type && FLT_DOUBLE != dst_type && FLT_LDOUBLE != dst_type)) { HDsnprintf(str, sizeof(str), "Testing %s %s -> %s conversions", name, src_type_name, dst_type_name); - HDprintf("%-70s", str); + printf("%-70s", str); H5_FAILED(); HDputs(" 1. Not an integer-float conversion."); goto error; @@ -3561,7 +3561,7 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst) INT_INT != dst_type && INT_UINT != dst_type && INT_LONG != dst_type && INT_ULONG != dst_type && INT_LLONG != dst_type && INT_ULLONG != dst_type)) { HDsnprintf(str, sizeof(str), "Testing %s %s -> %s conversions", name, src_type_name, dst_type_name); - HDprintf("%-70s", str); + printf("%-70s", str); H5_FAILED(); HDputs(" 2. Not a float-integer conversion."); goto error; @@ -3571,8 +3571,8 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst) INT_INT == src_type || INT_UINT == src_type || INT_LONG == src_type || INT_ULONG == src_type || INT_LLONG == src_type || INT_ULLONG == src_type) { HDsnprintf(str, sizeof(str), "Testing %s %s -> %s conversions", name, src_type_name, dst_type_name); - HDprintf("%-70s", str); - HDfflush(stdout); + printf("%-70s", str); + fflush(stdout); fails_this_test = 0; } else { @@ -3585,8 +3585,8 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst) else HDsnprintf(str, sizeof(str), "Testing %s special %s -> %s conversions", name, src_type_name, dst_type_name); - HDprintf("%-70s", str); - HDfflush(stdout); + printf("%-70s", str); + fflush(stdout); fails_this_test = 0; } @@ -3597,7 +3597,7 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst) dst_size = H5Tget_size(dst); src_nbits = H5Tget_precision(src); /* not 8*src_size, esp on J90 - QAK */ dst_nbits = H5Tget_precision(dst); /* not 8*dst_size, esp on J90 - QAK */ - aligned = HDcalloc((size_t)1, MAX(sizeof(long double), sizeof(long long))); + aligned = calloc((size_t)1, MAX(sizeof(long double), sizeof(long long))); #ifdef SHOW_OVERFLOWS noverflows_g = 0; #endif @@ -3606,7 +3606,7 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst) * 12 bytes but precision is 10 bytes. The 2 unused bytes may * have garbage causing wrong value comparison. */ - HDmemset(&hw_ldouble, 0, sizeof(long double)); + memset(&hw_ldouble, 0, sizeof(long double)); /* Create a dataset transfer property list and datatype conversion * exception handler function and pass in fill value. This is mainly @@ -3721,43 +3721,43 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst) hw = (unsigned char *)&hw_float; switch (src_type) { case INT_SCHAR: - HDmemcpy(aligned, saved + j * sizeof(signed char), sizeof(signed char)); + memcpy(aligned, saved + j * sizeof(signed char), sizeof(signed char)); hw_float = (float)(*((signed char *)aligned)); break; case INT_UCHAR: - HDmemcpy(aligned, saved + j * sizeof(unsigned char), sizeof(unsigned char)); + memcpy(aligned, saved + j * sizeof(unsigned char), sizeof(unsigned char)); hw_float = (float)(*((unsigned char *)aligned)); break; case INT_SHORT: - HDmemcpy(aligned, saved + j * sizeof(short), sizeof(short)); + memcpy(aligned, saved + j * sizeof(short), sizeof(short)); hw_float = (float)(*((short *)aligned)); break; case INT_USHORT: - HDmemcpy(aligned, saved + j * sizeof(unsigned short), sizeof(unsigned short)); + memcpy(aligned, saved + j * sizeof(unsigned short), sizeof(unsigned short)); hw_float = (float)(*((unsigned short *)aligned)); break; case INT_INT: - HDmemcpy(aligned, saved + j * sizeof(int), sizeof(int)); + memcpy(aligned, saved + j * sizeof(int), sizeof(int)); hw_float = (float)(*((int *)aligned)); break; case INT_UINT: - HDmemcpy(aligned, saved + j * sizeof(unsigned), sizeof(unsigned)); + memcpy(aligned, saved + j * sizeof(unsigned), sizeof(unsigned)); hw_float = (float)(*((unsigned *)aligned)); break; case INT_LONG: - HDmemcpy(aligned, saved + j * sizeof(long), sizeof(long)); + memcpy(aligned, saved + j * sizeof(long), sizeof(long)); hw_float = (float)(*((long *)aligned)); break; case INT_ULONG: - HDmemcpy(aligned, saved + j * sizeof(unsigned long), sizeof(unsigned long)); + memcpy(aligned, saved + j * sizeof(unsigned long), sizeof(unsigned long)); hw_float = (float)(*((unsigned long *)aligned)); break; case INT_LLONG: - HDmemcpy(aligned, saved + j * sizeof(long long), sizeof(long long)); + memcpy(aligned, saved + j * sizeof(long long), sizeof(long long)); hw_float = (float)(*((long long *)aligned)); break; case INT_ULLONG: - HDmemcpy(aligned, saved + j * sizeof(unsigned long long), sizeof(unsigned long long)); + memcpy(aligned, saved + j * sizeof(unsigned long long), sizeof(unsigned long long)); hw_float = (float)(*((unsigned long long *)aligned)); break; case FLT_FLOAT: @@ -3765,7 +3765,7 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst) case FLT_LDOUBLE: case OTHER: default: - HDassert(0 && "Unknown type"); + assert(0 && "Unknown type"); break; } } @@ -3773,43 +3773,43 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst) hw = (unsigned char *)&hw_double; switch (src_type) { case INT_SCHAR: - HDmemcpy(aligned, saved + j * sizeof(signed char), sizeof(signed char)); + memcpy(aligned, saved + j * sizeof(signed char), sizeof(signed char)); hw_double = (double)(*((signed char *)aligned)); break; case INT_UCHAR: - HDmemcpy(aligned, saved + j * sizeof(unsigned char), sizeof(unsigned char)); + memcpy(aligned, saved + j * sizeof(unsigned char), sizeof(unsigned char)); hw_double = (double)(*((unsigned char *)aligned)); break; case INT_SHORT: - HDmemcpy(aligned, saved + j * sizeof(short), sizeof(short)); + memcpy(aligned, saved + j * sizeof(short), sizeof(short)); hw_double = (double)(*((short *)aligned)); break; case INT_USHORT: - HDmemcpy(aligned, saved + j * sizeof(unsigned short), sizeof(unsigned short)); + memcpy(aligned, saved + j * sizeof(unsigned short), sizeof(unsigned short)); hw_double = (double)(*((unsigned short *)aligned)); break; case INT_INT: - HDmemcpy(aligned, saved + j * sizeof(int), sizeof(int)); + memcpy(aligned, saved + j * sizeof(int), sizeof(int)); hw_double = (double)(*((int *)aligned)); break; case INT_UINT: - HDmemcpy(aligned, saved + j * sizeof(unsigned), sizeof(unsigned)); + memcpy(aligned, saved + j * sizeof(unsigned), sizeof(unsigned)); hw_double = (double)(*((unsigned *)aligned)); break; case INT_LONG: - HDmemcpy(aligned, saved + j * sizeof(long), sizeof(long)); + memcpy(aligned, saved + j * sizeof(long), sizeof(long)); hw_double = (double)(*((long *)aligned)); break; case INT_ULONG: - HDmemcpy(aligned, saved + j * sizeof(unsigned long), sizeof(unsigned long)); + memcpy(aligned, saved + j * sizeof(unsigned long), sizeof(unsigned long)); hw_double = (double)(*((unsigned long *)aligned)); break; case INT_LLONG: - HDmemcpy(aligned, saved + j * sizeof(long long), sizeof(long long)); + memcpy(aligned, saved + j * sizeof(long long), sizeof(long long)); hw_double = (double)(*((long long *)aligned)); break; case INT_ULLONG: - HDmemcpy(aligned, saved + j * sizeof(unsigned long long), sizeof(unsigned long long)); + memcpy(aligned, saved + j * sizeof(unsigned long long), sizeof(unsigned long long)); hw_double = (double)(*((unsigned long long *)aligned)); break; case FLT_FLOAT: @@ -3817,7 +3817,7 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst) case FLT_LDOUBLE: case OTHER: default: - HDassert(0 && "Unknown type"); + assert(0 && "Unknown type"); break; } } @@ -3825,43 +3825,43 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst) hw = (unsigned char *)&hw_ldouble; switch (src_type) { case INT_SCHAR: - HDmemcpy(aligned, saved + j * sizeof(signed char), sizeof(signed char)); + memcpy(aligned, saved + j * sizeof(signed char), sizeof(signed char)); hw_ldouble = (long double)(*((signed char *)aligned)); break; case INT_UCHAR: - HDmemcpy(aligned, saved + j * sizeof(unsigned char), sizeof(unsigned char)); + memcpy(aligned, saved + j * sizeof(unsigned char), sizeof(unsigned char)); hw_ldouble = (long double)(*((unsigned char *)aligned)); break; case INT_SHORT: - HDmemcpy(aligned, saved + j * sizeof(short), sizeof(short)); + memcpy(aligned, saved + j * sizeof(short), sizeof(short)); hw_ldouble = (long double)(*((short *)aligned)); break; case INT_USHORT: - HDmemcpy(aligned, saved + j * sizeof(unsigned short), sizeof(unsigned short)); + memcpy(aligned, saved + j * sizeof(unsigned short), sizeof(unsigned short)); hw_ldouble = (long double)(*((unsigned short *)aligned)); break; case INT_INT: - HDmemcpy(aligned, saved + j * sizeof(int), sizeof(int)); + memcpy(aligned, saved + j * sizeof(int), sizeof(int)); hw_ldouble = (long double)(*((int *)aligned)); break; case INT_UINT: - HDmemcpy(aligned, saved + j * sizeof(unsigned), sizeof(unsigned)); + memcpy(aligned, saved + j * sizeof(unsigned), sizeof(unsigned)); hw_ldouble = (long double)(*((unsigned *)aligned)); break; case INT_LONG: - HDmemcpy(aligned, saved + j * sizeof(long), sizeof(long)); + memcpy(aligned, saved + j * sizeof(long), sizeof(long)); hw_ldouble = (long double)(*((long *)aligned)); break; case INT_ULONG: - HDmemcpy(aligned, saved + j * sizeof(unsigned long), sizeof(unsigned long)); + memcpy(aligned, saved + j * sizeof(unsigned long), sizeof(unsigned long)); hw_ldouble = (long double)(*((unsigned long *)aligned)); break; case INT_LLONG: - HDmemcpy(aligned, saved + j * sizeof(long long), sizeof(long long)); + memcpy(aligned, saved + j * sizeof(long long), sizeof(long long)); hw_ldouble = (long double)(*((long long *)aligned)); break; case INT_ULLONG: - HDmemcpy(aligned, saved + j * sizeof(unsigned long long), sizeof(unsigned long long)); + memcpy(aligned, saved + j * sizeof(unsigned long long), sizeof(unsigned long long)); hw_ldouble = (long double)(*((unsigned long long *)aligned)); break; case FLT_FLOAT: @@ -3869,7 +3869,7 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst) case FLT_LDOUBLE: case OTHER: default: - HDassert(0 && "Unknown type"); + assert(0 && "Unknown type"); break; } } @@ -3877,15 +3877,15 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst) hw = (unsigned char *)&hw_schar; switch (src_type) { case FLT_FLOAT: - HDmemcpy(aligned, saved + j * sizeof(float), sizeof(float)); + memcpy(aligned, saved + j * sizeof(float), sizeof(float)); hw_schar = (signed char)(*((float *)aligned)); break; case FLT_DOUBLE: - HDmemcpy(aligned, saved + j * sizeof(double), sizeof(double)); + memcpy(aligned, saved + j * sizeof(double), sizeof(double)); hw_schar = (signed char)(*((double *)aligned)); break; case FLT_LDOUBLE: - HDmemcpy(aligned, saved + j * sizeof(long double), sizeof(long double)); + memcpy(aligned, saved + j * sizeof(long double), sizeof(long double)); hw_schar = (signed char)(*((long double *)aligned)); break; case INT_SCHAR: @@ -3900,7 +3900,7 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst) case INT_ULLONG: case OTHER: default: - HDassert(0 && "Unknown type"); + assert(0 && "Unknown type"); break; } } @@ -3908,15 +3908,15 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst) hw = (unsigned char *)&hw_uchar; switch (src_type) { case FLT_FLOAT: - HDmemcpy(aligned, saved + j * sizeof(float), sizeof(float)); + memcpy(aligned, saved + j * sizeof(float), sizeof(float)); hw_uchar = (unsigned char)(*((float *)aligned)); break; case FLT_DOUBLE: - HDmemcpy(aligned, saved + j * sizeof(double), sizeof(double)); + memcpy(aligned, saved + j * sizeof(double), sizeof(double)); hw_uchar = (unsigned char)(*((double *)aligned)); break; case FLT_LDOUBLE: - HDmemcpy(aligned, saved + j * sizeof(long double), sizeof(long double)); + memcpy(aligned, saved + j * sizeof(long double), sizeof(long double)); hw_uchar = (unsigned char)(*((long double *)aligned)); break; case INT_SCHAR: @@ -3931,7 +3931,7 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst) case INT_ULLONG: case OTHER: default: - HDassert(0 && "Unknown type"); + assert(0 && "Unknown type"); break; } } @@ -3939,15 +3939,15 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst) hw = (unsigned char *)&hw_short; switch (src_type) { case FLT_FLOAT: - HDmemcpy(aligned, saved + j * sizeof(float), sizeof(float)); + memcpy(aligned, saved + j * sizeof(float), sizeof(float)); hw_short = (short)(*((float *)aligned)); break; case FLT_DOUBLE: - HDmemcpy(aligned, saved + j * sizeof(double), sizeof(double)); + memcpy(aligned, saved + j * sizeof(double), sizeof(double)); hw_short = (short)(*((double *)aligned)); break; case FLT_LDOUBLE: - HDmemcpy(aligned, saved + j * sizeof(long double), sizeof(long double)); + memcpy(aligned, saved + j * sizeof(long double), sizeof(long double)); hw_short = (short)(*((long double *)aligned)); break; case INT_SCHAR: @@ -3962,7 +3962,7 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst) case INT_ULLONG: case OTHER: default: - HDassert(0 && "Unknown type"); + assert(0 && "Unknown type"); break; } } @@ -3970,15 +3970,15 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst) hw = (unsigned char *)&hw_ushort; switch (src_type) { case FLT_FLOAT: - HDmemcpy(aligned, saved + j * sizeof(float), sizeof(float)); + memcpy(aligned, saved + j * sizeof(float), sizeof(float)); hw_ushort = (unsigned short)(*((float *)aligned)); break; case FLT_DOUBLE: - HDmemcpy(aligned, saved + j * sizeof(double), sizeof(double)); + memcpy(aligned, saved + j * sizeof(double), sizeof(double)); hw_ushort = (unsigned short)(*((double *)aligned)); break; case FLT_LDOUBLE: - HDmemcpy(aligned, saved + j * sizeof(long double), sizeof(long double)); + memcpy(aligned, saved + j * sizeof(long double), sizeof(long double)); hw_ushort = (unsigned short)(*((long double *)aligned)); break; case INT_SCHAR: @@ -3993,7 +3993,7 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst) case INT_ULLONG: case OTHER: default: - HDassert(0 && "Unknown type"); + assert(0 && "Unknown type"); break; } } @@ -4001,15 +4001,15 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst) hw = (unsigned char *)&hw_int; switch (src_type) { case FLT_FLOAT: - HDmemcpy(aligned, saved + j * sizeof(float), sizeof(float)); + memcpy(aligned, saved + j * sizeof(float), sizeof(float)); hw_int = (int)(*((float *)aligned)); break; case FLT_DOUBLE: - HDmemcpy(aligned, saved + j * sizeof(double), sizeof(double)); + memcpy(aligned, saved + j * sizeof(double), sizeof(double)); hw_int = (int)(*((double *)aligned)); break; case FLT_LDOUBLE: - HDmemcpy(aligned, saved + j * sizeof(long double), sizeof(long double)); + memcpy(aligned, saved + j * sizeof(long double), sizeof(long double)); hw_int = (int)(*((long double *)aligned)); break; case INT_SCHAR: @@ -4024,7 +4024,7 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst) case INT_ULLONG: case OTHER: default: - HDassert(0 && "Unknown type"); + assert(0 && "Unknown type"); break; } } @@ -4032,15 +4032,15 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst) hw = (unsigned char *)&hw_uint; switch (src_type) { case FLT_FLOAT: - HDmemcpy(aligned, saved + j * sizeof(float), sizeof(float)); + memcpy(aligned, saved + j * sizeof(float), sizeof(float)); hw_uint = (unsigned int)(*((float *)aligned)); break; case FLT_DOUBLE: - HDmemcpy(aligned, saved + j * sizeof(double), sizeof(double)); + memcpy(aligned, saved + j * sizeof(double), sizeof(double)); hw_uint = (unsigned int)(*((double *)aligned)); break; case FLT_LDOUBLE: - HDmemcpy(aligned, saved + j * sizeof(long double), sizeof(long double)); + memcpy(aligned, saved + j * sizeof(long double), sizeof(long double)); hw_uint = (unsigned int)(*((long double *)aligned)); break; case INT_SCHAR: @@ -4055,7 +4055,7 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst) case INT_ULLONG: case OTHER: default: - HDassert(0 && "Unknown type"); + assert(0 && "Unknown type"); break; } } @@ -4063,15 +4063,15 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst) hw = (unsigned char *)&hw_long; switch (src_type) { case FLT_FLOAT: - HDmemcpy(aligned, saved + j * sizeof(float), sizeof(float)); + memcpy(aligned, saved + j * sizeof(float), sizeof(float)); hw_long = (long)(*((float *)aligned)); break; case FLT_DOUBLE: - HDmemcpy(aligned, saved + j * sizeof(double), sizeof(double)); + memcpy(aligned, saved + j * sizeof(double), sizeof(double)); hw_long = (long)(*((double *)aligned)); break; case FLT_LDOUBLE: - HDmemcpy(aligned, saved + j * sizeof(long double), sizeof(long double)); + memcpy(aligned, saved + j * sizeof(long double), sizeof(long double)); hw_long = (long)(*((long double *)aligned)); break; case INT_SCHAR: @@ -4086,7 +4086,7 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst) case INT_ULLONG: case OTHER: default: - HDassert(0 && "Unknown type"); + assert(0 && "Unknown type"); break; } } @@ -4094,15 +4094,15 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst) hw = (unsigned char *)&hw_ulong; switch (src_type) { case FLT_FLOAT: - HDmemcpy(aligned, saved + j * sizeof(float), sizeof(float)); + memcpy(aligned, saved + j * sizeof(float), sizeof(float)); hw_ulong = (unsigned long)(*((float *)aligned)); break; case FLT_DOUBLE: - HDmemcpy(aligned, saved + j * sizeof(double), sizeof(double)); + memcpy(aligned, saved + j * sizeof(double), sizeof(double)); hw_ulong = (unsigned long)(*((double *)aligned)); break; case FLT_LDOUBLE: - HDmemcpy(aligned, saved + j * sizeof(long double), sizeof(long double)); + memcpy(aligned, saved + j * sizeof(long double), sizeof(long double)); hw_ulong = (unsigned long)(*((long double *)aligned)); break; case INT_SCHAR: @@ -4117,7 +4117,7 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst) case INT_ULLONG: case OTHER: default: - HDassert(0 && "Unknown type"); + assert(0 && "Unknown type"); break; } } @@ -4125,15 +4125,15 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst) hw = (unsigned char *)&hw_llong; switch (src_type) { case FLT_FLOAT: - HDmemcpy(aligned, saved + j * sizeof(float), sizeof(float)); + memcpy(aligned, saved + j * sizeof(float), sizeof(float)); hw_llong = (long long)(*((float *)aligned)); break; case FLT_DOUBLE: - HDmemcpy(aligned, saved + j * sizeof(double), sizeof(double)); + memcpy(aligned, saved + j * sizeof(double), sizeof(double)); hw_llong = (long long)(*((double *)aligned)); break; case FLT_LDOUBLE: - HDmemcpy(aligned, saved + j * sizeof(long double), sizeof(long double)); + memcpy(aligned, saved + j * sizeof(long double), sizeof(long double)); hw_llong = (long long)(*((long double *)aligned)); break; case INT_SCHAR: @@ -4148,7 +4148,7 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst) case INT_ULLONG: case OTHER: default: - HDassert(0 && "Unknown type"); + assert(0 && "Unknown type"); break; } } @@ -4156,15 +4156,15 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst) hw = (unsigned char *)&hw_ullong; switch (src_type) { case FLT_FLOAT: - HDmemcpy(aligned, saved + j * sizeof(float), sizeof(float)); + memcpy(aligned, saved + j * sizeof(float), sizeof(float)); hw_ullong = (unsigned long long)(*((float *)aligned)); break; case FLT_DOUBLE: - HDmemcpy(aligned, saved + j * sizeof(double), sizeof(double)); + memcpy(aligned, saved + j * sizeof(double), sizeof(double)); hw_ullong = (unsigned long long)(*((double *)aligned)); break; case FLT_LDOUBLE: - HDmemcpy(aligned, saved + j * sizeof(long double), sizeof(long double)); + memcpy(aligned, saved + j * sizeof(long double), sizeof(long double)); hw_ullong = (unsigned long long)(*((long double *)aligned)); break; case INT_SCHAR: @@ -4179,13 +4179,13 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst) case INT_ULLONG: case OTHER: default: - HDassert(0 && "Unknown type"); + assert(0 && "Unknown type"); break; } } /* Make certain that there isn't some weird number of destination bits */ - HDassert(dst_nbits % 8 == 0); + assert(dst_nbits % 8 == 0); /* For Intel machines, the size of "long double" is 12 bytes, precision * is 80 bits; for AMD processors, the size of "long double" is 16 bytes, @@ -4321,181 +4321,181 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst) H5_WARNING(); } } - HDprintf(" elmt %u: \n", (unsigned)j); + printf(" elmt %u: \n", (unsigned)j); - HDprintf(" src = "); + printf(" src = "); for (k = 0; k < src_size; k++) - HDprintf(" %02x", saved[j * src_size + ENDIAN(src_size, k, sendian)]); - HDprintf("%*s", (int)(3 * MAX(0, (ssize_t)dst_size - (ssize_t)src_size)), ""); + printf(" %02x", saved[j * src_size + ENDIAN(src_size, k, sendian)]); + printf("%*s", (int)(3 * MAX(0, (ssize_t)dst_size - (ssize_t)src_size)), ""); switch (src_type) { case INT_SCHAR: - HDmemcpy(aligned, saved + j * sizeof(signed char), sizeof(signed char)); - HDprintf(" %29d\n", (int)*((signed char *)aligned)); + memcpy(aligned, saved + j * sizeof(signed char), sizeof(signed char)); + printf(" %29d\n", (int)*((signed char *)aligned)); break; case INT_UCHAR: - HDmemcpy(aligned, saved + j * sizeof(unsigned char), sizeof(unsigned char)); - HDprintf(" %29u\n", (unsigned)*((unsigned char *)aligned)); + memcpy(aligned, saved + j * sizeof(unsigned char), sizeof(unsigned char)); + printf(" %29u\n", (unsigned)*((unsigned char *)aligned)); break; case INT_SHORT: - HDmemcpy(aligned, saved + j * sizeof(short), sizeof(short)); - HDprintf(" %29hd\n", *((short *)aligned)); + memcpy(aligned, saved + j * sizeof(short), sizeof(short)); + printf(" %29hd\n", *((short *)aligned)); break; case INT_USHORT: - HDmemcpy(aligned, saved + j * sizeof(unsigned short), sizeof(unsigned short)); - HDprintf(" %29hu\n", *((unsigned short *)aligned)); + memcpy(aligned, saved + j * sizeof(unsigned short), sizeof(unsigned short)); + printf(" %29hu\n", *((unsigned short *)aligned)); break; case INT_INT: - HDmemcpy(aligned, saved + j * sizeof(int), sizeof(int)); - HDprintf(" %29d\n", *((int *)aligned)); + memcpy(aligned, saved + j * sizeof(int), sizeof(int)); + printf(" %29d\n", *((int *)aligned)); break; case INT_UINT: - HDmemcpy(aligned, saved + j * sizeof(unsigned), sizeof(unsigned)); - HDprintf(" %29u\n", *((unsigned *)aligned)); + memcpy(aligned, saved + j * sizeof(unsigned), sizeof(unsigned)); + printf(" %29u\n", *((unsigned *)aligned)); break; case INT_LONG: - HDmemcpy(aligned, saved + j * sizeof(long), sizeof(long)); - HDprintf(" %29ld\n", *((long *)aligned)); + memcpy(aligned, saved + j * sizeof(long), sizeof(long)); + printf(" %29ld\n", *((long *)aligned)); break; case INT_ULONG: - HDmemcpy(aligned, saved + j * sizeof(unsigned long), sizeof(unsigned long)); - HDprintf(" %29lu\n", *((unsigned long *)aligned)); + memcpy(aligned, saved + j * sizeof(unsigned long), sizeof(unsigned long)); + printf(" %29lu\n", *((unsigned long *)aligned)); break; case INT_LLONG: - HDmemcpy(aligned, saved + j * sizeof(long long), sizeof(long long)); - HDfprintf(stdout, " %29lld\n", *((long long *)aligned)); + memcpy(aligned, saved + j * sizeof(long long), sizeof(long long)); + fprintf(stdout, " %29lld\n", *((long long *)aligned)); break; case INT_ULLONG: - HDmemcpy(aligned, saved + j * sizeof(unsigned long long), sizeof(unsigned long long)); - HDfprintf(stdout, " %29llu\n", *((unsigned long long *)aligned)); + memcpy(aligned, saved + j * sizeof(unsigned long long), sizeof(unsigned long long)); + fprintf(stdout, " %29llu\n", *((unsigned long long *)aligned)); break; case FLT_FLOAT: - HDmemcpy(aligned, saved + j * sizeof(float), sizeof(float)); - HDprintf(" %29f\n", (double)*((float *)aligned)); + memcpy(aligned, saved + j * sizeof(float), sizeof(float)); + printf(" %29f\n", (double)*((float *)aligned)); break; case FLT_DOUBLE: - HDmemcpy(aligned, saved + j * sizeof(double), sizeof(double)); - HDprintf(" %29f\n", *((double *)aligned)); + memcpy(aligned, saved + j * sizeof(double), sizeof(double)); + printf(" %29f\n", *((double *)aligned)); break; case FLT_LDOUBLE: - HDmemcpy(aligned, saved + j * sizeof(long double), sizeof(long double)); - HDprintf(" %29Lf\n", *((long double *)aligned)); + memcpy(aligned, saved + j * sizeof(long double), sizeof(long double)); + printf(" %29Lf\n", *((long double *)aligned)); break; case OTHER: default: - HDassert(0 && "Unknown type"); + assert(0 && "Unknown type"); break; } - HDprintf(" dst = "); + printf(" dst = "); for (k = 0; k < dst_size; k++) - HDprintf(" %02x", buf[j * dst_size + ENDIAN(dst_size, k, dendian)]); - HDprintf("%*s", (int)(3 * MAX(0, (ssize_t)src_size - (ssize_t)dst_size)), ""); + printf(" %02x", buf[j * dst_size + ENDIAN(dst_size, k, dendian)]); + printf("%*s", (int)(3 * MAX(0, (ssize_t)src_size - (ssize_t)dst_size)), ""); switch (dst_type) { case INT_SCHAR: - HDmemcpy(aligned, buf + j * sizeof(signed char), sizeof(signed char)); - HDprintf(" %29d\n", (int)*((signed char *)aligned)); + memcpy(aligned, buf + j * sizeof(signed char), sizeof(signed char)); + printf(" %29d\n", (int)*((signed char *)aligned)); break; case INT_UCHAR: - HDmemcpy(aligned, buf + j * sizeof(unsigned char), sizeof(unsigned char)); - HDprintf(" %29u\n", (unsigned)*((unsigned char *)aligned)); + memcpy(aligned, buf + j * sizeof(unsigned char), sizeof(unsigned char)); + printf(" %29u\n", (unsigned)*((unsigned char *)aligned)); break; case INT_SHORT: - HDmemcpy(aligned, buf + j * sizeof(short), sizeof(short)); - HDprintf(" %29hd\n", *((short *)aligned)); + memcpy(aligned, buf + j * sizeof(short), sizeof(short)); + printf(" %29hd\n", *((short *)aligned)); break; case INT_USHORT: - HDmemcpy(aligned, buf + j * sizeof(unsigned short), sizeof(unsigned short)); - HDprintf(" %29hu\n", *((unsigned short *)aligned)); + memcpy(aligned, buf + j * sizeof(unsigned short), sizeof(unsigned short)); + printf(" %29hu\n", *((unsigned short *)aligned)); break; case INT_INT: - HDmemcpy(aligned, buf + j * sizeof(int), sizeof(int)); - HDprintf(" %29d\n", *((int *)aligned)); + memcpy(aligned, buf + j * sizeof(int), sizeof(int)); + printf(" %29d\n", *((int *)aligned)); break; case INT_UINT: - HDmemcpy(aligned, buf + j * sizeof(unsigned), sizeof(unsigned)); - HDprintf(" %29u\n", *((unsigned *)aligned)); + memcpy(aligned, buf + j * sizeof(unsigned), sizeof(unsigned)); + printf(" %29u\n", *((unsigned *)aligned)); break; case INT_LONG: - HDmemcpy(aligned, buf + j * sizeof(long), sizeof(long)); - HDprintf(" %29ld\n", *((long *)aligned)); + memcpy(aligned, buf + j * sizeof(long), sizeof(long)); + printf(" %29ld\n", *((long *)aligned)); break; case INT_ULONG: - HDmemcpy(aligned, buf + j * sizeof(unsigned long), sizeof(unsigned long)); - HDprintf(" %29lu\n", *((unsigned long *)aligned)); + memcpy(aligned, buf + j * sizeof(unsigned long), sizeof(unsigned long)); + printf(" %29lu\n", *((unsigned long *)aligned)); break; case INT_LLONG: - HDmemcpy(aligned, buf + j * sizeof(long long), sizeof(long long)); - HDfprintf(stdout, " %29lld\n", *((long long *)aligned)); + memcpy(aligned, buf + j * sizeof(long long), sizeof(long long)); + fprintf(stdout, " %29lld\n", *((long long *)aligned)); break; case INT_ULLONG: - HDmemcpy(aligned, buf + j * sizeof(unsigned long long), sizeof(unsigned long long)); - HDfprintf(stdout, " %29llu\n", *((unsigned long long *)aligned)); + memcpy(aligned, buf + j * sizeof(unsigned long long), sizeof(unsigned long long)); + fprintf(stdout, " %29llu\n", *((unsigned long long *)aligned)); break; case FLT_FLOAT: - HDmemcpy(aligned, buf + j * sizeof(float), sizeof(float)); - HDprintf(" %29f\n", (double)*((float *)aligned)); + memcpy(aligned, buf + j * sizeof(float), sizeof(float)); + printf(" %29f\n", (double)*((float *)aligned)); break; case FLT_DOUBLE: - HDmemcpy(aligned, buf + j * sizeof(double), sizeof(double)); - HDprintf(" %29f\n", *((double *)aligned)); + memcpy(aligned, buf + j * sizeof(double), sizeof(double)); + printf(" %29f\n", *((double *)aligned)); break; case FLT_LDOUBLE: - HDmemcpy(aligned, buf + j * sizeof(long double), sizeof(long double)); - HDprintf(" %29Lf\n", *((long double *)aligned)); + memcpy(aligned, buf + j * sizeof(long double), sizeof(long double)); + printf(" %29Lf\n", *((long double *)aligned)); break; case OTHER: default: - HDassert(0 && "Unknown type"); + assert(0 && "Unknown type"); break; } - HDprintf(" and = "); + printf(" and = "); for (k = 0; k < dst_size; k++) - HDprintf(" %02x", hw[ENDIAN(dst_size, k, dendian)]); - HDprintf("%*s", (int)(3 * MAX(0, (ssize_t)src_size - (ssize_t)dst_size)), ""); + printf(" %02x", hw[ENDIAN(dst_size, k, dendian)]); + printf("%*s", (int)(3 * MAX(0, (ssize_t)src_size - (ssize_t)dst_size)), ""); switch (dst_type) { case INT_SCHAR: - HDprintf(" %29d\n", (int)*((signed char *)((void *)hw))); + printf(" %29d\n", (int)*((signed char *)((void *)hw))); break; case INT_UCHAR: - HDprintf(" %29u\n", (unsigned)*((unsigned char *)((void *)hw))); + printf(" %29u\n", (unsigned)*((unsigned char *)((void *)hw))); break; case INT_SHORT: - HDprintf(" %29hd\n", *((short *)((void *)hw))); + printf(" %29hd\n", *((short *)((void *)hw))); break; case INT_USHORT: - HDprintf(" %29hu\n", *((unsigned short *)((void *)hw))); + printf(" %29hu\n", *((unsigned short *)((void *)hw))); break; case INT_INT: - HDprintf(" %29d\n", *((int *)((void *)hw))); + printf(" %29d\n", *((int *)((void *)hw))); break; case INT_UINT: - HDprintf(" %29u\n", *((unsigned int *)((void *)hw))); + printf(" %29u\n", *((unsigned int *)((void *)hw))); break; case INT_LONG: - HDprintf(" %29ld\n", *((long *)((void *)hw))); + printf(" %29ld\n", *((long *)((void *)hw))); break; case INT_ULONG: - HDprintf(" %29lu\n", *((unsigned long *)((void *)hw))); + printf(" %29lu\n", *((unsigned long *)((void *)hw))); break; case INT_LLONG: - HDfprintf(stdout, " %29lld\n", *((long long *)((void *)hw))); + fprintf(stdout, " %29lld\n", *((long long *)((void *)hw))); break; case INT_ULLONG: - HDfprintf(stdout, " %29llu\n", *((unsigned long long *)((void *)hw))); + fprintf(stdout, " %29llu\n", *((unsigned long long *)((void *)hw))); break; case FLT_FLOAT: - HDprintf(" %29f\n", (double)*((float *)((void *)hw))); + printf(" %29f\n", (double)*((float *)((void *)hw))); break; case FLT_DOUBLE: - HDprintf(" %29f\n", *((double *)((void *)hw))); + printf(" %29f\n", *((double *)((void *)hw))); break; case FLT_LDOUBLE: - HDprintf(" %29Lf\n", *((long double *)((void *)hw))); + printf(" %29Lf\n", *((long double *)((void *)hw))); break; case OTHER: default: - HDassert(0 && "Unknown type"); + assert(0 && "Unknown type"); break; } @@ -4521,8 +4521,8 @@ done: if (saved) aligned_free(saved); if (aligned) - HDfree(aligned); - HDfflush(stdout); + free(aligned); + fflush(stdout); /* Restore the default error handler (set in h5_reset()) */ h5_restore_err(); @@ -4541,8 +4541,8 @@ error: if (saved) aligned_free(saved); if (aligned) - HDfree(aligned); - HDfflush(stdout); + free(aligned); + fflush(stdout); /* Restore the default error handler (set in h5_reset()) */ h5_restore_err(); @@ -4552,7 +4552,7 @@ error: if (run_test == TEST_NORMAL) return MAX((int)fails_all_tests, 1); else { - HDassert(run_test == TEST_DENORM || run_test == TEST_SPECIAL); + assert(run_test == TEST_DENORM || run_test == TEST_SPECIAL); return 1; } } @@ -4585,8 +4585,8 @@ overflows(unsigned char *origin_bits, hid_t src_id, size_t dst_num_bits) ssize_t indx; unsigned char bits[32], mant_bits[32]; - HDmemset(bits, 0, (size_t)32); - HDmemset(mant_bits, 0, (size_t)32); + memset(bits, 0, (size_t)32); + memset(mant_bits, 0, (size_t)32); /* * Sometimes, type size isn't equal to the precision like Linux's "long @@ -4598,7 +4598,7 @@ overflows(unsigned char *origin_bits, hid_t src_id, size_t dst_num_bits) bias = H5Tget_ebias(src_id); norm = H5Tget_norm(src_id); - HDmemcpy(bits, origin_bits, src_prec / 8 + 1); + memcpy(bits, origin_bits, src_prec / 8 + 1); /*Check for special cases: +Inf, -Inf*/ if (H5T__bit_find(bits, mpos, mant_digits, H5T_BIT_LSB, TRUE) < 0) { @@ -4853,7 +4853,7 @@ run_fp_tests(const char *name) HDsnprintf(str, sizeof(str), "Testing %s denormalized %s -> %s conversions", name, "long double", "float"); - HDprintf("%-70s", str); + printf("%-70s", str); SKIPPED(); HDputs(" Test skipped due to the conversion problem on IBM ppc64le cpu."); } @@ -4877,7 +4877,7 @@ run_fp_tests(const char *name) HDsnprintf(str, sizeof(str), "Testing %s special %s -> %s conversions", name, "long double", "float or double"); - HDprintf("%-70s", str); + printf("%-70s", str); SKIPPED(); HDputs(" Test skipped due to the conversion problem on IBM ppc64le cpu."); } @@ -4956,7 +4956,7 @@ run_int_fp_conv(const char *name) HDsnprintf(str, sizeof(str), "Testing %s %s -> %s conversions", name, "(unsigned) long", "long double"); - HDprintf("%-70s", str); + printf("%-70s", str); SKIPPED(); HDputs(" Test skipped due to the special algorithm of hardware conversion."); } @@ -4970,7 +4970,7 @@ run_int_fp_conv(const char *name) char str[256]; /*hello string */ HDsnprintf(str, sizeof(str), "Testing %s %s -> %s conversions", name, "long long", "long double"); - HDprintf("%-70s", str); + printf("%-70s", str); SKIPPED(); HDputs(" Test skipped due to compiler error in handling conversion."); } @@ -4983,7 +4983,7 @@ run_int_fp_conv(const char *name) HDsnprintf(str, sizeof(str), "Testing %s %s -> %s conversions", name, "unsigned long long", "long double"); - HDprintf("%-70s", str); + printf("%-70s", str); SKIPPED(); HDputs(" Test skipped due to compiler not handling conversion."); } @@ -5075,7 +5075,7 @@ run_fp_int_conv(const char *name) HDsnprintf(str, sizeof(str), "Testing %s special %s -> %s conversions", name, "long double", "signed and unsigned char, short, int, long"); - HDprintf("%-70s", str); + printf("%-70s", str); SKIPPED(); HDputs(" Test skipped due to the conversion problem on IBM ppc64le cpu."); #endif @@ -5098,7 +5098,7 @@ run_fp_int_conv(const char *name) HDsnprintf(str, sizeof(str), "Testing %s %s -> %s conversions", name, "long double", "(unsigned) long"); - HDprintf("%-70s", str); + printf("%-70s", str); SKIPPED(); HDputs(" Test skipped due to the special algorithm of hardware conversion."); } @@ -5113,7 +5113,7 @@ run_fp_int_conv(const char *name) char str[256]; /*string */ HDsnprintf(str, sizeof(str), "Testing %s %s -> %s conversions", name, "long double", "long long"); - HDprintf("%-70s", str); + printf("%-70s", str); SKIPPED(); HDputs(" Test skipped due to hardware conversion error."); } @@ -5126,7 +5126,7 @@ run_fp_int_conv(const char *name) HDsnprintf(str, sizeof(str), "Testing %s %s -> %s conversions", name, "long double", "unsigned long long"); - HDprintf("%-70s", str); + printf("%-70s", str); SKIPPED(); HDputs(" Test skipped due to hardware conversion error."); } @@ -5163,7 +5163,7 @@ main(void) reset_hdf5(); if (ALIGNMENT) - HDprintf("Testing non-aligned conversions (ALIGNMENT=%d)....\n", ALIGNMENT); + printf("Testing non-aligned conversions (ALIGNMENT=%d)....\n", ALIGNMENT); /* Do the tests */ @@ -5229,9 +5229,9 @@ main(void) h5_restore_err(); if (nerrors) { - HDprintf("***** %lu FAILURE%s! *****\n", nerrors, 1 == nerrors ? "" : "S"); - HDexit(EXIT_FAILURE); + printf("***** %lu FAILURE%s! *****\n", nerrors, 1 == nerrors ? "" : "S"); + exit(EXIT_FAILURE); } - HDprintf("All data type tests passed.\n"); + printf("All data type tests passed.\n"); return 0; } diff --git a/test/dtransform.c b/test/dtransform.c index d73bc1a..a67cfed 100644 --- a/test/dtransform.c +++ b/test/dtransform.c @@ -80,7 +80,7 @@ const int transformData[ROWS][COLS] = {{36, 31, 25, 19, 13, 7, 1, 5, 11, 16, 22, (((VAR1)[i][j] <= (TYPE)((VAR2)[i][j])) && \ (((VAR1)[i][j] + (TOL)) > (TYPE)((VAR2)[i][j]))))) { \ H5_FAILED(); \ - HDfprintf(stderr, " ERROR: Conversion failed to match computed data\n"); \ + fprintf(stderr, " ERROR: Conversion failed to match computed data\n"); \ goto error; \ } \ } \ @@ -96,7 +96,7 @@ const int transformData[ROWS][COLS] = {{36, 31, 25, 19, 13, 7, 1, 5, 11, 16, 22, if (!(((VAR1)[i][j] <= ((TYPE)(VAR2)[i][j] + (TOL))) && \ ((VAR1)[i][j] >= ((TYPE)(VAR2)[i][j] - (TOL))))) { \ H5_FAILED(); \ - HDfprintf(stderr, " ERROR: Conversion failed to match computed data\n"); \ + fprintf(stderr, " ERROR: Conversion failed to match computed data\n"); \ goto error; \ } \ } \ @@ -111,7 +111,7 @@ const int transformData[ROWS][COLS] = {{36, 31, 25, 19, 13, 7, 1, 5, 11, 16, 22, for (j = 0; j < COLS; j++) { \ if ((VAR1)[i][j] != (VAR2)[i][j]) { \ H5_FAILED(); \ - HDfprintf(stderr, " ERROR: data failed to match computed data\n"); \ + fprintf(stderr, " ERROR: data failed to match computed data\n"); \ goto error; \ } \ } \ @@ -131,7 +131,7 @@ const int transformData[ROWS][COLS] = {{36, 31, 25, 19, 13, 7, 1, 5, 11, 16, 22, hsize_t dim[2] = {ROWS, COLS}; \ \ /* NOTE: If this macro encounters errors, this memory will leak */ \ - if (NULL == (array = HDcalloc(1, sizeof(*array)))) \ + if (NULL == (array = calloc(1, sizeof(*array)))) \ TEST_ERROR; \ \ if ((dataspace = H5Screate_simple(2, dim, NULL)) < 0) \ @@ -210,7 +210,7 @@ const int transformData[ROWS][COLS] = {{36, 31, 25, 19, 13, 7, 1, 5, 11, 16, 22, if (H5Sclose(dataspace) < 0) \ TEST_ERROR; \ \ - HDfree(array); \ + free(array); \ } #define TEST_TYPE_CHUNK(XFORM, TYPE, HDF_TYPE, TEST_STR, COMPARE_DATA, SIGNED) \ @@ -227,7 +227,7 @@ const int transformData[ROWS][COLS] = {{36, 31, 25, 19, 13, 7, 1, 5, 11, 16, 22, hsize_t offset[2] = {0, 0}; \ \ /* NOTE: If this macro encounters errors, this memory will leak */ \ - if (NULL == (array = HDcalloc(1, sizeof(*array)))) \ + if (NULL == (array = calloc(1, sizeof(*array)))) \ TEST_ERROR; \ \ if ((dataspace = H5Screate_simple(2, dim, NULL)) < 0) \ @@ -297,7 +297,7 @@ const int transformData[ROWS][COLS] = {{36, 31, 25, 19, 13, 7, 1, 5, 11, 16, 22, if (H5Sclose(memspace) < 0) \ TEST_ERROR; \ \ - HDfree(array); \ + free(array); \ } #define INVALID_SET_TEST(TRANSFORM) \ @@ -307,7 +307,7 @@ const int transformData[ROWS][COLS] = {{36, 31, 25, 19, 13, 7, 1, 5, 11, 16, 22, } \ else { \ H5_FAILED(); \ - HDfprintf(stderr, " ERROR: Data transform allowed invalid TRANSFORM transform to be set\n"); \ + fprintf(stderr, " ERROR: Data transform allowed invalid TRANSFORM transform to be set\n"); \ goto error; \ } \ } @@ -857,7 +857,7 @@ test_getset(const hid_t dxpl_id_c_to_f) TESTING("H5Pget_data_transform"); - if (NULL == (ptrgetTest = (char *)HDmalloc(HDstrlen(simple) + 1))) + if (NULL == (ptrgetTest = (char *)malloc(HDstrlen(simple) + 1))) TEST_ERROR; if (H5Pget_data_transform(dxpl_id_c_to_f, ptrgetTest, HDstrlen(c_to_f) + 1) < 0) @@ -867,7 +867,7 @@ test_getset(const hid_t dxpl_id_c_to_f) PASSED(); - HDfree(ptrgetTest); + free(ptrgetTest); ptrgetTest = NULL; TESTING("data transform, read after resetting of transform property"); @@ -888,7 +888,7 @@ test_getset(const hid_t dxpl_id_c_to_f) TESTING("H5Pget_data_transform, after resetting transform property"); - if (NULL == (ptrgetTest = (char *)HDcalloc((size_t)1, HDstrlen(simple) + 1))) + if (NULL == (ptrgetTest = (char *)calloc((size_t)1, HDstrlen(simple) + 1))) TEST_ERROR; if (H5Pget_data_transform(dxpl_id_c_to_f, ptrgetTest, HDstrlen(simple) + 1) < 0) TEST_ERROR; @@ -897,14 +897,14 @@ test_getset(const hid_t dxpl_id_c_to_f) PASSED(); - HDfree(ptrgetTest); + free(ptrgetTest); ptrgetTest = NULL; return 0; error: if (ptrgetTest) - HDfree(ptrgetTest); + free(ptrgetTest); return -1; } @@ -919,7 +919,7 @@ test_set(void) TESTING("H5Pget_data_transform (get before set)"); - if (NULL == (ptrgetTest = (char *)HDmalloc(HDstrlen(str) + 1))) + if (NULL == (ptrgetTest = (char *)malloc(HDstrlen(str) + 1))) TEST_ERROR; if ((dxpl_id = H5Pcreate(H5P_DATASET_XFER)) < 0) @@ -935,7 +935,7 @@ test_set(void) else FAIL_PUTS_ERROR(" ERROR: Data transform get before set succeeded (it shouldn't have)\n"); - HDfree(ptrgetTest); + free(ptrgetTest); ptrgetTest = NULL; TESTING("H5Pset_data_transform (set with NULL transform)"); @@ -974,7 +974,7 @@ test_set(void) error: if (ptrgetTest) - HDfree(ptrgetTest); + free(ptrgetTest); H5E_BEGIN_TRY { H5Pclose(dxpl_id); diff --git a/test/dtypes.c b/test/dtypes.c index bd55491..6650c8c 100644 --- a/test/dtypes.c +++ b/test/dtypes.c @@ -70,8 +70,8 @@ FAIL_STACK_ERROR; \ if ((NMEMBS) != H5I_nmembers(H5I_DATATYPE)) { \ H5_FAILED(); \ - HDprintf(" #dtype ids expected: %lld; found: %lld\n", (long long)(NMEMBS), \ - (long long)H5I_nmembers(H5I_DATATYPE)); \ + printf(" #dtype ids expected: %lld; found: %lld\n", (long long)(NMEMBS), \ + (long long)H5I_nmembers(H5I_DATATYPE)); \ goto error; \ } \ } while (0) @@ -777,11 +777,11 @@ test_compound_2(void) FAIL_STACK_ERROR; /* Sizes should be the same, but be careful just in case */ - if (NULL == (buf = (unsigned char *)HDmalloc(nelmts * MAX(sizeof(struct st), sizeof(struct dt))))) + if (NULL == (buf = (unsigned char *)malloc(nelmts * MAX(sizeof(struct st), sizeof(struct dt))))) goto error; - if (NULL == (bkg = (unsigned char *)HDmalloc(nelmts * sizeof(struct dt)))) + if (NULL == (bkg = (unsigned char *)malloc(nelmts * sizeof(struct dt)))) goto error; - if (NULL == (orig = (unsigned char *)HDmalloc(nelmts * sizeof(struct st)))) + if (NULL == (orig = (unsigned char *)malloc(nelmts * sizeof(struct st)))) goto error; for (i = 0; i < (int)nelmts; i++) { s_ptr = ((struct st *)((void *)orig)) + i; @@ -794,7 +794,7 @@ test_compound_2(void) s_ptr->d = i * 8 + 6; s_ptr->e = i * 8 + 7; } - HDmemcpy(buf, orig, nelmts * sizeof(struct st)); + memcpy(buf, orig, nelmts * sizeof(struct st)); /* Build hdf5 datatypes */ array_dt = H5Tarray_create2(H5T_NATIVE_INT, 1, &four); @@ -829,19 +829,19 @@ test_compound_2(void) s_ptr->c[1] != d_ptr->c[1] || s_ptr->c[2] != d_ptr->c[2] || s_ptr->c[3] != d_ptr->c[3] || s_ptr->d != d_ptr->d || s_ptr->e != d_ptr->e) { H5_FAILED(); - HDprintf(" i=%d\n", i); - HDprintf(" src={a=%d, b=%d, c=[%d,%d,%d,%d], d=%d, e=%d\n", s_ptr->a, s_ptr->b, s_ptr->c[0], - s_ptr->c[1], s_ptr->c[2], s_ptr->c[3], s_ptr->d, s_ptr->e); - HDprintf(" dst={a=%d, b=%d, c=[%d,%d,%d,%d], d=%d, e=%d\n", d_ptr->a, d_ptr->b, d_ptr->c[0], - d_ptr->c[1], d_ptr->c[2], d_ptr->c[3], d_ptr->d, d_ptr->e); + printf(" i=%d\n", i); + printf(" src={a=%d, b=%d, c=[%d,%d,%d,%d], d=%d, e=%d\n", s_ptr->a, s_ptr->b, s_ptr->c[0], + s_ptr->c[1], s_ptr->c[2], s_ptr->c[3], s_ptr->d, s_ptr->e); + printf(" dst={a=%d, b=%d, c=[%d,%d,%d,%d], d=%d, e=%d\n", d_ptr->a, d_ptr->b, d_ptr->c[0], + d_ptr->c[1], d_ptr->c[2], d_ptr->c[3], d_ptr->d, d_ptr->e); goto error; } } /* Release resources */ - HDfree(buf); - HDfree(bkg); - HDfree(orig); + free(buf); + free(bkg); + free(orig); CHECK_NMEMBS(nmembs, st, dt); PASSED(); @@ -854,9 +854,9 @@ test_compound_2(void) return 0; error: - HDfree(buf); - HDfree(bkg); - HDfree(orig); + free(buf); + free(bkg); + free(orig); /* Restore the default error handler (set in h5_reset()) */ h5_restore_err(); @@ -904,11 +904,11 @@ test_compound_3(void) FAIL_STACK_ERROR; /* Initialize */ - if (NULL == (buf = (unsigned char *)HDmalloc(nelmts * MAX(sizeof(struct st), sizeof(struct dt))))) + if (NULL == (buf = (unsigned char *)malloc(nelmts * MAX(sizeof(struct st), sizeof(struct dt))))) goto error; - if (NULL == (bkg = (unsigned char *)HDmalloc(nelmts * sizeof(struct dt)))) + if (NULL == (bkg = (unsigned char *)malloc(nelmts * sizeof(struct dt)))) goto error; - if (NULL == (orig = (unsigned char *)HDmalloc(nelmts * sizeof(struct st)))) + if (NULL == (orig = (unsigned char *)malloc(nelmts * sizeof(struct st)))) goto error; for (i = 0; i < (int)nelmts; i++) { s_ptr = ((struct st *)((void *)orig)) + i; @@ -921,7 +921,7 @@ test_compound_3(void) s_ptr->d = i * 8 + 6; s_ptr->e = i * 8 + 7; } - HDmemcpy(buf, orig, nelmts * sizeof(struct st)); + memcpy(buf, orig, nelmts * sizeof(struct st)); /* Build hdf5 datatypes */ array_dt = H5Tarray_create2(H5T_NATIVE_INT, 1, &four); @@ -953,19 +953,19 @@ test_compound_3(void) if (s_ptr->a != d_ptr->a || s_ptr->c[0] != d_ptr->c[0] || s_ptr->c[1] != d_ptr->c[1] || s_ptr->c[2] != d_ptr->c[2] || s_ptr->c[3] != d_ptr->c[3] || s_ptr->e != d_ptr->e) { H5_FAILED(); - HDprintf(" i=%d\n", i); - HDprintf(" src={a=%d, b=%d, c=[%d,%d,%d,%d], d=%d, e=%d\n", s_ptr->a, s_ptr->b, s_ptr->c[0], - s_ptr->c[1], s_ptr->c[2], s_ptr->c[3], s_ptr->d, s_ptr->e); - HDprintf(" dst={a=%d, c=[%d,%d,%d,%d], e=%d\n", d_ptr->a, d_ptr->c[0], d_ptr->c[1], - d_ptr->c[2], d_ptr->c[3], d_ptr->e); + printf(" i=%d\n", i); + printf(" src={a=%d, b=%d, c=[%d,%d,%d,%d], d=%d, e=%d\n", s_ptr->a, s_ptr->b, s_ptr->c[0], + s_ptr->c[1], s_ptr->c[2], s_ptr->c[3], s_ptr->d, s_ptr->e); + printf(" dst={a=%d, c=[%d,%d,%d,%d], e=%d\n", d_ptr->a, d_ptr->c[0], d_ptr->c[1], d_ptr->c[2], + d_ptr->c[3], d_ptr->e); goto error; } } /* Release resources */ - HDfree(buf); - HDfree(bkg); - HDfree(orig); + free(buf); + free(bkg); + free(orig); CHECK_NMEMBS(nmembs, st, dt); PASSED(); @@ -977,9 +977,9 @@ test_compound_3(void) return 0; error: - HDfree(buf); - HDfree(bkg); - HDfree(orig); + free(buf); + free(bkg); + free(orig); /* Restore the default error handler (set in h5_reset()) */ h5_restore_err(); @@ -1031,11 +1031,11 @@ test_compound_4(void) FAIL_STACK_ERROR; /* Sizes should be the same, but be careful just in case */ - if (NULL == (buf = (unsigned char *)HDmalloc(nelmts * MAX(sizeof(struct st), sizeof(struct dt))))) + if (NULL == (buf = (unsigned char *)malloc(nelmts * MAX(sizeof(struct st), sizeof(struct dt))))) goto error; - if (NULL == (bkg = (unsigned char *)HDmalloc(nelmts * sizeof(struct dt)))) + if (NULL == (bkg = (unsigned char *)malloc(nelmts * sizeof(struct dt)))) goto error; - if (NULL == (orig = (unsigned char *)HDmalloc(nelmts * sizeof(struct st)))) + if (NULL == (orig = (unsigned char *)malloc(nelmts * sizeof(struct st)))) goto error; for (i = 0; i < (int)nelmts; i++) { s_ptr = ((struct st *)((void *)orig)) + i; @@ -1048,7 +1048,7 @@ test_compound_4(void) s_ptr->d = (i * 8 + 6) & 0x7fff; s_ptr->e = i * 8 + 7; } - HDmemcpy(buf, orig, nelmts * sizeof(struct st)); + memcpy(buf, orig, nelmts * sizeof(struct st)); /* Build hdf5 datatypes */ array_dt = H5Tarray_create2(H5T_NATIVE_INT, 1, &four); @@ -1083,19 +1083,19 @@ test_compound_4(void) s_ptr->c[1] != d_ptr->c[1] || s_ptr->c[2] != d_ptr->c[2] || s_ptr->c[3] != d_ptr->c[3] || s_ptr->d != d_ptr->d || s_ptr->e != d_ptr->e) { H5_FAILED(); - HDprintf(" i=%d\n", i); - HDprintf(" src={a=%d, b=%d, c=[%d,%d,%d,%d], d=%d, e=%d\n", s_ptr->a, s_ptr->b, s_ptr->c[0], - s_ptr->c[1], s_ptr->c[2], s_ptr->c[3], s_ptr->d, s_ptr->e); - HDprintf(" dst={a=%d, b=%d, c=[%d,%d,%d,%d], d=%d, e=%d\n", d_ptr->a, d_ptr->b, d_ptr->c[0], - d_ptr->c[1], d_ptr->c[2], d_ptr->c[3], d_ptr->d, d_ptr->e); + printf(" i=%d\n", i); + printf(" src={a=%d, b=%d, c=[%d,%d,%d,%d], d=%d, e=%d\n", s_ptr->a, s_ptr->b, s_ptr->c[0], + s_ptr->c[1], s_ptr->c[2], s_ptr->c[3], s_ptr->d, s_ptr->e); + printf(" dst={a=%d, b=%d, c=[%d,%d,%d,%d], d=%d, e=%d\n", d_ptr->a, d_ptr->b, d_ptr->c[0], + d_ptr->c[1], d_ptr->c[2], d_ptr->c[3], d_ptr->d, d_ptr->e); goto error; } } /* Release resources */ - HDfree(buf); - HDfree(bkg); - HDfree(orig); + free(buf); + free(bkg); + free(orig); CHECK_NMEMBS(nmembs, st, dt); PASSED(); @@ -1107,9 +1107,9 @@ test_compound_4(void) return 0; error: - HDfree(buf); - HDfree(bkg); - HDfree(orig); + free(buf); + free(bkg); + free(orig); /* Restore the default error handler (set in h5_reset()) */ h5_restore_err(); @@ -1155,15 +1155,15 @@ test_compound_5(void) src_type_t src[2] = {{"one", 102, {104, 105, 106, 107}}, {"two", 202, {204, 205, 206, 207}}}; dst_type_t *dst; - void *buf = HDcalloc((size_t)2, sizeof(dst_type_t)); - void *bkg = HDcalloc((size_t)2, sizeof(dst_type_t)); + void *buf = calloc((size_t)2, sizeof(dst_type_t)); + void *bkg = calloc((size_t)2, sizeof(dst_type_t)); int retval = 1; TESTING("optimized struct converter"); if (!buf || !bkg) { - HDfree(buf); - HDfree(bkg); + free(buf); + free(bkg); return 1; } @@ -1192,7 +1192,7 @@ test_compound_5(void) H5Tinsert(dst_type, "coll_ids", HOFFSET(dst_type_t, coll_ids), int_array); /* Convert data */ - HDmemcpy(buf, src, sizeof(src)); + memcpy(buf, src, sizeof(src)); H5Tconvert(src_type, dst_type, (size_t)2, buf, bkg, H5P_DEFAULT); dst = (dst_type_t *)buf; @@ -1204,7 +1204,7 @@ test_compound_5(void) H5Tclose(int_array); /* Check results */ - if (HDmemcmp(src[1].name, dst[1].name, sizeof(src[1].name)) != 0 || src[1].tdim != dst[1].tdim || + if (memcmp(src[1].name, dst[1].name, sizeof(src[1].name)) != 0 || src[1].tdim != dst[1].tdim || src[1].coll_ids[0] != dst[1].coll_ids[0] || src[1].coll_ids[1] != dst[1].coll_ids[1] || src[1].coll_ids[2] != dst[1].coll_ids[2] || src[1].coll_ids[3] != dst[1].coll_ids[3]) { H5_FAILED(); @@ -1215,8 +1215,8 @@ test_compound_5(void) } /* Free memory buffers */ - HDfree(buf); - HDfree(bkg); + free(buf); + free(bkg); return retval; } @@ -1259,18 +1259,18 @@ test_compound_6(void) FAIL_STACK_ERROR; /* Sizes should be the same, but be careful just in case */ - if (NULL == (buf = (unsigned char *)HDmalloc(nelmts * MAX(sizeof(struct st), sizeof(struct dt))))) + if (NULL == (buf = (unsigned char *)malloc(nelmts * MAX(sizeof(struct st), sizeof(struct dt))))) goto error; - if (NULL == (bkg = (unsigned char *)HDmalloc(nelmts * sizeof(struct dt)))) + if (NULL == (bkg = (unsigned char *)malloc(nelmts * sizeof(struct dt)))) goto error; - if (NULL == (orig = (unsigned char *)HDmalloc(nelmts * sizeof(struct st)))) + if (NULL == (orig = (unsigned char *)malloc(nelmts * sizeof(struct st)))) goto error; for (i = 0; i < (int)nelmts; i++) { s_ptr = ((struct st *)((void *)orig)) + i; s_ptr->b = (int16_t)((i * 8 + 1) & 0x7fff); s_ptr->d = (int16_t)((i * 8 + 6) & 0x7fff); } - HDmemcpy(buf, orig, nelmts * sizeof(struct st)); + memcpy(buf, orig, nelmts * sizeof(struct st)); /* Build hdf5 datatypes */ if ((st = H5Tcreate(H5T_COMPOUND, sizeof(struct st))) < 0 || @@ -1299,17 +1299,17 @@ test_compound_6(void) d_ptr = ((struct dt *)((void *)buf)) + i; if (s_ptr->b != d_ptr->b || s_ptr->d != d_ptr->d) { H5_FAILED(); - HDprintf(" i=%d\n", i); - HDprintf(" src={b=%d, d=%d\n", (int)s_ptr->b, (int)s_ptr->d); - HDprintf(" dst={b=%ld, d=%ld\n", d_ptr->b, d_ptr->d); + printf(" i=%d\n", i); + printf(" src={b=%d, d=%d\n", (int)s_ptr->b, (int)s_ptr->d); + printf(" dst={b=%ld, d=%ld\n", d_ptr->b, d_ptr->d); goto error; } } /* Release resources */ - HDfree(buf); - HDfree(bkg); - HDfree(orig); + free(buf); + free(bkg); + free(orig); CHECK_NMEMBS(nmembs, st, dt); PASSED(); @@ -1367,43 +1367,43 @@ test_compound_7(void) if ((tid1 = H5Tcreate(H5T_COMPOUND, sizeof(struct s1))) < 0) { H5_FAILED(); - HDprintf("Can't create datatype!\n"); + printf("Can't create datatype!\n"); goto error; } /* end if */ if (H5Tinsert(tid1, "a", HOFFSET(struct s1, a), H5T_NATIVE_INT) < 0) { H5_FAILED(); - HDprintf("Can't insert field 'a'\n"); + printf("Can't insert field 'a'\n"); goto error; } /* end if */ if (H5Tinsert(tid1, "b", HOFFSET(struct s1, b), H5T_NATIVE_FLOAT) < 0) { H5_FAILED(); - HDprintf("Can't insert field 'b'\n"); + printf("Can't insert field 'b'\n"); goto error; } /* end if */ if (H5Tinsert(tid1, "c", HOFFSET(struct s1, c), H5T_NATIVE_LONG) < 0) { H5_FAILED(); - HDprintf("Can't insert field 'c'\n"); + printf("Can't insert field 'c'\n"); goto error; } /* end if */ if (H5Tget_size(tid1) != sizeof(struct s1)) { H5_FAILED(); - HDprintf("Incorrect size for struct 1\n"); + printf("Incorrect size for struct 1\n"); goto error; } /* end if */ if ((tid2 = H5Tcopy(tid1)) < 0) { H5_FAILED(); - HDprintf("Can't copy datatype\n"); + printf("Can't copy datatype\n"); goto error; } /* end if */ if (H5Tget_size(tid2) == sizeof(struct s2)) { H5_FAILED(); - HDprintf("Incorrect size for struct 2\n"); + printf("Incorrect size for struct 2\n"); goto error; } /* end if */ @@ -1415,7 +1415,7 @@ test_compound_7(void) H5E_END_TRY; if (ret >= 0) { H5_FAILED(); - HDprintf("Inserted field 'd'?\n"); + printf("Inserted field 'd'?\n"); goto error; } /* end if */ @@ -1427,33 +1427,33 @@ test_compound_7(void) H5E_END_TRY; if (ret >= 0) { H5_FAILED(); - HDprintf("Shrunk compound type?\n"); + printf("Shrunk compound type?\n"); goto error; } /* end if */ /* Increase compound type size and try inserting field again */ if (H5Tset_size(tid2, sizeof(struct s2)) < 0) { H5_FAILED(); - HDprintf("Can't increase size for compound type\n"); + printf("Can't increase size for compound type\n"); goto error; } /* end if */ if (H5Tinsert(tid2, "d", HOFFSET(struct s2, d), H5T_NATIVE_DOUBLE) < 0) { H5_FAILED(); - HDprintf("Can't expand compound datatype\n"); + printf("Can't expand compound datatype\n"); goto error; } /* end if */ if (H5Tget_size(tid2) != sizeof(struct s2)) { H5_FAILED(); - HDprintf("Incorrect size for struct 2\n"); + printf("Incorrect size for struct 2\n"); goto error; } /* end if */ /* Release resources */ if (H5Tclose(tid1) < 0 || H5Tclose(tid2) < 0) { H5_FAILED(); - HDprintf("Can't close datatypes\n"); + printf("Can't close datatypes\n"); goto error; } /* end if */ @@ -1514,21 +1514,21 @@ test_compound_8(void) if ((tid1 = H5Tcreate(H5T_COMPOUND, sizeof(struct s1))) < 0) { H5_FAILED(); AT(); - HDprintf("Can't create datatype!\n"); + printf("Can't create datatype!\n"); goto error; } /* end if */ if (H5Tinsert(tid1, "a", HOFFSET(struct s1, a), H5T_NATIVE_CHAR) < 0) { H5_FAILED(); AT(); - HDprintf("Can't insert field 'a'\n"); + printf("Can't insert field 'a'\n"); goto error; } /* end if */ if (H5Tinsert(tid1, "b", HOFFSET(struct s1, b), H5T_NATIVE_INT) < 0) { H5_FAILED(); AT(); - HDprintf("Can't insert field 'b'\n"); + printf("Can't insert field 'b'\n"); goto error; } /* end if */ @@ -1536,7 +1536,7 @@ test_compound_8(void) if ((tid1_copy = H5Tcopy(tid1)) < 0) { H5_FAILED(); AT(); - HDprintf("Can't copy type #1\n"); + printf("Can't copy type #1\n"); goto error; } /* end if */ @@ -1544,14 +1544,14 @@ test_compound_8(void) if (H5Tpack(tid1) < 0) { H5_FAILED(); AT(); - HDprintf("Can't pack the compound datatype\n"); + printf("Can't pack the compound datatype\n"); goto error; } /* end if */ if (H5Tlock(tid1) < 0) { H5_FAILED(); AT(); - HDprintf("Can't lock the compound datatype\n"); + printf("Can't lock the compound datatype\n"); goto error; } /* end if */ @@ -1559,7 +1559,7 @@ test_compound_8(void) if (H5Tpack(tid1) < 0) { H5_FAILED(); AT(); - HDprintf("Can't pack the compound datatype for second time\n"); + printf("Can't pack the compound datatype for second time\n"); goto error; } /* end if */ @@ -1567,14 +1567,14 @@ test_compound_8(void) if ((tsize = H5Tget_size(tid1)) == 0) { H5_FAILED(); AT(); - HDprintf("Can't get size of the compound datatype\n"); + printf("Can't get size of the compound datatype\n"); goto error; } /* end if */ if (tsize != (sizeof(char) + sizeof(int))) { H5_FAILED(); AT(); - HDprintf("The size of the packed compound datatype is incorrect\n"); + printf("The size of the packed compound datatype is incorrect\n"); goto error; } /* end if */ @@ -1585,14 +1585,14 @@ test_compound_8(void) if ((tid2 = H5Tcreate(H5T_COMPOUND, sizeof(struct s2))) < 0) { H5_FAILED(); AT(); - HDprintf("Can't create datatype!\n"); + printf("Can't create datatype!\n"); goto error; } /* end if */ if (H5Tinsert(tid2, "c", HOFFSET(struct s2, c), H5T_NATIVE_CHAR) < 0) { H5_FAILED(); AT(); - HDprintf("Can't insert field 'c'\n"); + printf("Can't insert field 'c'\n"); goto error; } /* end if */ @@ -1600,7 +1600,7 @@ test_compound_8(void) if (H5Tinsert(tid2, "d", HOFFSET(struct s2, d), tid1_copy) < 0) { H5_FAILED(); AT(); - HDprintf("Can't insert field 'd'\n"); + printf("Can't insert field 'd'\n"); goto error; } /* end if */ @@ -1608,7 +1608,7 @@ test_compound_8(void) if ((tid3 = H5Tcopy(tid2)) < 0) { H5_FAILED(); AT(); - HDprintf("Can't copy type #2\n"); + printf("Can't copy type #2\n"); goto error; } /* end if */ @@ -1616,7 +1616,7 @@ test_compound_8(void) if ((tid2_copy = H5Tcopy(tid2)) < 0) { H5_FAILED(); AT(); - HDprintf("Can't copy type #2\n"); + printf("Can't copy type #2\n"); goto error; } /* end if */ @@ -1624,14 +1624,14 @@ test_compound_8(void) if (H5Tpack(tid2) < 0) { H5_FAILED(); AT(); - HDprintf("Can't pack the compound datatype\n"); + printf("Can't pack the compound datatype\n"); goto error; } /* end if */ if (H5Tlock(tid2) < 0) { H5_FAILED(); AT(); - HDprintf("Can't lock the compound datatype\n"); + printf("Can't lock the compound datatype\n"); goto error; } /* end if */ @@ -1639,7 +1639,7 @@ test_compound_8(void) if (H5Tpack(tid2) < 0) { H5_FAILED(); AT(); - HDprintf("Can't pack the compound datatype for second time\n"); + printf("Can't pack the compound datatype for second time\n"); goto error; } /* end if */ @@ -1647,7 +1647,7 @@ test_compound_8(void) if (H5Tlock(tid3) < 0) { H5_FAILED(); AT(); - HDprintf("Can't lock the compound datatype\n"); + printf("Can't lock the compound datatype\n"); goto error; } /* end if */ @@ -1660,7 +1660,7 @@ test_compound_8(void) if (ret >= 0) { H5_FAILED(); AT(); - HDprintf("Packing locked datatype worked?\n"); + printf("Packing locked datatype worked?\n"); goto error; } /* end if */ @@ -1668,14 +1668,14 @@ test_compound_8(void) if ((tsize = H5Tget_size(tid2)) == 0) { H5_FAILED(); AT(); - HDprintf("Can't get size of the compound datatype\n"); + printf("Can't get size of the compound datatype\n"); goto error; } /* end if */ if (tsize != (sizeof(char) + sizeof(char) + sizeof(int))) { H5_FAILED(); AT(); - HDprintf("The size of the packed compound datatype is incorrect: tsize = %zu\n", tsize); + printf("The size of the packed compound datatype is incorrect: tsize = %zu\n", tsize); goto error; } /* end if */ @@ -1686,7 +1686,7 @@ test_compound_8(void) if ((arr_tid = H5Tarray_create2(tid2_copy, 1, dims)) < 0) { H5_FAILED(); AT(); - HDprintf("Can't create an array datatype\n"); + printf("Can't create an array datatype\n"); goto error; } /* end if */ @@ -1694,7 +1694,7 @@ test_compound_8(void) if (H5Tpack(arr_tid) < 0) { H5_FAILED(); AT(); - HDprintf("Can't pack the array datatype\n"); + printf("Can't pack the array datatype\n"); goto error; } /* end if */ @@ -1702,35 +1702,35 @@ test_compound_8(void) if ((tsize = H5Tget_size(arr_tid)) == 0) { H5_FAILED(); AT(); - HDprintf("Can't get size of the array datatype\n"); + printf("Can't get size of the array datatype\n"); goto error; } /* end if */ if (tsize != ARRAY_DIM * (sizeof(char) + sizeof(char) + sizeof(int))) { H5_FAILED(); AT(); - HDprintf("The size of the packed array datatype is incorrect\n"); + printf("The size of the packed array datatype is incorrect\n"); goto error; } /* end if */ if (H5Tclose(tid1_copy) < 0) { H5_FAILED(); AT(); - HDprintf("Can't close the compound datatype\n"); + printf("Can't close the compound datatype\n"); goto error; } /* end if */ if (H5Tclose(tid2_copy) < 0) { H5_FAILED(); AT(); - HDprintf("Can't close the compound datatype\n"); + printf("Can't close the compound datatype\n"); goto error; } /* end if */ if (H5Tclose(arr_tid) < 0) { H5_FAILED(); AT(); - HDprintf("Can't close the array datatype\n"); + printf("Can't close the array datatype\n"); goto error; } /* end if */ @@ -1787,7 +1787,7 @@ test_compound_9(void) if ((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); AT(); - HDprintf("Can't create file!\n"); + printf("Can't create file!\n"); goto error; } /* end if */ @@ -1795,14 +1795,14 @@ test_compound_9(void) if ((cmpd_tid = H5Tcreate(H5T_COMPOUND, sizeof(struct cmpd_struct_w))) < 0) { H5_FAILED(); AT(); - HDprintf("Can't create datatype!\n"); + printf("Can't create datatype!\n"); goto error; } /* end if */ if (H5Tinsert(cmpd_tid, "i1", HOFFSET(struct cmpd_struct_w, i1), H5T_NATIVE_INT) < 0) { H5_FAILED(); AT(); - HDprintf("Can't insert field 'i1'\n"); + printf("Can't insert field 'i1'\n"); goto error; } /* end if */ @@ -1810,35 +1810,35 @@ test_compound_9(void) if (H5Tset_size(str_id, H5T_VARIABLE) < 0) { H5_FAILED(); AT(); - HDprintf("Can't set size for VL string\n"); + printf("Can't set size for VL string\n"); goto error; } /* end if */ if (H5Tinsert(cmpd_tid, "vl_string", HOFFSET(cmpd_struct_w, str), str_id) < 0) { H5_FAILED(); AT(); - HDprintf("Can't insert field 'i1'\n"); + printf("Can't insert field 'i1'\n"); goto error; } /* end if */ if (H5Tinsert(cmpd_tid, "i2", HOFFSET(struct cmpd_struct_w, i2), H5T_NATIVE_INT) < 0) { H5_FAILED(); AT(); - HDprintf("Can't insert field 'i2'\n"); + printf("Can't insert field 'i2'\n"); goto error; } /* end if */ if (H5Tcommit2(file, "compound", cmpd_tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); AT(); - HDprintf("Can't commit datatype\n"); + printf("Can't commit datatype\n"); goto error; } /* end if */ if (H5Tclose(cmpd_tid) < 0) { H5_FAILED(); AT(); - HDprintf("Can't close datatype\n"); + printf("Can't close datatype\n"); goto error; } /* end if */ @@ -1848,7 +1848,7 @@ test_compound_9(void) if ((dup_tid = H5Tcopy(cmpd_tid)) < 0) { H5_FAILED(); AT(); - HDprintf("Can't copy datatype\n"); + printf("Can't copy datatype\n"); goto error; } /* end if */ @@ -1856,7 +1856,7 @@ test_compound_9(void) if ((space_id = H5Screate_simple(1, dim1, NULL)) < 0) { H5_FAILED(); AT(); - HDprintf("Can't create space\n"); + printf("Can't create space\n"); goto error; } /* end if */ @@ -1864,35 +1864,35 @@ test_compound_9(void) 0) { H5_FAILED(); AT(); - HDprintf("Can't create dataset\n"); + printf("Can't create dataset\n"); goto error; } /* end if */ if (H5Dwrite(dset_id, dup_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &wdata) < 0) { H5_FAILED(); AT(); - HDprintf("Can't write data\n"); + printf("Can't write data\n"); goto error; } /* end if */ if (H5Dread(dset_id, dup_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &rdata) < 0) { H5_FAILED(); AT(); - HDprintf("Can't read data\n"); + printf("Can't read data\n"); goto error; } /* end if */ if (rdata.i1 != wdata.i1 || rdata.i2 != wdata.i2 || HDstrcmp(rdata.str, wdata.str) != 0) { H5_FAILED(); AT(); - HDprintf("incorrect read data\n"); + printf("incorrect read data\n"); goto error; } /* end if */ if (H5Treclaim(dup_tid, space_id, H5P_DEFAULT, &rdata) < 0) { H5_FAILED(); AT(); - HDprintf("Can't reclaim read data\n"); + printf("Can't reclaim read data\n"); goto error; } /* end if */ rdata.str = NULL; @@ -1913,66 +1913,66 @@ test_compound_9(void) if ((file = H5Fopen(filename, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0) { H5_FAILED(); AT(); - HDprintf("cannot open file\n"); + printf("cannot open file\n"); goto error; } /* end if */ if ((dset_id = H5Dopen2(file, "Dataset", H5P_DEFAULT)) < 0) { H5_FAILED(); AT(); - HDprintf("cannot open dataset\n"); + printf("cannot open dataset\n"); goto error; } /* end if */ if ((space_id = H5Dget_space(dset_id)) < 0) { H5_FAILED(); AT(); - HDprintf("Can't get space\n"); + printf("Can't get space\n"); goto error; } /* end if */ if ((cmpd_tid = H5Dget_type(dset_id)) < 0) { H5_FAILED(); AT(); - HDprintf("cannot open dataset\n"); + printf("cannot open dataset\n"); goto error; } /* end if */ if ((dup_tid = H5Tcopy(cmpd_tid)) < 0) { H5_FAILED(); AT(); - HDprintf("Can't copy datatype\n"); + printf("Can't copy datatype\n"); goto error; } /* end if */ rdata.i1 = rdata.i2 = 0; if (rdata.str) - HDfree(rdata.str); + free(rdata.str); if (H5Dread(dset_id, dup_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &rdata) < 0) { H5_FAILED(); AT(); - HDprintf("Can't read data\n"); + printf("Can't read data\n"); goto error; } /* end if */ if (rdata.i1 != wdata.i1 || rdata.i2 != wdata.i2 || HDstrcmp(rdata.str, wdata.str) != 0) { H5_FAILED(); AT(); - HDprintf("incorrect read data\n"); + printf("incorrect read data\n"); goto error; } /* end if */ if (H5Treclaim(dup_tid, space_id, H5P_DEFAULT, &rdata) < 0) { H5_FAILED(); AT(); - HDprintf("Can't read data\n"); + printf("Can't read data\n"); goto error; } /* end if */ rdata.str = NULL; if (rdata.str) - HDfree(rdata.str); + free(rdata.str); if (H5Dclose(dset_id) < 0) goto error; @@ -2048,7 +2048,7 @@ test_compound_10(void) if ((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); AT(); - HDprintf("Can't create file!\n"); + printf("Can't create file!\n"); goto error; } /* end if */ @@ -2056,14 +2056,14 @@ test_compound_10(void) if ((cmpd_tid = H5Tcreate(H5T_COMPOUND, sizeof(struct cmpd_struct))) < 0) { H5_FAILED(); AT(); - HDprintf("Can't create datatype!\n"); + printf("Can't create datatype!\n"); goto error; } /* end if */ if (H5Tinsert(cmpd_tid, "i1", HOFFSET(struct cmpd_struct, i1), H5T_NATIVE_INT) < 0) { H5_FAILED(); AT(); - HDprintf("Can't insert field 'i1'\n"); + printf("Can't insert field 'i1'\n"); goto error; } /* end if */ @@ -2071,14 +2071,14 @@ test_compound_10(void) if (H5Tset_size(cstr_id, H5T_VARIABLE) < 0) { H5_FAILED(); AT(); - HDprintf("Can't set size for C string\n"); + printf("Can't set size for C string\n"); goto error; } /* end if */ if (H5Tinsert(cmpd_tid, "c_string", HOFFSET(cmpd_struct, str), cstr_id) < 0) { H5_FAILED(); AT(); - HDprintf("Can't insert field 'str'\n"); + printf("Can't insert field 'str'\n"); goto error; } /* end if */ @@ -2086,21 +2086,21 @@ test_compound_10(void) if ((vlstr_id = H5Tvlen_create(H5T_NATIVE_CHAR)) < 0) { H5_FAILED(); AT(); - HDprintf("Can't create VL string\n"); + printf("Can't create VL string\n"); goto error; } /* end if */ if (H5Tinsert(cmpd_tid, "vl_string", HOFFSET(cmpd_struct, text), vlstr_id) < 0) { H5_FAILED(); AT(); - HDprintf("Can't insert field 'text'\n"); + printf("Can't insert field 'text'\n"); goto error; } /* end if */ if (H5Tinsert(cmpd_tid, "i2", HOFFSET(struct cmpd_struct, i2), H5T_NATIVE_INT) < 0) { H5_FAILED(); AT(); - HDprintf("Can't insert field 'i2'\n"); + printf("Can't insert field 'i2'\n"); goto error; } /* end if */ @@ -2108,7 +2108,7 @@ test_compound_10(void) if ((arr_tid = H5Tarray_create2(cmpd_tid, 1, arr_dim)) < 0) { H5_FAILED(); AT(); - HDprintf("Can't create array type\n"); + printf("Can't create array type\n"); goto error; } /* end if */ @@ -2116,7 +2116,7 @@ test_compound_10(void) if ((space_id = H5Screate_simple(1, dim1, NULL)) < 0) { H5_FAILED(); AT(); - HDprintf("Can't create space\n"); + printf("Can't create space\n"); goto error; } /* end if */ @@ -2124,21 +2124,21 @@ test_compound_10(void) 0) { H5_FAILED(); AT(); - HDprintf("Can't create dataset\n"); + printf("Can't create dataset\n"); goto error; } /* end if */ if (H5Dwrite(dset_id, arr_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &wdata) < 0) { H5_FAILED(); AT(); - HDprintf("Can't write data\n"); + printf("Can't write data\n"); goto error; } /* end if */ if (H5Dread(dset_id, arr_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &rdata) < 0) { H5_FAILED(); AT(); - HDprintf("Can't read data\n"); + printf("Can't read data\n"); goto error; } /* end if */ @@ -2147,14 +2147,14 @@ test_compound_10(void) HDstrcmp(rdata[i].str, wdata[i].str) != 0) { H5_FAILED(); AT(); - HDprintf("incorrect read data\n"); + printf("incorrect read data\n"); goto error; } /* end if */ if (rdata[i].text.len != wdata[i].text.len) { H5_FAILED(); AT(); - HDprintf("incorrect VL length\n"); + printf("incorrect VL length\n"); goto error; } /* end if */ @@ -2163,20 +2163,20 @@ test_compound_10(void) if (HDstrcmp((char *)t1, (char *)t2) != 0) { H5_FAILED(); AT(); - HDprintf("incorrect VL read data\n"); + printf("incorrect VL read data\n"); goto error; } } /* end for */ if (H5Treclaim(arr_tid, space_id, H5P_DEFAULT, &rdata) < 0) { H5_FAILED(); AT(); - HDprintf("Can't reclaim read data\n"); + printf("Can't reclaim read data\n"); goto error; } /* end if */ if (H5Treclaim(arr_tid, space_id, H5P_DEFAULT, &wdata) < 0) { H5_FAILED(); AT(); - HDprintf("Can't reclaim read data\n"); + printf("Can't reclaim read data\n"); goto error; } /* end if */ @@ -2285,11 +2285,11 @@ test_compound_11(void) TEST_ERROR; /* Allocate buffers */ - if ((buf = HDmalloc(sizeof(big_t) * NTESTELEM)) == NULL) + if ((buf = malloc(sizeof(big_t) * NTESTELEM)) == NULL) TEST_ERROR; - if ((buf_orig = HDmalloc(sizeof(big_t) * NTESTELEM)) == NULL) + if ((buf_orig = malloc(sizeof(big_t) * NTESTELEM)) == NULL) TEST_ERROR; - if ((bkg = HDmalloc(sizeof(big_t) * NTESTELEM)) == NULL) + if ((bkg = malloc(sizeof(big_t) * NTESTELEM)) == NULL) TEST_ERROR; /* Initialize buffer */ @@ -2299,20 +2299,20 @@ test_compound_11(void) ((big_t *)buf)[u].d3 = (double)u * 3.5; ((big_t *)buf)[u].i1 = (int)(u * 3); ((big_t *)buf)[u].i2 = (int)(u * 5); - ((big_t *)buf)[u].s1 = (char *)HDmalloc((size_t)32); + ((big_t *)buf)[u].s1 = (char *)malloc((size_t)32); if (!((big_t *)buf)[u].s1) TEST_ERROR; HDsnprintf(((big_t *)buf)[u].s1, 32, "%u", (unsigned)u); } /* end for */ /* Make copy of buffer before conversion */ - HDmemcpy(buf_orig, buf, sizeof(big_t) * NTESTELEM); + memcpy(buf_orig, buf, sizeof(big_t) * NTESTELEM); dim[0] = NTESTELEM; if ((space_id = H5Screate_simple(1, dim, NULL)) < 0) { H5_FAILED(); AT(); - HDprintf("Can't create space\n"); + printf("Can't create space\n"); goto error; } /* end if */ @@ -2331,30 +2331,30 @@ test_compound_11(void) /* Verify converted buffer is correct */ for (u = 0; u < NTESTELEM; u++) { if (!H5_DBL_ABS_EQUAL(((big_t *)buf_orig)[u].d1, ((little_t *)buf)[u].d1)) { - HDprintf("Error, line #%d: buf_orig[%u].d1=%f, buf[%u].d1=%f\n", __LINE__, (unsigned)u, - ((big_t *)buf_orig)[u].d1, (unsigned)u, ((little_t *)buf)[u].d1); + printf("Error, line #%d: buf_orig[%u].d1=%f, buf[%u].d1=%f\n", __LINE__, (unsigned)u, + ((big_t *)buf_orig)[u].d1, (unsigned)u, ((little_t *)buf)[u].d1); TEST_ERROR; } /* end if */ if (((big_t *)buf_orig)[u].i1 != ((little_t *)buf)[u].i1) { - HDprintf("Error, line #%d: buf_orig[%u].i1=%d, buf[%u].i1=%d\n", __LINE__, (unsigned)u, - ((big_t *)buf_orig)[u].i1, (unsigned)u, ((little_t *)buf)[u].i1); + printf("Error, line #%d: buf_orig[%u].i1=%d, buf[%u].i1=%d\n", __LINE__, (unsigned)u, + ((big_t *)buf_orig)[u].i1, (unsigned)u, ((little_t *)buf)[u].i1); TEST_ERROR; } /* end if */ if (((big_t *)buf_orig)[u].s1 == NULL || ((little_t *)buf)[u].s1 == NULL) { - HDprintf("Error, line #%d: buf_orig[%u].s1=%s, buf[%u].s1=%s\n", __LINE__, (unsigned)u, - ((big_t *)buf_orig)[u].s1, (unsigned)u, ((little_t *)buf)[u].s1); + printf("Error, line #%d: buf_orig[%u].s1=%s, buf[%u].s1=%s\n", __LINE__, (unsigned)u, + ((big_t *)buf_orig)[u].s1, (unsigned)u, ((little_t *)buf)[u].s1); TEST_ERROR; } /* end if */ else if (HDstrcmp(((big_t *)buf_orig)[u].s1, ((little_t *)buf)[u].s1) != 0) { - HDprintf("Error, line #%d: buf_orig[%u].s1=%s, buf[%u].s1=%s\n", __LINE__, (unsigned)u, - ((big_t *)buf_orig)[u].s1, (unsigned)u, ((little_t *)buf)[u].s1); + printf("Error, line #%d: buf_orig[%u].s1=%s, buf[%u].s1=%s\n", __LINE__, (unsigned)u, + ((big_t *)buf_orig)[u].s1, (unsigned)u, ((little_t *)buf)[u].s1); TEST_ERROR; } /* end if */ } /* end for */ if (H5Treclaim(little_tid2, space_id, H5P_DEFAULT, buf) < 0) { H5_FAILED(); AT(); - HDprintf("Can't reclaim data\n"); + printf("Can't reclaim data\n"); goto error; } /* end if */ @@ -2373,7 +2373,7 @@ test_compound_11(void) TEST_ERROR; /* Recover the original buffer information */ - HDmemcpy(buf, buf_orig, sizeof(big_t) * NTESTELEM); + memcpy(buf, buf_orig, sizeof(big_t) * NTESTELEM); /* Convert buffer from 'big' to 'little' struct */ if (H5Tconvert(big_tid, little_tid, (size_t)NTESTELEM, buf, bkg, H5P_DEFAULT) < 0) @@ -2382,30 +2382,30 @@ test_compound_11(void) /* Verify converted buffer is correct */ for (u = 0; u < NTESTELEM; u++) { if (!H5_DBL_ABS_EQUAL(((big_t *)buf_orig)[u].d1, ((little_t *)buf)[u].d1)) { - HDprintf("Error, line #%d: buf_orig[%u].d1=%f, buf[%u].d1=%f\n", __LINE__, (unsigned)u, - ((big_t *)buf_orig)[u].d1, (unsigned)u, ((little_t *)buf)[u].d1); + printf("Error, line #%d: buf_orig[%u].d1=%f, buf[%u].d1=%f\n", __LINE__, (unsigned)u, + ((big_t *)buf_orig)[u].d1, (unsigned)u, ((little_t *)buf)[u].d1); TEST_ERROR; } /* end if */ if (((big_t *)buf_orig)[u].i1 != ((little_t *)buf)[u].i1) { - HDprintf("Error, line #%d: buf_orig[%u].i1=%d, buf[%u].i1=%d\n", __LINE__, (unsigned)u, - ((big_t *)buf_orig)[u].i1, (unsigned)u, ((little_t *)buf)[u].i1); + printf("Error, line #%d: buf_orig[%u].i1=%d, buf[%u].i1=%d\n", __LINE__, (unsigned)u, + ((big_t *)buf_orig)[u].i1, (unsigned)u, ((little_t *)buf)[u].i1); TEST_ERROR; } /* end if */ if (((big_t *)buf_orig)[u].s1 == NULL || ((little_t *)buf)[u].s1 == NULL) { - HDprintf("Error, line #%d: buf_orig[%u].s1=%s, buf[%u].s1=%s\n", __LINE__, (unsigned)u, - ((big_t *)buf_orig)[u].s1, (unsigned)u, ((little_t *)buf)[u].s1); + printf("Error, line #%d: buf_orig[%u].s1=%s, buf[%u].s1=%s\n", __LINE__, (unsigned)u, + ((big_t *)buf_orig)[u].s1, (unsigned)u, ((little_t *)buf)[u].s1); TEST_ERROR; } /* end if */ else if (HDstrcmp(((big_t *)buf_orig)[u].s1, ((little_t *)buf)[u].s1) != 0) { - HDprintf("Error, line #%d: buf_orig[%u].s1=%s, buf[%u].s1=%s\n", __LINE__, (unsigned)u, - ((big_t *)buf_orig)[u].s1, (unsigned)u, ((little_t *)buf)[u].s1); + printf("Error, line #%d: buf_orig[%u].s1=%s, buf[%u].s1=%s\n", __LINE__, (unsigned)u, + ((big_t *)buf_orig)[u].s1, (unsigned)u, ((little_t *)buf)[u].s1); TEST_ERROR; } /* end if */ } /* end for */ if (H5Treclaim(little_tid, space_id, H5P_DEFAULT, buf) < 0) { H5_FAILED(); AT(); - HDprintf("Can't reclaim data\n"); + printf("Can't reclaim data\n"); goto error; } /* end if */ @@ -2414,7 +2414,7 @@ test_compound_11(void) TEST_ERROR; /* Recover the original buffer information */ - HDmemcpy(buf, buf_orig, sizeof(big_t) * NTESTELEM); + memcpy(buf, buf_orig, sizeof(big_t) * NTESTELEM); /* Convert buffer from 'big' to 'little' struct */ if (H5Tconvert(big_tid, little_tid, (size_t)NTESTELEM, buf, bkg, H5P_DEFAULT) < 0) @@ -2423,36 +2423,36 @@ test_compound_11(void) /* Verify converted buffer is correct */ for (u = 0; u < NTESTELEM; u++) { if (!H5_DBL_ABS_EQUAL(((big_t *)buf_orig)[u].d1, ((little_t *)buf)[u].d1)) { - HDprintf("Error, line #%d: buf_orig[%u].d1=%f, buf[%u].d1=%f\n", __LINE__, (unsigned)u, - ((big_t *)buf_orig)[u].d1, (unsigned)u, ((little_t *)buf)[u].d1); + printf("Error, line #%d: buf_orig[%u].d1=%f, buf[%u].d1=%f\n", __LINE__, (unsigned)u, + ((big_t *)buf_orig)[u].d1, (unsigned)u, ((little_t *)buf)[u].d1); TEST_ERROR; } /* end if */ if (((big_t *)buf_orig)[u].i1 != ((little_t *)buf)[u].i1) { - HDprintf("Error, line #%d: buf_orig[%u].i1=%d, buf[%u].i1=%d\n", __LINE__, (unsigned)u, - ((big_t *)buf_orig)[u].i1, (unsigned)u, ((little_t *)buf)[u].i1); + printf("Error, line #%d: buf_orig[%u].i1=%d, buf[%u].i1=%d\n", __LINE__, (unsigned)u, + ((big_t *)buf_orig)[u].i1, (unsigned)u, ((little_t *)buf)[u].i1); TEST_ERROR; } /* end if */ if (((big_t *)buf_orig)[u].s1 == NULL || ((little_t *)buf)[u].s1 == NULL) { - HDprintf("Error, line #%d: buf_orig[%u].s1=%s, buf[%u].s1=%s\n", __LINE__, (unsigned)u, - ((big_t *)buf_orig)[u].s1, (unsigned)u, ((little_t *)buf)[u].s1); + printf("Error, line #%d: buf_orig[%u].s1=%s, buf[%u].s1=%s\n", __LINE__, (unsigned)u, + ((big_t *)buf_orig)[u].s1, (unsigned)u, ((little_t *)buf)[u].s1); TEST_ERROR; } /* end if */ else if (HDstrcmp(((big_t *)buf_orig)[u].s1, ((little_t *)buf)[u].s1) != 0) { - HDprintf("Error, line #%d: buf_orig[%u].s1=%s, buf[%u].s1=%s\n", __LINE__, (unsigned)u, - ((big_t *)buf_orig)[u].s1, (unsigned)u, ((little_t *)buf)[u].s1); + printf("Error, line #%d: buf_orig[%u].s1=%s, buf[%u].s1=%s\n", __LINE__, (unsigned)u, + ((big_t *)buf_orig)[u].s1, (unsigned)u, ((little_t *)buf)[u].s1); TEST_ERROR; } /* end if */ } /* end for */ if (H5Treclaim(little_tid, space_id, H5P_DEFAULT, buf) < 0) { H5_FAILED(); AT(); - HDprintf("Can't reclaim data\n"); + printf("Can't reclaim data\n"); goto error; } /* end if */ /* Free everything */ for (u = 0; u < NTESTELEM; u++) - HDfree(((big_t *)buf_orig)[u].s1); + free(((big_t *)buf_orig)[u].s1); if (H5Sclose(space_id) < 0) TEST_ERROR; if (H5Tclose(opaq_dst_tid) < 0) @@ -2475,11 +2475,11 @@ test_compound_11(void) error: if (buf) - HDfree(buf); + free(buf); if (buf_orig) - HDfree(buf_orig); + free(buf_orig); if (bkg) - HDfree(bkg); + free(bkg); return retval; } @@ -2612,7 +2612,7 @@ test_compound_13(void) TESTING("compound datatypes of boundary size with latest format"); /* Create some phony data. */ - HDmemset(&data_out, 0, sizeof(data_out)); + memset(&data_out, 0, sizeof(data_out)); for (u = 0; u < COMPOUND13_ARRAY_SIZE + 1; u++) data_out.x[u] = (unsigned char)u; data_out.y = 99.99F; @@ -2782,7 +2782,7 @@ test_compound_14(void) if ((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); AT(); - HDprintf("Can't create file!\n"); + printf("Can't create file!\n"); goto error; } /* end if */ @@ -2790,21 +2790,21 @@ test_compound_14(void) if ((cmpd_m1_tid = H5Tcreate(H5T_COMPOUND, sizeof(struct cmpd_struct_1_w))) < 0) { H5_FAILED(); AT(); - HDprintf("Can't create datatype!\n"); + printf("Can't create datatype!\n"); goto error; } /* end if */ if (H5Tinsert(cmpd_m1_tid, "c1", HOFFSET(struct cmpd_struct_1_w, c1), H5T_NATIVE_CHAR) < 0) { H5_FAILED(); AT(); - HDprintf("Can't insert field 'c1'\n"); + printf("Can't insert field 'c1'\n"); goto error; } /* end if */ if (H5Tinsert(cmpd_m1_tid, "c2", HOFFSET(struct cmpd_struct_1_w, c2), H5T_NATIVE_CHAR) < 0) { H5_FAILED(); AT(); - HDprintf("Can't insert field 'c2'\n"); + printf("Can't insert field 'c2'\n"); goto error; } /* end if */ @@ -2812,14 +2812,14 @@ test_compound_14(void) if (H5Tset_size(str_id, H5T_VARIABLE) < 0) { H5_FAILED(); AT(); - HDprintf("Can't set size for VL string\n"); + printf("Can't set size for VL string\n"); goto error; } /* end if */ if (H5Tinsert(cmpd_m1_tid, "vl_string", HOFFSET(cmpd_struct_1_w, str), str_id) < 0) { H5_FAILED(); AT(); - HDprintf("Can't insert field 'vl_string'\n"); + printf("Can't insert field 'vl_string'\n"); goto error; } /* end if */ @@ -2827,28 +2827,28 @@ test_compound_14(void) if ((cmpd_f1_tid = H5Tcreate(H5T_COMPOUND, 8 + 1 + sizeof(hvl_t))) < 0) { H5_FAILED(); AT(); - HDprintf("Can't create datatype!\n"); + printf("Can't create datatype!\n"); goto error; } /* end if */ if (H5Tinsert(cmpd_f1_tid, "c1", (size_t)0, H5T_STD_I64BE) < 0) { H5_FAILED(); AT(); - HDprintf("Can't insert field 'c1'\n"); + printf("Can't insert field 'c1'\n"); goto error; } /* end if */ if (H5Tinsert(cmpd_f1_tid, "c2", (size_t)8, H5T_NATIVE_CHAR) < 0) { H5_FAILED(); AT(); - HDprintf("Can't insert field 'c2'\n"); + printf("Can't insert field 'c2'\n"); goto error; } /* end if */ if (H5Tinsert(cmpd_f1_tid, "vl_string", (size_t)(8 + 1), str_id) < 0) { H5_FAILED(); AT(); - HDprintf("Can't insert field 'vl_string'\n"); + printf("Can't insert field 'vl_string'\n"); goto error; } /* end if */ @@ -2856,56 +2856,56 @@ test_compound_14(void) if ((cmpd_m2_tid = H5Tcreate(H5T_COMPOUND, sizeof(struct cmpd_struct_2_w))) < 0) { H5_FAILED(); AT(); - HDprintf("Can't create datatype!\n"); + printf("Can't create datatype!\n"); goto error; } /* end if */ if (H5Tinsert(cmpd_m2_tid, "c1", HOFFSET(struct cmpd_struct_2_w, c1), H5T_NATIVE_CHAR) < 0) { H5_FAILED(); AT(); - HDprintf("Can't insert field 'c1'\n"); + printf("Can't insert field 'c1'\n"); goto error; } /* end if */ if (H5Tinsert(cmpd_m2_tid, "c2", HOFFSET(struct cmpd_struct_2_w, c2), H5T_NATIVE_CHAR) < 0) { H5_FAILED(); AT(); - HDprintf("Can't insert field 'c2'\n"); + printf("Can't insert field 'c2'\n"); goto error; } /* end if */ if (H5Tinsert(cmpd_m2_tid, "vl_string", HOFFSET(cmpd_struct_2_w, str), str_id) < 0) { H5_FAILED(); AT(); - HDprintf("Can't insert field 'vl_string'\n"); + printf("Can't insert field 'vl_string'\n"); goto error; } /* end if */ if (H5Tinsert(cmpd_m2_tid, "l1", HOFFSET(struct cmpd_struct_2_w, l1), H5T_NATIVE_LONG) < 0) { H5_FAILED(); AT(); - HDprintf("Can't insert field 'l1'\n"); + printf("Can't insert field 'l1'\n"); goto error; } /* end if */ if (H5Tinsert(cmpd_m2_tid, "l2", HOFFSET(struct cmpd_struct_2_w, l2), H5T_NATIVE_LONG) < 0) { H5_FAILED(); AT(); - HDprintf("Can't insert field 'l2'\n"); + printf("Can't insert field 'l2'\n"); goto error; } /* end if */ if (H5Tinsert(cmpd_m2_tid, "l3", HOFFSET(struct cmpd_struct_2_w, l3), H5T_NATIVE_LONG) < 0) { H5_FAILED(); AT(); - HDprintf("Can't insert field 'l3'\n"); + printf("Can't insert field 'l3'\n"); goto error; } /* end if */ if (H5Tinsert(cmpd_m2_tid, "l4", HOFFSET(struct cmpd_struct_2_w, l4), H5T_NATIVE_LONG) < 0) { H5_FAILED(); AT(); - HDprintf("Can't insert field 'l4'\n"); + printf("Can't insert field 'l4'\n"); goto error; } /* end if */ @@ -2913,56 +2913,56 @@ test_compound_14(void) if ((cmpd_f2_tid = H5Tcreate(H5T_COMPOUND, 8 + 1 + sizeof(hvl_t) + 4 * sizeof(long))) < 0) { H5_FAILED(); AT(); - HDprintf("Can't create datatype!\n"); + printf("Can't create datatype!\n"); goto error; } /* end if */ if (H5Tinsert(cmpd_f2_tid, "c1", (size_t)0, H5T_STD_I64BE) < 0) { H5_FAILED(); AT(); - HDprintf("Can't insert field 'c1'\n"); + printf("Can't insert field 'c1'\n"); goto error; } /* end if */ if (H5Tinsert(cmpd_f2_tid, "c2", (size_t)8, H5T_NATIVE_CHAR) < 0) { H5_FAILED(); AT(); - HDprintf("Can't insert field 'c2'\n"); + printf("Can't insert field 'c2'\n"); goto error; } /* end if */ if (H5Tinsert(cmpd_f2_tid, "vl_string", (size_t)(8 + 1), str_id) < 0) { H5_FAILED(); AT(); - HDprintf("Can't insert field 'vl_string'\n"); + printf("Can't insert field 'vl_string'\n"); goto error; } /* end if */ if (H5Tinsert(cmpd_f2_tid, "l1", 8 + 1 + sizeof(hvl_t), H5T_NATIVE_LONG) < 0) { H5_FAILED(); AT(); - HDprintf("Can't insert field 'l1'\n"); + printf("Can't insert field 'l1'\n"); goto error; } /* end if */ if (H5Tinsert(cmpd_f2_tid, "l2", 8 + 1 + sizeof(hvl_t) + sizeof(long), H5T_NATIVE_LONG) < 0) { H5_FAILED(); AT(); - HDprintf("Can't insert field 'l2'\n"); + printf("Can't insert field 'l2'\n"); goto error; } /* end if */ if (H5Tinsert(cmpd_f2_tid, "l3", 8 + 1 + sizeof(hvl_t) + 2 * sizeof(long), H5T_NATIVE_LONG) < 0) { H5_FAILED(); AT(); - HDprintf("Can't insert field 'l3'\n"); + printf("Can't insert field 'l3'\n"); goto error; } /* end if */ if (H5Tinsert(cmpd_f2_tid, "l4", 8 + 1 + sizeof(hvl_t) + 3 * sizeof(long), H5T_NATIVE_LONG) < 0) { H5_FAILED(); AT(); - HDprintf("Can't insert field 'l4'\n"); + printf("Can't insert field 'l4'\n"); goto error; } /* end if */ @@ -2970,7 +2970,7 @@ test_compound_14(void) if ((space_id = H5Screate_simple(1, dim1, NULL)) < 0) { H5_FAILED(); AT(); - HDprintf("Can't create space\n"); + printf("Can't create space\n"); goto error; } /* end if */ @@ -2978,7 +2978,7 @@ test_compound_14(void) H5P_DEFAULT)) < 0) { H5_FAILED(); AT(); - HDprintf("Can't create dataset\n"); + printf("Can't create dataset\n"); goto error; } /* end if */ @@ -2986,42 +2986,42 @@ test_compound_14(void) H5P_DEFAULT)) < 0) { H5_FAILED(); AT(); - HDprintf("Can't create dataset\n"); + printf("Can't create dataset\n"); goto error; } /* end if */ if (H5Dwrite(dset1_id, cmpd_m1_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &wdata1) < 0) { H5_FAILED(); AT(); - HDprintf("Can't write data\n"); + printf("Can't write data\n"); goto error; } /* end if */ if (H5Dwrite(dset2_id, cmpd_m2_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &wdata2) < 0) { H5_FAILED(); AT(); - HDprintf("Can't write data\n"); + printf("Can't write data\n"); goto error; } /* end if */ if (H5Dread(dset1_id, cmpd_m1_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &rdata1) < 0) { H5_FAILED(); AT(); - HDprintf("Can't read data\n"); + printf("Can't read data\n"); goto error; } /* end if */ if (H5Dread(dset2_id, cmpd_m2_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &rdata2) < 0) { H5_FAILED(); AT(); - HDprintf("Can't read data\n"); + printf("Can't read data\n"); goto error; } /* end if */ if (rdata1.c1 != wdata1.c1 || rdata1.c2 != wdata1.c2 || HDstrcmp(rdata1.str, wdata1.str) != 0) { H5_FAILED(); AT(); - HDprintf("incorrect read data\n"); + printf("incorrect read data\n"); goto error; } /* end if */ @@ -3030,21 +3030,21 @@ test_compound_14(void) rdata2.l4 != wdata2.l4) { H5_FAILED(); AT(); - HDprintf("incorrect read data\n"); + printf("incorrect read data\n"); goto error; } /* end if */ if (H5Treclaim(cmpd_m1_tid, space_id, H5P_DEFAULT, &rdata1) < 0) { H5_FAILED(); AT(); - HDprintf("Can't reclaim read data\n"); + printf("Can't reclaim read data\n"); goto error; } /* end if */ rdata1.str = NULL; if (H5Treclaim(cmpd_m2_tid, space_id, H5P_DEFAULT, &rdata2) < 0) { H5_FAILED(); AT(); - HDprintf("Can't reclaim read data\n"); + printf("Can't reclaim read data\n"); goto error; } /* end if */ rdata2.str = NULL; @@ -3066,60 +3066,60 @@ test_compound_14(void) if ((file = H5Fopen(filename, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0) { H5_FAILED(); AT(); - HDprintf("cannot open file\n"); + printf("cannot open file\n"); goto error; } /* end if */ if ((dset1_id = H5Dopen2(file, "Dataset1", H5P_DEFAULT)) < 0) { H5_FAILED(); AT(); - HDprintf("cannot open dataset\n"); + printf("cannot open dataset\n"); goto error; } /* end if */ if ((dset2_id = H5Dopen2(file, "Dataset2", H5P_DEFAULT)) < 0) { H5_FAILED(); AT(); - HDprintf("cannot open dataset\n"); + printf("cannot open dataset\n"); goto error; } /* end if */ if ((space_id = H5Dget_space(dset2_id)) < 0) { H5_FAILED(); AT(); - HDprintf("Can't get space\n"); + printf("Can't get space\n"); goto error; } /* end if */ rdata1.c1 = rdata1.c2 = 0; if (rdata1.str) - HDfree(rdata1.str); + free(rdata1.str); rdata2.c1 = rdata2.c2 = 0; rdata2.l1 = rdata2.l2 = rdata2.l3 = rdata2.l4 = 0; if (rdata2.str) { - HDfree(rdata2.str); + free(rdata2.str); rdata2.str = NULL; } /* end if */ if (H5Dread(dset1_id, cmpd_m1_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &rdata1) < 0) { H5_FAILED(); AT(); - HDprintf("Can't read data\n"); + printf("Can't read data\n"); goto error; } /* end if */ if (H5Dread(dset2_id, cmpd_m2_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &rdata2) < 0) { H5_FAILED(); AT(); - HDprintf("Can't read data\n"); + printf("Can't read data\n"); goto error; } /* end if */ if (rdata1.c1 != wdata1.c1 || rdata1.c2 != wdata1.c2 || HDstrcmp(rdata1.str, wdata1.str) != 0) { H5_FAILED(); AT(); - HDprintf("incorrect read data\n"); + printf("incorrect read data\n"); goto error; } /* end if */ @@ -3128,21 +3128,21 @@ test_compound_14(void) rdata2.l4 != wdata2.l4) { H5_FAILED(); AT(); - HDprintf("incorrect read data\n"); + printf("incorrect read data\n"); goto error; } /* end if */ if (H5Treclaim(cmpd_m1_tid, space_id, H5P_DEFAULT, &rdata1) < 0) { H5_FAILED(); AT(); - HDprintf("Can't reclaim read data\n"); + printf("Can't reclaim read data\n"); goto error; } /* end if */ rdata1.str = NULL; if (H5Treclaim(cmpd_m2_tid, space_id, H5P_DEFAULT, &rdata2) < 0) { H5_FAILED(); AT(); - HDprintf("Can't reclaim read data\n"); + printf("Can't reclaim read data\n"); goto error; } /* end if */ rdata2.str = NULL; @@ -3208,7 +3208,7 @@ test_compound_15(void) if ((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); AT(); - HDprintf("Can't create file!\n"); + printf("Can't create file!\n"); goto error; } /* end if */ @@ -3216,21 +3216,21 @@ test_compound_15(void) if ((cmpd_f_tid = H5Tcreate(H5T_COMPOUND, sizeof(struct cmpd_struct))) < 0) { H5_FAILED(); AT(); - HDprintf("Can't create datatype!\n"); + printf("Can't create datatype!\n"); goto error; } /* end if */ if (H5Tinsert(cmpd_f_tid, "i1", HOFFSET(struct cmpd_struct, i1), H5T_NATIVE_INT) < 0) { H5_FAILED(); AT(); - HDprintf("Can't insert field 'i1'\n"); + printf("Can't insert field 'i1'\n"); goto error; } /* end if */ if (H5Tinsert(cmpd_f_tid, "i2", HOFFSET(struct cmpd_struct, i2), H5T_NATIVE_INT) < 0) { H5_FAILED(); AT(); - HDprintf("Can't insert field 'i2'\n"); + printf("Can't insert field 'i2'\n"); goto error; } /* end if */ @@ -3238,14 +3238,14 @@ test_compound_15(void) if ((cmpd_m_tid = H5Tcreate(H5T_COMPOUND, sizeof(struct cmpd_struct))) < 0) { H5_FAILED(); AT(); - HDprintf("Can't create datatype!\n"); + printf("Can't create datatype!\n"); goto error; } /* end if */ if (H5Tinsert(cmpd_m_tid, "i1", (size_t)0, H5T_NATIVE_INT) < 0) { H5_FAILED(); AT(); - HDprintf("Can't insert field 'i1'\n"); + printf("Can't insert field 'i1'\n"); goto error; } /* end if */ @@ -3254,7 +3254,7 @@ test_compound_15(void) if ((space_id = H5Screate_simple(1, dim1, NULL)) < 0) { H5_FAILED(); AT(); - HDprintf("Can't create space\n"); + printf("Can't create space\n"); goto error; } /* end if */ @@ -3262,14 +3262,14 @@ test_compound_15(void) 0) { H5_FAILED(); AT(); - HDprintf("Can't create dataset\n"); + printf("Can't create dataset\n"); goto error; } /* end if */ if (H5Dwrite(dset_id, cmpd_f_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &wdata1) < 0) { H5_FAILED(); AT(); - HDprintf("Can't write data\n"); + printf("Can't write data\n"); goto error; } /* end if */ @@ -3278,7 +3278,7 @@ test_compound_15(void) if (H5Dwrite(dset_id, cmpd_m_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &wdata2) < 0) { H5_FAILED(); AT(); - HDprintf("Can't write data\n"); + printf("Can't write data\n"); goto error; } /* end if */ @@ -3286,7 +3286,7 @@ test_compound_15(void) if (H5Dread(dset_id, cmpd_f_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &rdata) < 0) { H5_FAILED(); AT(); - HDprintf("Can't read data\n"); + printf("Can't read data\n"); goto error; } /* end if */ @@ -3294,7 +3294,7 @@ test_compound_15(void) if (rdata.i1 != wdata2[0] || rdata.i2 != wdata1.i2) { H5_FAILED(); AT(); - HDprintf("incorrect read data\n"); + printf("incorrect read data\n"); goto error; } /* end if */ @@ -3307,7 +3307,7 @@ test_compound_15(void) if (H5Dread(dset_id, cmpd_m_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &rdata) < 0) { H5_FAILED(); AT(); - HDprintf("Can't read data\n"); + printf("Can't read data\n"); goto error; } /* end if */ @@ -3315,7 +3315,7 @@ test_compound_15(void) if (rdata.i1 != wdata2[0] || rdata.i2 != wdata2[1]) { H5_FAILED(); AT(); - HDprintf("incorrect read data\n"); + printf("incorrect read data\n"); goto error; } /* end if */ @@ -3542,7 +3542,7 @@ test_compound_16(void) if ((obj_count = H5Fget_obj_count(file, H5F_OBJ_DATATYPE)) != 1) { H5_FAILED(); AT(); - HDprintf(" H5Fget_obj_count returned: %zd; expected: 1\n", obj_count); + printf(" H5Fget_obj_count returned: %zd; expected: 1\n", obj_count); goto error; } @@ -3552,7 +3552,7 @@ test_compound_16(void) if (open_dtypes[1]) { H5_FAILED(); AT(); - HDprintf(" H5Fget_obj_ids returned as second id: %lld; expected: 0\n", (long long)open_dtypes[1]); + printf(" H5Fget_obj_ids returned as second id: %lld; expected: 0\n", (long long)open_dtypes[1]); goto error; } @@ -3635,7 +3635,7 @@ test_compound_17(void) if (2 != H5Tget_size(tmp_dt)) { H5_FAILED(); AT(); - HDprintf(" Size after packing: %u; expected: 2\n", (unsigned)H5Tget_size(tmp_dt)); + printf(" Size after packing: %u; expected: 2\n", (unsigned)H5Tget_size(tmp_dt)); goto error; } if (H5Tclose(tmp_dt) < 0) @@ -3649,7 +3649,7 @@ test_compound_17(void) if (4 != H5Tget_size(tmp_dt)) { H5_FAILED(); AT(); - HDprintf(" Size after packing: %u; expected: 4\n", (unsigned)H5Tget_size(tmp_dt)); + printf(" Size after packing: %u; expected: 4\n", (unsigned)H5Tget_size(tmp_dt)); goto error; } if (H5Tclose(tmp_dt) < 0) @@ -3698,7 +3698,7 @@ test_compound_17(void) if (2 != H5Tget_size(tmp_dt)) { H5_FAILED(); AT(); - HDprintf(" Size after packing: %u; expected: 2\n", (unsigned)H5Tget_size(tmp_dt)); + printf(" Size after packing: %u; expected: 2\n", (unsigned)H5Tget_size(tmp_dt)); goto error; } if (H5Tclose(tmp_dt) < 0) @@ -3712,7 +3712,7 @@ test_compound_17(void) if (4 != H5Tget_size(tmp_dt)) { H5_FAILED(); AT(); - HDprintf(" Size after packing: %u; expected: 4\n", (unsigned)H5Tget_size(tmp_dt)); + printf(" Size after packing: %u; expected: 4\n", (unsigned)H5Tget_size(tmp_dt)); goto error; } if (H5Tclose(tmp_dt) < 0) @@ -3766,7 +3766,7 @@ test_compound_18(void) /* Create compound datatype, but don't insert fields */ tid = H5Tcreate(H5T_COMPOUND, (size_t)8); - HDassert(tid > 0); + assert(tid > 0); /* Attempt to create file with compound datatype that has no fields */ /* Create File */ @@ -3776,7 +3776,7 @@ test_compound_18(void) /* Create a dataspace to use */ sid = H5Screate_simple(1, &dim, NULL); - HDassert(sid > 0); + assert(sid > 0); /* Create a dataset with the bad compound datatype */ H5E_BEGIN_TRY @@ -3791,7 +3791,7 @@ test_compound_18(void) /* Create a group */ gid = H5Gcreate2(file, "group", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); - HDassert(gid > 0); + assert(gid > 0); /* Create an attribute with the bad compound datatype */ H5E_BEGIN_TRY @@ -3923,107 +3923,107 @@ test_query(void) /* Create a compound datatype */ if ((tid1 = H5Tcreate(H5T_COMPOUND, sizeof(struct s1))) < 0) { H5_FAILED(); - HDprintf("Can't create datatype!\n"); + printf("Can't create datatype!\n"); goto error; } /* end if */ if (H5Tinsert(tid1, "a", HOFFSET(struct s1, a), H5T_NATIVE_INT) < 0) { H5_FAILED(); - HDprintf("Can't insert field 'a'\n"); + printf("Can't insert field 'a'\n"); goto error; } /* end if */ if (H5Tinsert(tid1, "b", HOFFSET(struct s1, b), H5T_NATIVE_FLOAT) < 0) { H5_FAILED(); - HDprintf("Can't insert field 'b'\n"); + printf("Can't insert field 'b'\n"); goto error; } /* end if */ if (H5Tinsert(tid1, "c", HOFFSET(struct s1, c), H5T_NATIVE_LONG) < 0) { H5_FAILED(); - HDprintf("Can't insert field 'c'\n"); + printf("Can't insert field 'c'\n"); goto error; } /* end if */ if (H5Tinsert(tid1, "d", HOFFSET(struct s1, d), H5T_NATIVE_DOUBLE) < 0) { H5_FAILED(); - HDprintf("Can't insert field 'd'\n"); + printf("Can't insert field 'd'\n"); goto error; } /* end if */ /* Create a enumerate datatype */ if ((tid2 = H5Tcreate(H5T_ENUM, sizeof(short))) < 0) { H5_FAILED(); - HDprintf("Can't create enumerate type\n"); + printf("Can't create enumerate type\n"); goto error; } /* end if */ if (H5Tenum_insert(tid2, "RED", (enum_val = 10, &enum_val)) < 0) { H5_FAILED(); - HDprintf("Can't insert field into enumeration type\n"); + printf("Can't insert field into enumeration type\n"); goto error; } /* end if */ if (H5Tenum_insert(tid2, "GREEN", (enum_val = 11, &enum_val)) < 0) { H5_FAILED(); - HDprintf("Can't insert field into enumeration type\n"); + printf("Can't insert field into enumeration type\n"); goto error; } /* end if */ if (H5Tenum_insert(tid2, "BLUE", (enum_val = 12, &enum_val)) < 0) { H5_FAILED(); - HDprintf("Can't insert field into enumeration type\n"); + printf("Can't insert field into enumeration type\n"); goto error; } /* end if */ if (H5Tenum_insert(tid2, "ORANGE", (enum_val = 13, &enum_val)) < 0) { H5_FAILED(); - HDprintf("Can't insert field into enumeration type\n"); + printf("Can't insert field into enumeration type\n"); goto error; } /* end if */ if (H5Tenum_insert(tid2, "YELLOW", (enum_val = 14, &enum_val)) < 0) { H5_FAILED(); - HDprintf("Can't insert field into enumeration type\n"); + printf("Can't insert field into enumeration type\n"); goto error; } /* end if */ /* Query member number and member index by name, for compound type. */ if (H5Tget_nmembers(tid1) != 4) { H5_FAILED(); - HDprintf("Can't get member number\n"); + printf("Can't get member number\n"); goto error; } /* end if */ if (H5Tget_member_index(tid1, "c") != 2) { H5_FAILED(); - HDprintf("Can't get correct index number\n"); + printf("Can't get correct index number\n"); goto error; } /* end if */ /* Query member number and member index by member name, for enumeration type. */ if (H5Tget_nmembers(tid2) != 5) { H5_FAILED(); - HDprintf("Can't get member number\n"); + printf("Can't get member number\n"); goto error; } /* end if */ if (H5Tget_member_index(tid2, "ORANGE") != 3) { H5_FAILED(); - HDprintf("Can't get correct index number\n"); + printf("Can't get correct index number\n"); goto error; } /* end if */ /* Commit compound datatype and close it */ if (H5Tcommit2(file, compnd_type, tid1, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf("Can't commit compound datatype\n"); + printf("Can't commit compound datatype\n"); goto error; } /* end if */ if (H5Tclose(tid1) < 0) { H5_FAILED(); - HDprintf("Can't close datatype\n"); + printf("Can't close datatype\n"); goto error; } /* end if */ /* Commit enumeration datatype and close it */ if (H5Tcommit2(file, enum_type, tid2, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf("Can't commit compound datatype\n"); + printf("Can't commit compound datatype\n"); goto error; } /* end if */ if (H5Tclose(tid2) < 0) { H5_FAILED(); - HDprintf("Can't close datatype\n"); + printf("Can't close datatype\n"); goto error; } /* end if */ @@ -4036,48 +4036,48 @@ test_query(void) /* Query member number and member index by name, for compound type */ if (H5Tget_nmembers(tid1) != 4) { H5_FAILED(); - HDprintf("Can't get member number\n"); + printf("Can't get member number\n"); goto error; } /* end if */ if (H5Tget_member_index(tid1, "c") != 2) { H5_FAILED(); - HDprintf("Can't get correct index number\n"); + printf("Can't get correct index number\n"); goto error; } /* end if */ /* Query member number and member index by member name, for enumeration type */ if (H5Tget_nmembers(tid2) != 5) { H5_FAILED(); - HDprintf("Can't get member number\n"); + printf("Can't get member number\n"); goto error; } /* end if */ if (H5Tget_member_index(tid2, "ORANGE") != 3) { H5_FAILED(); - HDprintf("Can't get correct index number\n"); + printf("Can't get correct index number\n"); goto error; } /* end if */ /* Query member value by member name, for enumeration type */ if (H5Tenum_valueof(tid2, "ORANGE", &enum_val) < 0) { H5_FAILED(); - HDprintf("Can't get value for enumerate member\n"); + printf("Can't get value for enumerate member\n"); goto error; } /* end if */ if (enum_val != 13) { H5_FAILED(); - HDprintf("Incorrect value for enum member\n"); + printf("Incorrect value for enum member\n"); goto error; } /* end if */ /* Query member value by member index, for enumeration type */ if (H5Tget_member_value(tid2, 2, &enum_val) < 0) { H5_FAILED(); - HDprintf("Can't get value for enum member\n"); + printf("Can't get value for enum member\n"); goto error; } /* end if */ if (enum_val != 12) { H5_FAILED(); - HDprintf("Incorrect value for enum member\n"); + printf("Incorrect value for enum member\n"); goto error; } /* end if */ @@ -4085,30 +4085,30 @@ test_query(void) enum_val = 14; if (H5Tenum_nameof(tid2, &enum_val, enum_name, (size_t)16) < 0) { H5_FAILED(); - HDprintf("Can't get name for enum member\n"); + printf("Can't get name for enum member\n"); goto error; } /* end if */ if (HDstrcmp("YELLOW", enum_name) != 0) { H5_FAILED(); - HDprintf("Incorrect name for enum member\n"); + printf("Incorrect name for enum member\n"); goto error; } /* end if */ /* Close datatype and file */ if (H5Tclose(tid1) < 0) { H5_FAILED(); - HDprintf("Can't close datatype\n"); + printf("Can't close datatype\n"); goto error; } /* end if */ if (H5Tclose(tid2) < 0) { H5_FAILED(); - HDprintf("Can't close datatype\n"); + printf("Can't close datatype\n"); goto error; } /* end if */ if (H5Fclose(file) < 0) { H5_FAILED(); - HDprintf("Can't close file\n"); + printf("Can't close file\n"); goto error; } /* end if */ @@ -4719,24 +4719,24 @@ test_conv_str_1(void) goto error; if ((dst_type = mkstr((size_t)5, H5T_STR_NULLTERM)) < 0) goto error; - if (NULL == (buf = (char *)HDcalloc((size_t)2, (size_t)10))) + if (NULL == (buf = (char *)calloc((size_t)2, (size_t)10))) goto error; - HDmemcpy(buf, "abcdefghi\0abcdefghi\0", (size_t)20); + memcpy(buf, "abcdefghi\0abcdefghi\0", (size_t)20); if (H5Tconvert(src_type, dst_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) goto error; - if (HDmemcmp(buf, "abcd\0abcd\0abcdefghi\0", (size_t)20) != 0) { + if (memcmp(buf, "abcd\0abcd\0abcdefghi\0", (size_t)20) != 0) { H5_FAILED(); HDputs(" Truncated C-string test failed"); goto error; } if (H5Tconvert(dst_type, src_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) goto error; - if (HDmemcmp(buf, "abcd\0\0\0\0\0\0abcd\0\0\0\0\0\0", (size_t)20) != 0) { + if (memcmp(buf, "abcd\0\0\0\0\0\0abcd\0\0\0\0\0\0", (size_t)20) != 0) { H5_FAILED(); HDputs(" Extended C-string test failed"); goto error; } - HDfree(buf); + free(buf); buf = NULL; if (H5Tclose(src_type) < 0) goto error; @@ -4750,24 +4750,24 @@ test_conv_str_1(void) goto error; if ((dst_type = mkstr((size_t)5, H5T_STR_NULLPAD)) < 0) goto error; - if (NULL == (buf = (char *)HDcalloc((size_t)2, (size_t)10))) + if (NULL == (buf = (char *)calloc((size_t)2, (size_t)10))) goto error; - HDmemcpy(buf, "abcdefghijabcdefghij", (size_t)20); + memcpy(buf, "abcdefghijabcdefghij", (size_t)20); if (H5Tconvert(src_type, dst_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) goto error; - if (HDmemcmp(buf, "abcdeabcdeabcdefghij", (size_t)20) != 0) { + if (memcmp(buf, "abcdeabcdeabcdefghij", (size_t)20) != 0) { H5_FAILED(); HDputs(" Truncated C buffer test failed"); goto error; } if (H5Tconvert(dst_type, src_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) goto error; - if (HDmemcmp(buf, "abcde\0\0\0\0\0abcde\0\0\0\0\0", (size_t)20) != 0) { + if (memcmp(buf, "abcde\0\0\0\0\0abcde\0\0\0\0\0", (size_t)20) != 0) { H5_FAILED(); HDputs(" Extended C buffer test failed"); goto error; } - HDfree(buf); + free(buf); buf = NULL; if (H5Tclose(src_type) < 0) goto error; @@ -4781,24 +4781,24 @@ test_conv_str_1(void) goto error; if ((dst_type = mkstr((size_t)5, H5T_STR_SPACEPAD)) < 0) goto error; - if (NULL == (buf = (char *)HDcalloc((size_t)2, (size_t)10))) + if (NULL == (buf = (char *)calloc((size_t)2, (size_t)10))) goto error; - HDmemcpy(buf, "abcdefghijabcdefghij", (size_t)20); + memcpy(buf, "abcdefghijabcdefghij", (size_t)20); if (H5Tconvert(src_type, dst_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) goto error; - if (HDmemcmp(buf, "abcdeabcdeabcdefghij", (size_t)20) != 0) { + if (memcmp(buf, "abcdeabcdeabcdefghij", (size_t)20) != 0) { H5_FAILED(); HDputs(" Truncated Fortran-string test failed"); goto error; } if (H5Tconvert(dst_type, src_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) goto error; - if (HDmemcmp(buf, "abcde abcde ", (size_t)20) != 0) { + if (memcmp(buf, "abcde abcde ", (size_t)20) != 0) { H5_FAILED(); HDputs(" Extended Fortran-string test failed"); goto error; } - HDfree(buf); + free(buf); buf = NULL; if (H5Tclose(src_type) < 0) goto error; @@ -4815,12 +4815,12 @@ test_conv_str_1(void) goto error; if ((dst_type = mkstr((size_t)10, H5T_STR_NULLTERM)) < 0) goto error; - if (NULL == (buf = (char *)HDcalloc((size_t)2, (size_t)10))) + if (NULL == (buf = (char *)calloc((size_t)2, (size_t)10))) goto error; - HDmemcpy(buf, "abcdefghijabcdefghij", (size_t)20); + memcpy(buf, "abcdefghijabcdefghij", (size_t)20); if (H5Tconvert(src_type, dst_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) goto error; - if (HDmemcmp(buf, "abcdefghijabcdefghij", (size_t)20) != 0) { + if (memcmp(buf, "abcdefghijabcdefghij", (size_t)20) != 0) { H5_FAILED(); HDputs(" Non-terminated string test 1"); goto error; @@ -4828,23 +4828,23 @@ test_conv_str_1(void) H5Tclose(dst_type); if ((dst_type = mkstr((size_t)5, H5T_STR_NULLTERM)) < 0) goto error; - HDmemcpy(buf, "abcdefghijabcdefghij", (size_t)20); + memcpy(buf, "abcdefghijabcdefghij", (size_t)20); if (H5Tconvert(src_type, dst_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) goto error; - if (HDmemcmp(buf, "abcd\0abcd\0abcdefghij", (size_t)20) != 0) { + if (memcmp(buf, "abcd\0abcd\0abcdefghij", (size_t)20) != 0) { H5_FAILED(); HDputs(" Non-terminated string test 2"); goto error; } - HDmemcpy(buf, "abcdeabcdexxxxxxxxxx", (size_t)20); + memcpy(buf, "abcdeabcdexxxxxxxxxx", (size_t)20); if (H5Tconvert(dst_type, src_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) goto error; - if (HDmemcmp(buf, "abcde\0\0\0\0\0abcde\0\0\0\0\0", (size_t)20) != 0) { + if (memcmp(buf, "abcde\0\0\0\0\0abcde\0\0\0\0\0", (size_t)20) != 0) { H5_FAILED(); HDputs(" Non-terminated string test 2"); goto error; } - HDfree(buf); + free(buf); buf = NULL; if (H5Tclose(src_type) < 0) goto error; @@ -4858,19 +4858,19 @@ test_conv_str_1(void) goto error; if ((dst_type = mkstr((size_t)10, H5T_STR_SPACEPAD)) < 0) goto error; - if (NULL == (buf = (char *)HDcalloc((size_t)2, (size_t)10))) + if (NULL == (buf = (char *)calloc((size_t)2, (size_t)10))) goto error; - HDmemcpy(buf, "abcdefghi\0abcdefghi\0", (size_t)20); + memcpy(buf, "abcdefghi\0abcdefghi\0", (size_t)20); if (H5Tconvert(src_type, dst_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) goto error; - if (HDmemcmp(buf, "abcdefghi abcdefghi ", (size_t)20) != 0) { + if (memcmp(buf, "abcdefghi abcdefghi ", (size_t)20) != 0) { H5_FAILED(); HDputs(" C string to Fortran test 1"); goto error; } if (H5Tconvert(dst_type, src_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) goto error; - if (HDmemcmp(buf, "abcdefghi\0abcdefghi\0", (size_t)20) != 0) { + if (memcmp(buf, "abcdefghi\0abcdefghi\0", (size_t)20) != 0) { H5_FAILED(); HDputs(" Fortran to C string test 1"); goto error; @@ -4879,17 +4879,17 @@ test_conv_str_1(void) goto error; if ((dst_type = mkstr((size_t)5, H5T_STR_SPACEPAD)) < 0) goto error; - HDmemcpy(buf, "abcdefgh\0\0abcdefgh\0\0", (size_t)20); + memcpy(buf, "abcdefgh\0\0abcdefgh\0\0", (size_t)20); if (H5Tconvert(src_type, dst_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) goto error; - if (HDmemcmp(buf, "abcdeabcdeabcdefgh\0\0", (size_t)20) != 0) { + if (memcmp(buf, "abcdeabcdeabcdefgh\0\0", (size_t)20) != 0) { H5_FAILED(); HDputs(" C string to Fortran test 2"); goto error; } if (H5Tconvert(dst_type, src_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) goto error; - if (HDmemcmp(buf, "abcde\0\0\0\0\0abcde\0\0\0\0\0", (size_t)20) != 0) { + if (memcmp(buf, "abcde\0\0\0\0\0abcde\0\0\0\0\0", (size_t)20) != 0) { H5_FAILED(); HDputs(" Fortran to C string test 2"); goto error; @@ -4902,22 +4902,22 @@ test_conv_str_1(void) goto error; if ((dst_type = mkstr((size_t)10, H5T_STR_SPACEPAD)) < 0) goto error; - HDmemcpy(buf, "abcd\0abcd\0xxxxxxxxxx", (size_t)20); + memcpy(buf, "abcd\0abcd\0xxxxxxxxxx", (size_t)20); if (H5Tconvert(src_type, dst_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) goto error; - if (HDmemcmp(buf, "abcd abcd ", (size_t)20) != 0) { + if (memcmp(buf, "abcd abcd ", (size_t)20) != 0) { H5_FAILED(); HDputs(" C string to Fortran test 3"); goto error; } if (H5Tconvert(dst_type, src_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) goto error; - if (HDmemcmp(buf, "abcd\0abcd\0abcd ", (size_t)20) != 0) { + if (memcmp(buf, "abcd\0abcd\0abcd ", (size_t)20) != 0) { H5_FAILED(); HDputs(" Fortran to C string test 3"); goto error; } - HDfree(buf); + free(buf); buf = NULL; if (H5Tclose(src_type) < 0) goto error; @@ -4931,19 +4931,19 @@ test_conv_str_1(void) goto error; if ((dst_type = mkstr((size_t)10, H5T_STR_SPACEPAD)) < 0) goto error; - if (NULL == (buf = (char *)HDcalloc((size_t)2, (size_t)10))) + if (NULL == (buf = (char *)calloc((size_t)2, (size_t)10))) goto error; - HDmemcpy(buf, "abcdefghijabcdefghij", (size_t)20); + memcpy(buf, "abcdefghijabcdefghij", (size_t)20); if (H5Tconvert(src_type, dst_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) goto error; - if (HDmemcmp(buf, "abcdefghijabcdefghij", (size_t)20) != 0) { + if (memcmp(buf, "abcdefghijabcdefghij", (size_t)20) != 0) { H5_FAILED(); HDputs(" C buffer to Fortran test 1"); goto error; } if (H5Tconvert(dst_type, src_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) goto error; - if (HDmemcmp(buf, "abcdefghijabcdefghij", (size_t)20) != 0) { + if (memcmp(buf, "abcdefghijabcdefghij", (size_t)20) != 0) { H5_FAILED(); HDputs(" Fortran to C buffer test 1"); goto error; @@ -4952,17 +4952,17 @@ test_conv_str_1(void) goto error; if ((dst_type = mkstr((size_t)5, H5T_STR_SPACEPAD)) < 0) goto error; - HDmemcpy(buf, "abcdefgh\0\0abcdefgh\0\0", (size_t)20); + memcpy(buf, "abcdefgh\0\0abcdefgh\0\0", (size_t)20); if (H5Tconvert(src_type, dst_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) goto error; - if (HDmemcmp(buf, "abcdeabcdeabcdefgh\0\0", (size_t)20) != 0) { + if (memcmp(buf, "abcdeabcdeabcdefgh\0\0", (size_t)20) != 0) { H5_FAILED(); HDputs(" C buffer to Fortran test 2"); goto error; } if (H5Tconvert(dst_type, src_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) goto error; - if (HDmemcmp(buf, "abcde\0\0\0\0\0abcde\0\0\0\0\0", (size_t)20) != 0) { + if (memcmp(buf, "abcde\0\0\0\0\0abcde\0\0\0\0\0", (size_t)20) != 0) { H5_FAILED(); HDputs(" Fortran to C buffer test 2"); goto error; @@ -4975,17 +4975,17 @@ test_conv_str_1(void) goto error; if ((dst_type = mkstr((size_t)10, H5T_STR_SPACEPAD)) < 0) goto error; - HDmemcpy(buf, "abcd\0abcd\0xxxxxxxxxx", (size_t)20); + memcpy(buf, "abcd\0abcd\0xxxxxxxxxx", (size_t)20); if (H5Tconvert(src_type, dst_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) goto error; - if (HDmemcmp(buf, "abcd abcd ", (size_t)20) != 0) { + if (memcmp(buf, "abcd abcd ", (size_t)20) != 0) { H5_FAILED(); HDputs(" C buffer to Fortran test 3"); goto error; } if (H5Tconvert(dst_type, src_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) goto error; - if (HDmemcmp(buf, "abcd\0abcd\0abcd ", (size_t)20) != 0) { + if (memcmp(buf, "abcd\0abcd\0abcd ", (size_t)20) != 0) { H5_FAILED(); HDputs(" Fortran to C buffer test 3"); goto error; @@ -4994,7 +4994,7 @@ test_conv_str_1(void) goto error; if (H5Tclose(dst_type) < 0) goto error; - HDfree(buf); + free(buf); PASSED(); @@ -5013,7 +5013,7 @@ error: H5E_END_TRY; if (buf) - HDfree(buf); + free(buf); /* Restore the default error handler (set in h5_reset()) */ h5_restore_err(); @@ -5053,7 +5053,7 @@ test_conv_str_2(void) goto error; if ((f_type = mkstr((size_t)8, H5T_STR_SPACEPAD)) < 0) goto error; - if (NULL == (buf = (char *)HDcalloc(nelmts, (size_t)8))) + if (NULL == (buf = (char *)calloc(nelmts, (size_t)8))) goto error; for (i = 0; i < nelmts; i++) { nchars = (size_t)(HDrand() % 8); @@ -5065,8 +5065,8 @@ test_conv_str_2(void) /* Do the conversions */ HDsnprintf(s, sizeof(s), "Testing random string conversion speed"); - HDprintf("%-70s", s); - HDfflush(stdout); + printf("%-70s", s); + fflush(stdout); if (H5Tconvert(c_type, f_type, nelmts, buf, NULL, H5P_DEFAULT) < 0) goto error; if (H5Tconvert(f_type, c_type, nelmts, buf, NULL, H5P_DEFAULT) < 0) @@ -5084,7 +5084,7 @@ error: H5E_END_TRY; if (buf) - HDfree(buf); + free(buf); /* Restore the default error handler (set in h5_reset()) */ h5_restore_err(); @@ -5130,7 +5130,7 @@ test_conv_str_3(void) */ if ((type = mkstr((size_t)8, H5T_STR_NULLPAD)) < 0) goto error; - if (NULL == (buf = (char *)HDcalloc(nelmts, (size_t)8))) + if (NULL == (buf = (char *)calloc(nelmts, (size_t)8))) FAIL_PUTS_ERROR("Allocation failed."); for (i = 0; i < nelmts; i++) { nchars = (size_t)(HDrand() % 8); @@ -5221,7 +5221,7 @@ error: H5E_END_TRY; if (buf) - HDfree(buf); + free(buf); if (tag) H5free_memory(tag); /* Technically allocated by API call */ @@ -5271,22 +5271,22 @@ test_conv_enum_1(void) } /* end for */ /* Initialize the buffer */ - if (NULL == (buf = (int *)HDmalloc(nelmts * MAX(H5Tget_size(t1), H5Tget_size(t2))))) + if (NULL == (buf = (int *)malloc(nelmts * MAX(H5Tget_size(t1), H5Tget_size(t2))))) goto error; for (u = 0; u < nelmts; u++) buf[u] = HDrand() % 26; /* Conversions */ HDsnprintf(s, sizeof(s), "Testing random enum conversion O(N)"); - HDprintf("%-70s", s); - HDfflush(stdout); + printf("%-70s", s); + fflush(stdout); if (H5Tconvert(t1, t2, nelmts, buf, NULL, H5P_DEFAULT) < 0) goto error; PASSED(); HDsnprintf(s, sizeof(s), "Testing random enum conversion O(N log N)"); - HDprintf("%-70s", s); - HDfflush(stdout); + printf("%-70s", s); + fflush(stdout); if (H5Tconvert(t2, t1, nelmts, buf, NULL, H5P_DEFAULT) < 0) goto error; PASSED(); @@ -5302,7 +5302,7 @@ error: H5E_END_TRY; if (buf) - HDfree(buf); + free(buf); /* Restore the default error handler (set in h5_reset()) */ h5_restore_err(); @@ -5346,12 +5346,12 @@ test_conv_enum_2(void) /* Destination enum type */ dsttype = H5Tenum_create(H5T_NATIVE_INT); - HDassert(H5Tget_size(dsttype) > H5Tget_size(srctype)); + assert(H5Tget_size(dsttype) > H5Tget_size(srctype)); for (i = 0; i < 8; i++) H5Tenum_insert(dsttype, mname[i], &i); /* Source data */ - data = (int *)HDmalloc(NTESTELEM * sizeof(int)); + data = (int *)malloc(NTESTELEM * sizeof(int)); for (i = 0; i < NTESTELEM; i++) { ((char *)data)[i * 3 + 2] = (char)(i % 8); ((char *)data)[i * 3 + 0] = 0; @@ -5366,20 +5366,20 @@ test_conv_enum_2(void) if (data[i] != i % 8) { if (!nerrors++) { H5_FAILED(); - HDprintf("element %d is %d but should have been %d\n", i, data[i], i % 8); + printf("element %d is %d but should have been %d\n", i, data[i], i % 8); } } } /* Cleanup */ - HDfree(data); + free(data); H5Tclose(srctype); H5Tclose(dsttype); H5Tclose(oddsize); /* Failure */ if (nerrors) { - HDprintf("total of %d conversion errors out of %d elements for enums\n", nerrors, NTESTELEM); + printf("total of %d conversion errors out of %d elements for enums\n", nerrors, NTESTELEM); return 1; } @@ -5420,7 +5420,7 @@ test_conv_bitfield(void) goto error; if (buf[0] != 0xAA || buf[1] != 0xAA || buf[2] != 0 || buf[3] != 0) { H5_FAILED(); - HDprintf(" s=0xaaaa, d=0x%02x%02x%02x%02x (test 1)\n", buf[3], buf[2], buf[1], buf[0]); + printf(" s=0xaaaa, d=0x%02x%02x%02x%02x (test 1)\n", buf[3], buf[2], buf[1], buf[0]); goto error; } @@ -5441,7 +5441,7 @@ test_conv_bitfield(void) goto error; if (buf[0] != 0 || buf[1] != 0xA8 || buf[2] != 0x2A || buf[3] != 0) { H5_FAILED(); - HDprintf(" s=0x2AA8 d=0x%02x%02x%02x%02x (test 2)\n", buf[3], buf[2], buf[1], buf[0]); + printf(" s=0x2AA8 d=0x%02x%02x%02x%02x (test 2)\n", buf[3], buf[2], buf[1], buf[0]); goto error; } @@ -5457,7 +5457,7 @@ test_conv_bitfield(void) goto error; if (buf[0] != 0xff || buf[1] != 0xAB || buf[2] != 0xEA || buf[3] != 0xff) { H5_FAILED(); - HDprintf(" s=0x2AA8 d=0x%02x%02x%02x%02x (test 3)\n", buf[3], buf[2], buf[1], buf[0]); + printf(" s=0x2AA8 d=0x%02x%02x%02x%02x (test 3)\n", buf[3], buf[2], buf[1], buf[0]); goto error; } @@ -5541,7 +5541,7 @@ test_bitfield_funcs(void) H5E_END_TRY; if (size > 0) { H5_FAILED(); - HDprintf("Operation not allowed for this type.\n"); + printf("Operation not allowed for this type.\n"); goto error; } /* end if */ @@ -5552,7 +5552,7 @@ test_bitfield_funcs(void) H5E_END_TRY; if (inpad > -1) { H5_FAILED(); - HDprintf("Operation not allowed for this type.\n"); + printf("Operation not allowed for this type.\n"); goto error; } /* end if */ @@ -5563,7 +5563,7 @@ test_bitfield_funcs(void) H5E_END_TRY; if (cset > -1) { H5_FAILED(); - HDprintf("Operation not allowed for this type.\n"); + printf("Operation not allowed for this type.\n"); goto error; } /* end if */ @@ -5574,7 +5574,7 @@ test_bitfield_funcs(void) H5E_END_TRY; if (strpad > -1) { H5_FAILED(); - HDprintf("Operation not allowed for this type.\n"); + printf("Operation not allowed for this type.\n"); goto error; } /* end if */ @@ -5585,7 +5585,7 @@ test_bitfield_funcs(void) H5E_END_TRY; if (ret >= 0) { H5_FAILED(); - HDprintf("Operation not allowed for this type.\n"); + printf("Operation not allowed for this type.\n"); goto error; } /* end if */ @@ -5596,7 +5596,7 @@ test_bitfield_funcs(void) H5E_END_TRY; if (tag) { H5_FAILED(); - HDprintf("Operation not allowed for this type.\n"); + printf("Operation not allowed for this type.\n"); goto error; } /* end if */ @@ -5607,7 +5607,7 @@ test_bitfield_funcs(void) H5E_END_TRY; if (super >= 0) { H5_FAILED(); - HDprintf("Operation not allowed for this type.\n"); + printf("Operation not allowed for this type.\n"); goto error; } /* end if */ @@ -5735,7 +5735,7 @@ opaque_check(int tag_it) H5E_END_TRY; if (status >= 0) { H5_FAILED(); - HDprintf(" opaque conversion should have failed but succeeded\n"); + printf(" opaque conversion should have failed but succeeded\n"); goto error; } @@ -5748,7 +5748,7 @@ opaque_check(int tag_it) goto error; if (saved + 1 != num_opaque_conversions_g) { H5_FAILED(); - HDprintf(" unexpected number of opaque conversions\n"); + printf(" unexpected number of opaque conversions\n"); goto error; } @@ -5794,9 +5794,9 @@ opaque_long(void) TEST_ERROR; /* Create long tag */ - if (NULL == (long_tag = (char *)HDmalloc((size_t)(16384 + 1)))) + if (NULL == (long_tag = (char *)malloc((size_t)(16384 + 1)))) TEST_ERROR; - HDmemset(long_tag, 'a', (size_t)16384); + memset(long_tag, 'a', (size_t)16384); long_tag[16384] = '\0'; /* Set opaque type's tag */ @@ -5813,7 +5813,7 @@ opaque_long(void) TEST_ERROR; /* Release memory for tag */ - HDfree(long_tag); + free(long_tag); return 0; @@ -5821,7 +5821,7 @@ error: if (dt > 0) H5Tclose(dt); if (long_tag) - HDfree(long_tag); + free(long_tag); H5_FAILED(); return 1; } @@ -5865,7 +5865,7 @@ opaque_funcs(void) } H5E_END_TRY; if (ret >= 0) { - HDprintf("Operation not allowed for this type.\n"); + printf("Operation not allowed for this type.\n"); TEST_ERROR; } /* end if */ @@ -5875,7 +5875,7 @@ opaque_funcs(void) } H5E_END_TRY; if (ret >= 0) { - HDprintf("Operation not allowed for this type.\n"); + printf("Operation not allowed for this type.\n"); TEST_ERROR; } /* end if */ @@ -5885,7 +5885,7 @@ opaque_funcs(void) } H5E_END_TRY; if (size > 0) { - HDprintf("Operation not allowed for this type.\n"); + printf("Operation not allowed for this type.\n"); TEST_ERROR; } /* end if */ @@ -5895,7 +5895,7 @@ opaque_funcs(void) } H5E_END_TRY; if (inpad > -1) { - HDprintf("Operation not allowed for this type.\n"); + printf("Operation not allowed for this type.\n"); TEST_ERROR; } /* end if */ @@ -5905,7 +5905,7 @@ opaque_funcs(void) } H5E_END_TRY; if (cset > -1) { - HDprintf("Operation not allowed for this type.\n"); + printf("Operation not allowed for this type.\n"); TEST_ERROR; } /* end if */ @@ -5915,7 +5915,7 @@ opaque_funcs(void) } H5E_END_TRY; if (strpad > -1) { - HDprintf("Operation not allowed for this type.\n"); + printf("Operation not allowed for this type.\n"); TEST_ERROR; } /* end if */ @@ -5925,7 +5925,7 @@ opaque_funcs(void) } H5E_END_TRY; if (ret >= 0) { - HDprintf("Operation not allowed for this type.\n"); + printf("Operation not allowed for this type.\n"); TEST_ERROR; } /* end if */ @@ -5935,7 +5935,7 @@ opaque_funcs(void) } H5E_END_TRY; if (sign > -1) { - HDprintf("Operation not allowed for this type.\n"); + printf("Operation not allowed for this type.\n"); TEST_ERROR; } /* end if */ @@ -5945,7 +5945,7 @@ opaque_funcs(void) } H5E_END_TRY; if (super >= 0) { - HDprintf("Operation not allowed for this type.\n"); + printf("Operation not allowed for this type.\n"); TEST_ERROR; } /* end if */ @@ -6013,71 +6013,71 @@ test_encode(void) /* Create a compound datatype */ if ((tid1 = H5Tcreate(H5T_COMPOUND, sizeof(struct cmpd))) < 0) { H5_FAILED(); - HDprintf("Can't create datatype!\n"); + printf("Can't create datatype!\n"); goto error; } if (H5Tinsert(tid1, "a", HOFFSET(struct cmpd, a), H5T_NATIVE_INT) < 0) { H5_FAILED(); - HDprintf("Can't insert field 'a'\n"); + printf("Can't insert field 'a'\n"); goto error; } if (H5Tinsert(tid1, "b", HOFFSET(struct cmpd, b), H5T_NATIVE_FLOAT) < 0) { H5_FAILED(); - HDprintf("Can't insert field 'b'\n"); + printf("Can't insert field 'b'\n"); goto error; } if (H5Tinsert(tid1, "c", HOFFSET(struct cmpd, c), H5T_NATIVE_LONG) < 0) { H5_FAILED(); - HDprintf("Can't insert field 'c'\n"); + printf("Can't insert field 'c'\n"); goto error; } if (H5Tinsert(tid1, "d", HOFFSET(struct cmpd, d), H5T_NATIVE_DOUBLE) < 0) { H5_FAILED(); - HDprintf("Can't insert field 'd'\n"); + printf("Can't insert field 'd'\n"); goto error; } /* Create a enumerate datatype */ if ((tid2 = H5Tcreate(H5T_ENUM, sizeof(short))) < 0) { H5_FAILED(); - HDprintf("Can't create enumerate type\n"); + printf("Can't create enumerate type\n"); goto error; } if (H5Tenum_insert(tid2, "RED", (enum_val = 0, &enum_val)) < 0) { H5_FAILED(); - HDprintf("Can't insert field into enumeration type\n"); + printf("Can't insert field into enumeration type\n"); goto error; } if (H5Tenum_insert(tid2, "GREEN", (enum_val = 1, &enum_val)) < 0) { H5_FAILED(); - HDprintf("Can't insert field into enumeration type\n"); + printf("Can't insert field into enumeration type\n"); goto error; } if (H5Tenum_insert(tid2, "BLUE", (enum_val = 2, &enum_val)) < 0) { H5_FAILED(); - HDprintf("Can't insert field into enumeration type\n"); + printf("Can't insert field into enumeration type\n"); goto error; } if (H5Tenum_insert(tid2, "ORANGE", (enum_val = 3, &enum_val)) < 0) { H5_FAILED(); - HDprintf("Can't insert field into enumeration type\n"); + printf("Can't insert field into enumeration type\n"); goto error; } if (H5Tenum_insert(tid2, "YELLOW", (enum_val = 4, &enum_val)) < 0) { H5_FAILED(); - HDprintf("Can't insert field into enumeration type\n"); + printf("Can't insert field into enumeration type\n"); goto error; } /* Create a variable-length string type */ if ((tid3 = H5Tcopy(H5T_C_S1)) < 0) { H5_FAILED(); - HDprintf("Can't copy a string type\n"); + printf("Can't copy a string type\n"); goto error; } if (H5Tset_size(tid3, H5T_VARIABLE) < 0) { H5_FAILED(); - HDprintf("Can't the string type to be variable-length\n"); + printf("Can't the string type to be variable-length\n"); goto error; } @@ -6088,12 +6088,12 @@ test_encode(void) /* Encode compound type in a buffer */ if (H5Tencode(tid1, NULL, &cmpd_buf_size) < 0) { H5_FAILED(); - HDprintf("Can't encode compound type\n"); + printf("Can't encode compound type\n"); goto error; } if (cmpd_buf_size > 0) - cmpd_buf = (unsigned char *)HDcalloc((size_t)1, cmpd_buf_size); + cmpd_buf = (unsigned char *)calloc((size_t)1, cmpd_buf_size); /* Try decoding an incorrect (empty) buffer (should fail) */ H5E_BEGIN_TRY @@ -6103,13 +6103,13 @@ test_encode(void) H5E_END_TRY; if (ret_id != FAIL) { H5_FAILED(); - HDprintf("Decoded an empty buffer!\n"); + printf("Decoded an empty buffer!\n"); goto error; } if (H5Tencode(tid1, cmpd_buf, &cmpd_buf_size) < 0) { H5_FAILED(); - HDprintf("Can't encode compound type\n"); + printf("Can't encode compound type\n"); goto error; } @@ -6120,96 +6120,96 @@ test_encode(void) /* Verify that the datatype was copied exactly */ if (H5Tequal(decoded_tid1, tid1) <= 0) { H5_FAILED(); - HDprintf("Datatype wasn't encoded & decoded identically\n"); + printf("Datatype wasn't encoded & decoded identically\n"); goto error; } /* Query member number and member index by name, for compound type. */ if (H5Tget_nmembers(decoded_tid1) != 4) { H5_FAILED(); - HDprintf("Can't get member number\n"); + printf("Can't get member number\n"); goto error; } if (H5Tget_member_index(decoded_tid1, "c") != 2) { H5_FAILED(); - HDprintf("Can't get correct index number\n"); + printf("Can't get correct index number\n"); goto error; } /* Encode enumerate type in a buffer */ if (H5Tencode(tid2, NULL, &enum_buf_size) < 0) { H5_FAILED(); - HDprintf("Can't encode enumerate type\n"); + printf("Can't encode enumerate type\n"); goto error; } if (enum_buf_size > 0) - enum_buf = (unsigned char *)HDcalloc((size_t)1, enum_buf_size); + enum_buf = (unsigned char *)calloc((size_t)1, enum_buf_size); if (H5Tencode(tid2, enum_buf, &enum_buf_size) < 0) { H5_FAILED(); - HDprintf("Can't encode enumerate type\n"); + printf("Can't encode enumerate type\n"); goto error; } /* Decode from the enumerate buffer and return an object handle */ if ((decoded_tid2 = H5Tdecode(enum_buf)) < 0) { H5_FAILED(); - HDprintf("Can't decode enumerate type\n"); + printf("Can't decode enumerate type\n"); goto error; } /* Verify that the datatype was copied exactly */ if (H5Tequal(decoded_tid2, tid2) <= 0) { H5_FAILED(); - HDprintf("Datatype wasn't encoded & decoded identically\n"); + printf("Datatype wasn't encoded & decoded identically\n"); goto error; } /* Query member number and member index by name, for enumeration type. */ if (H5Tget_nmembers(decoded_tid2) != 5) { H5_FAILED(); - HDprintf("Can't get member number\n"); + printf("Can't get member number\n"); goto error; } if (H5Tget_member_index(decoded_tid2, "ORANGE") != 3) { H5_FAILED(); - HDprintf("Can't get correct index number\n"); + printf("Can't get correct index number\n"); goto error; } /* Encode VL string type in a buffer */ if (H5Tencode(tid3, NULL, &vlstr_buf_size) < 0) { H5_FAILED(); - HDprintf("Can't encode VL string type\n"); + printf("Can't encode VL string type\n"); goto error; } if (vlstr_buf_size > 0) - vlstr_buf = (unsigned char *)HDcalloc((size_t)1, vlstr_buf_size); + vlstr_buf = (unsigned char *)calloc((size_t)1, vlstr_buf_size); if (H5Tencode(tid3, vlstr_buf, &vlstr_buf_size) < 0) { H5_FAILED(); - HDprintf("Can't encode VL string type\n"); + printf("Can't encode VL string type\n"); goto error; } /* Decode from the VL string buffer and return an object handle */ if ((decoded_tid3 = H5Tdecode(vlstr_buf)) < 0) { H5_FAILED(); - HDprintf("Can't decode VL string type\n"); + printf("Can't decode VL string type\n"); goto error; } /* Verify that the datatype was copied exactly */ if (H5Tequal(decoded_tid3, tid3) <= 0) { H5_FAILED(); - HDprintf("Datatype wasn't encoded & decoded identically\n"); + printf("Datatype wasn't encoded & decoded identically\n"); goto error; } if (!H5Tis_variable_str(decoded_tid3)) { H5_FAILED(); - HDprintf("Datatype wasn't encoded & decoded identically\n"); + printf("Datatype wasn't encoded & decoded identically\n"); goto error; } @@ -6220,58 +6220,58 @@ test_encode(void) /* Commit compound datatype and close it */ if (H5Tcommit2(file, compnd_type, tid1, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf("Can't commit compound datatype\n"); + printf("Can't commit compound datatype\n"); goto error; } if (H5Tclose(tid1) < 0) { H5_FAILED(); - HDprintf("Can't close datatype\n"); + printf("Can't close datatype\n"); goto error; } if (H5Tclose(decoded_tid1) < 0) { H5_FAILED(); - HDprintf("Can't close datatype\n"); + printf("Can't close datatype\n"); goto error; } - HDfree(cmpd_buf); + free(cmpd_buf); cmpd_buf_size = 0; /* Commit enumeration datatype and close it */ if (H5Tcommit2(file, enum_type, tid2, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf("Can't commit compound datatype\n"); + printf("Can't commit compound datatype\n"); goto error; } if (H5Tclose(tid2) < 0) { H5_FAILED(); - HDprintf("Can't close datatype\n"); + printf("Can't close datatype\n"); goto error; } if (H5Tclose(decoded_tid2) < 0) { H5_FAILED(); - HDprintf("Can't close datatype\n"); + printf("Can't close datatype\n"); goto error; } - HDfree(enum_buf); + free(enum_buf); enum_buf_size = 0; /* Commit enumeration datatype and close it */ if (H5Tcommit2(file, vlstr_type, tid3, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf("Can't commit vl string datatype\n"); + printf("Can't commit vl string datatype\n"); goto error; } if (H5Tclose(tid3) < 0) { H5_FAILED(); - HDprintf("Can't close datatype\n"); + printf("Can't close datatype\n"); goto error; } if (H5Tclose(decoded_tid3) < 0) { H5_FAILED(); - HDprintf("Can't close datatype\n"); + printf("Can't close datatype\n"); goto error; } - HDfree(vlstr_buf); + free(vlstr_buf); vlstr_buf_size = 0; /* Open the dataytpe for query */ @@ -6289,16 +6289,16 @@ test_encode(void) /* Encode compound type in a buffer */ if (H5Tencode(tid1, NULL, &cmpd_buf_size) < 0) { H5_FAILED(); - HDprintf("Can't encode compound type\n"); + printf("Can't encode compound type\n"); goto error; } if (cmpd_buf_size > 0) - cmpd_buf = (unsigned char *)HDcalloc((size_t)1, cmpd_buf_size); + cmpd_buf = (unsigned char *)calloc((size_t)1, cmpd_buf_size); if (H5Tencode(tid1, cmpd_buf, &cmpd_buf_size) < 0) { H5_FAILED(); - HDprintf("Can't encode compound type\n"); + printf("Can't encode compound type\n"); goto error; } @@ -6309,97 +6309,97 @@ test_encode(void) /* Verify that the datatype was copied exactly */ if (H5Tequal(decoded_tid1, tid1) <= 0) { H5_FAILED(); - HDprintf("Datatype wasn't encoded & decoded identically\n"); + printf("Datatype wasn't encoded & decoded identically\n"); goto error; } /* Query member number and member index by name, for compound type. */ if (H5Tget_nmembers(decoded_tid1) != 4) { H5_FAILED(); - HDprintf("Can't get member number\n"); + printf("Can't get member number\n"); goto error; } if (H5Tget_member_index(decoded_tid1, "c") != 2) { H5_FAILED(); - HDprintf("Can't get correct index number\n"); + printf("Can't get correct index number\n"); goto error; } /* Encode enumerate type in a buffer */ if (H5Tencode(tid2, NULL, &enum_buf_size) < 0) { H5_FAILED(); - HDprintf("Can't encode enumerate type\n"); + printf("Can't encode enumerate type\n"); goto error; } if (enum_buf_size > 0) - enum_buf = (unsigned char *)HDcalloc((size_t)1, enum_buf_size); + enum_buf = (unsigned char *)calloc((size_t)1, enum_buf_size); if (H5Tencode(tid2, enum_buf, &enum_buf_size) < 0) { H5_FAILED(); - HDprintf("Can't encode enumerate type\n"); + printf("Can't encode enumerate type\n"); goto error; } /* Decode from the enumerate buffer and return an object handle */ if ((decoded_tid2 = H5Tdecode(enum_buf)) < 0) { H5_FAILED(); - HDprintf("Can't decode enumerate type\n"); + printf("Can't decode enumerate type\n"); goto error; } /* Verify that the datatype was copied exactly */ if (H5Tequal(decoded_tid2, tid2) <= 0) { H5_FAILED(); - HDprintf("Datatype wasn't encoded & decoded identically\n"); + printf("Datatype wasn't encoded & decoded identically\n"); goto error; } /* Query member number and member index by name, for enumeration type. */ if (H5Tget_nmembers(decoded_tid2) != 5) { H5_FAILED(); - HDprintf("Can't get member number\n"); + printf("Can't get member number\n"); goto error; } if (H5Tget_member_index(decoded_tid2, "ORANGE") != 3) { H5_FAILED(); - HDprintf("Can't get correct index number\n"); + printf("Can't get correct index number\n"); goto error; } /* Encode VL string type in a buffer */ if (H5Tencode(tid3, NULL, &vlstr_buf_size) < 0) { H5_FAILED(); - HDprintf("Can't encode VL string type\n"); + printf("Can't encode VL string type\n"); goto error; } if (vlstr_buf_size > 0) - vlstr_buf = (unsigned char *)HDcalloc((size_t)1, vlstr_buf_size); + vlstr_buf = (unsigned char *)calloc((size_t)1, vlstr_buf_size); if (H5Tencode(tid3, vlstr_buf, &vlstr_buf_size) < 0) { H5_FAILED(); - HDprintf("Can't encode VL string type\n"); + printf("Can't encode VL string type\n"); goto error; } /* Decode from the VL string buffer and return an object handle */ if ((decoded_tid3 = H5Tdecode(vlstr_buf)) < 0) { H5_FAILED(); - HDprintf("Can't decode VL string type\n"); + printf("Can't decode VL string type\n"); goto error; } - HDfree(vlstr_buf); + free(vlstr_buf); /* Verify that the datatype was copied exactly */ if (H5Tequal(decoded_tid3, tid3) <= 0) { H5_FAILED(); - HDprintf("Datatype wasn't encoded & decoded identically\n"); + printf("Datatype wasn't encoded & decoded identically\n"); goto error; } if (!H5Tis_variable_str(decoded_tid3)) { H5_FAILED(); - HDprintf("Datatype wasn't encoded & decoded identically\n"); + printf("Datatype wasn't encoded & decoded identically\n"); goto error; } @@ -6411,19 +6411,19 @@ test_encode(void) /* Make sure the reference counts for the decoded datatypes are one. */ if (H5Iget_ref(decoded_tid1) != 1) { H5_FAILED(); - HDprintf("Decoded datatype has incorrect reference count\n"); + printf("Decoded datatype has incorrect reference count\n"); goto error; } if (H5Iget_ref(decoded_tid2) != 1) { H5_FAILED(); - HDprintf("Decoded datatype has incorrect reference count\n"); + printf("Decoded datatype has incorrect reference count\n"); goto error; } if (H5Iget_ref(decoded_tid3) != 1) { H5_FAILED(); - HDprintf("Decoded datatype has incorrect reference count\n"); + printf("Decoded datatype has incorrect reference count\n"); goto error; } @@ -6431,19 +6431,19 @@ test_encode(void) * decremented and the datatypes are closed. */ if (H5Idec_ref(decoded_tid1) != 0) { H5_FAILED(); - HDprintf("Decoded datatype can't close\n"); + printf("Decoded datatype can't close\n"); goto error; } if (H5Idec_ref(decoded_tid2) != 0) { H5_FAILED(); - HDprintf("Decoded datatype can't close\n"); + printf("Decoded datatype can't close\n"); goto error; } if (H5Idec_ref(decoded_tid3) != 0) { H5_FAILED(); - HDprintf("Decoded datatype can't close\n"); + printf("Decoded datatype can't close\n"); goto error; } @@ -6455,7 +6455,7 @@ test_encode(void) H5E_END_TRY; if (ret != FAIL) { H5_FAILED(); - HDprintf("Decoded datatype should have been closed\n"); + printf("Decoded datatype should have been closed\n"); goto error; } @@ -6466,7 +6466,7 @@ test_encode(void) H5E_END_TRY; if (ret != FAIL) { H5_FAILED(); - HDprintf("Decoded datatype should have been closed\n"); + printf("Decoded datatype should have been closed\n"); goto error; } @@ -6477,7 +6477,7 @@ test_encode(void) H5E_END_TRY; if (ret != FAIL) { H5_FAILED(); - HDprintf("Decoded datatype should have been closed\n"); + printf("Decoded datatype should have been closed\n"); goto error; } @@ -6488,28 +6488,28 @@ test_encode(void) /* Close datatype and file */ if (H5Tclose(tid1) < 0) { H5_FAILED(); - HDprintf("Can't close datatype\n"); + printf("Can't close datatype\n"); goto error; } if (H5Tclose(tid2) < 0) { H5_FAILED(); - HDprintf("Can't close datatype\n"); + printf("Can't close datatype\n"); goto error; } if (H5Tclose(tid3) < 0) { H5_FAILED(); - HDprintf("Can't close datatype\n"); + printf("Can't close datatype\n"); goto error; } if (H5Fclose(file) < 0) { H5_FAILED(); - HDprintf("Can't close file\n"); + printf("Can't close file\n"); goto error; } - HDfree(cmpd_buf); - HDfree(enum_buf); + free(cmpd_buf); + free(enum_buf); PASSED(); return 0; @@ -6796,7 +6796,7 @@ test_int_float_except(void) TEST_ERROR; /* Convert buffer */ - HDmemset(&e, 0, sizeof(except_info_t)); + memset(&e, 0, sizeof(except_info_t)); if (H5Tconvert(H5T_NATIVE_FLOAT, H5T_NATIVE_INT, (size_t)CONVERT_SIZE, buf, NULL, dxpl) < 0) TEST_ERROR; @@ -6820,7 +6820,7 @@ test_int_float_except(void) TEST_ERROR; /* Convert buffer */ - HDmemset(&e, 0, sizeof(except_info_t)); + memset(&e, 0, sizeof(except_info_t)); if (H5Tconvert(H5T_NATIVE_INT, H5T_NATIVE_FLOAT, (size_t)CONVERT_SIZE, buf, NULL, dxpl) < 0) TEST_ERROR; @@ -6846,7 +6846,7 @@ test_int_float_except(void) /* Work on second buffer */ /* Convert second buffer */ - HDmemset(&e, 0, sizeof(except_info_t)); + memset(&e, 0, sizeof(except_info_t)); if (H5Tconvert(H5T_NATIVE_INT, H5T_NATIVE_FLOAT, (size_t)CONVERT_SIZE, buf2, NULL, dxpl) < 0) TEST_ERROR; @@ -6870,7 +6870,7 @@ test_int_float_except(void) TEST_ERROR; /* Convert buffer */ - HDmemset(&e, 0, sizeof(except_info_t)); + memset(&e, 0, sizeof(except_info_t)); if (H5Tconvert(H5T_NATIVE_FLOAT, H5T_NATIVE_INT, (size_t)CONVERT_SIZE, buf2, NULL, dxpl) < 0) TEST_ERROR; @@ -7597,11 +7597,11 @@ create_del_obj_named_test_file(const char *filename, hid_t fapl, H5F_libver_t lo /* Make copy of FAPL */ my_fapl = H5Pcopy(fapl); - HDassert(my_fapl > 0); + assert(my_fapl > 0); /* Use low/high version of file format */ status = H5Pset_libver_bounds(my_fapl, low, high); - HDassert(status >= 0); + assert(status >= 0); /* Set new format flag. Note: the case high < low should be caught in the caller */ use_at_least_v18 = 0; @@ -7610,80 +7610,80 @@ create_del_obj_named_test_file(const char *filename, hid_t fapl, H5F_libver_t lo /* Create a file creation property list (used for the root group's creation property list) */ fcpl = H5Pcreate(H5P_FILE_CREATE); - HDassert(fcpl > 0); + assert(fcpl > 0); if (use_at_least_v18) { /* Use dense link storage for all links in root group */ status = H5Pset_link_phase_change(fcpl, 0, 0); - HDassert(status >= 0); + assert(status >= 0); } /* end if */ /* Create file with attribute that uses committed datatype */ file = H5Fcreate(filename, H5F_ACC_TRUNC, fcpl, my_fapl); - HDassert(file > 0); + assert(file > 0); /* Close FCPL */ status = H5Pclose(fcpl); - HDassert(status >= 0); + assert(status >= 0); /* Close FAPL */ status = H5Pclose(my_fapl); - HDassert(status >= 0); + assert(status >= 0); /* Create datatype to commit */ type = H5Tvlen_create(H5T_NATIVE_INT); - HDassert(type > 0); + assert(type > 0); /* Commit datatype */ status = H5Tcommit2(file, DEL_OBJ_NAMED_NAMED_DTYPE, type, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); - HDassert(status >= 0); + assert(status >= 0); /* Create scalar dataspace */ space = H5Screate(H5S_SCALAR); - HDassert(space > 0); + assert(space > 0); /* Create a dataset creation property list */ dcpl = H5Pcreate(H5P_DATASET_CREATE); - HDassert(dcpl > 0); + assert(dcpl > 0); if (use_at_least_v18) { /* Use dense attribute storage for all attributes on dataset */ status = H5Pset_attr_phase_change(dcpl, 0, 0); - HDassert(status >= 0); + assert(status >= 0); } /* end if */ /* Create dataset */ dset = H5Dcreate2(file, DEL_OBJ_NAMED_DATASET, type, space, H5P_DEFAULT, dcpl, H5P_DEFAULT); - HDassert(dset > 0); + assert(dset > 0); /* Close DCPL */ status = H5Pclose(dcpl); - HDassert(status >= 0); + assert(status >= 0); /* Close dataset */ status = H5Dclose(dset); - HDassert(status >= 0); + assert(status >= 0); /* Create attribute */ attr = H5Acreate_by_name(file, DEL_OBJ_NAMED_DATASET, DEL_OBJ_NAMED_ATTRIBUTE, type, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); - HDassert(attr > 0); + assert(attr > 0); /* Close dataspace */ status = H5Sclose(space); - HDassert(status >= 0); + assert(status >= 0); /* Close datatype */ status = H5Tclose(type); - HDassert(status >= 0); + assert(status >= 0); /* Close attribute */ status = H5Aclose(attr); - HDassert(status >= 0); + assert(status >= 0); /* Close file */ status = H5Fclose(file); - HDassert(status >= 0); + assert(status >= 0); } /* end create_del_obj_named_test_file() */ /*------------------------------------------------------------------------- @@ -8878,12 +8878,12 @@ main(void) fapl = h5_fileaccess(); if (h5_using_parallel_driver(fapl, &driver_is_parallel) < 0) { - HDprintf("Can't check if driver is parallel-enabled\n"); - HDexit(EXIT_FAILURE); + printf("Can't check if driver is parallel-enabled\n"); + exit(EXIT_FAILURE); } if (ALIGNMENT) - HDprintf("Testing non-aligned conversions (ALIGNMENT=%d)....\n", ALIGNMENT); + printf("Testing non-aligned conversions (ALIGNMENT=%d)....\n", ALIGNMENT); /* Do the tests */ nerrors += test_classes(); @@ -8951,11 +8951,11 @@ main(void) nerrors += test_versionbounds(); if (nerrors) { - HDprintf("***** %lu FAILURE%s! *****\n", nerrors, 1 == nerrors ? "" : "S"); - HDexit(EXIT_FAILURE); + printf("***** %lu FAILURE%s! *****\n", nerrors, 1 == nerrors ? "" : "S"); + exit(EXIT_FAILURE); } - HDprintf("All datatype tests passed.\n"); + printf("All datatype tests passed.\n"); return 0; } diff --git a/test/earray.c b/test/earray.c index cc79987..37462df 100644 --- a/test/earray.c +++ b/test/earray.c @@ -186,7 +186,7 @@ static int init_cparam(H5EA_create_t *cparam) { /* Wipe out background */ - HDmemset(cparam, 0, sizeof(*cparam)); + memset(cparam, 0, sizeof(*cparam)); /* General parameters */ cparam->cls = H5EA_CLS_TEST; @@ -223,14 +223,14 @@ init_tparam(earray_test_param_t *tparam, const H5EA_create_t *cparam) size_t u; /* Local index variable */ /* Wipe out background */ - HDmemset(tparam, 0, sizeof(*tparam)); + memset(tparam, 0, sizeof(*tparam)); /* Compute general information */ tparam->nsblks = 1 + (cparam->max_nelmts_bits - H5VM_log2_of2(cparam->data_blk_min_elmts)); /* Allocate information for each super block */ - tparam->sblk_info = (H5EA_sblk_info_t *)HDmalloc(sizeof(H5EA_sblk_info_t) * tparam->nsblks); - HDassert(tparam->sblk_info); + tparam->sblk_info = (H5EA_sblk_info_t *)malloc(sizeof(H5EA_sblk_info_t) * tparam->nsblks); + assert(tparam->sblk_info); /* Compute information about each super block */ start_idx = 0; @@ -266,7 +266,7 @@ static int finish_tparam(earray_test_param_t *tparam) { /* Release super block information */ - HDfree(tparam->sblk_info); + free(tparam->sblk_info); tparam->sblk_info = NULL; return (0); @@ -331,64 +331,62 @@ check_stats(const H5EA_t *ea, const earray_state_t *state) /* Compare information */ if (earray_stats.stored.max_idx_set != state->max_idx_set) { - HDfprintf(stdout, - "earray_stats.stored.max_idx_set = %" PRIuHSIZE ", state->max_idx_set = %" PRIuHSIZE "\n", - earray_stats.stored.max_idx_set, state->max_idx_set); + fprintf(stdout, + "earray_stats.stored.max_idx_set = %" PRIuHSIZE ", state->max_idx_set = %" PRIuHSIZE "\n", + earray_stats.stored.max_idx_set, state->max_idx_set); TEST_ERROR; } /* end if */ if (earray_stats.stored.nelmts != state->nelmts) { - HDfprintf(stdout, "earray_stats.stored.nelmts = %" PRIuHSIZE ", state->nelmts = %" PRIuHSIZE "\n", - earray_stats.stored.nelmts, state->nelmts); + fprintf(stdout, "earray_stats.stored.nelmts = %" PRIuHSIZE ", state->nelmts = %" PRIuHSIZE "\n", + earray_stats.stored.nelmts, state->nelmts); TEST_ERROR; } /* end if */ if (earray_stats.computed.hdr_size != state->hdr_size) { - HDfprintf(stdout, - "earray_stats.computed.hdr_size = %" PRIuHSIZE ", state->hdr_size = %" PRIuHSIZE "\n", - earray_stats.computed.hdr_size, state->hdr_size); + fprintf(stdout, "earray_stats.computed.hdr_size = %" PRIuHSIZE ", state->hdr_size = %" PRIuHSIZE "\n", + earray_stats.computed.hdr_size, state->hdr_size); TEST_ERROR; } /* end if */ if (earray_stats.computed.nindex_blks != state->nindex_blks) { - HDfprintf(stdout, - "earray_stats.computed.nindex_blks = %" PRIuHSIZE ", state->nindex_blks = %" PRIuHSIZE "\n", - earray_stats.computed.nindex_blks, state->nindex_blks); + fprintf(stdout, + "earray_stats.computed.nindex_blks = %" PRIuHSIZE ", state->nindex_blks = %" PRIuHSIZE "\n", + earray_stats.computed.nindex_blks, state->nindex_blks); TEST_ERROR; } /* end if */ if (earray_stats.computed.index_blk_size != state->index_blk_size) { - HDfprintf(stdout, - "earray_stats.computed.index_blk_size = %" PRIuHSIZE ", state->index_blk_size = %" PRIuHSIZE - "\n", - earray_stats.computed.index_blk_size, state->index_blk_size); + fprintf(stdout, + "earray_stats.computed.index_blk_size = %" PRIuHSIZE ", state->index_blk_size = %" PRIuHSIZE + "\n", + earray_stats.computed.index_blk_size, state->index_blk_size); TEST_ERROR; } /* end if */ if (earray_stats.stored.ndata_blks != state->ndata_blks) { - HDfprintf(stdout, - "earray_stats.stored.ndata_blks = %" PRIuHSIZE ", state->ndata_blks = %" PRIuHSIZE "\n", - earray_stats.stored.ndata_blks, state->ndata_blks); + fprintf(stdout, + "earray_stats.stored.ndata_blks = %" PRIuHSIZE ", state->ndata_blks = %" PRIuHSIZE "\n", + earray_stats.stored.ndata_blks, state->ndata_blks); TEST_ERROR; } /* end if */ /* Don't compare this currently, it's very hard to compute */ #ifdef NOT_YET if (earray_stats.stored.data_blk_size != state->data_blk_size) { - HDfprintf(stdout, - "earray_stats.stored.data_blk_size = %" PRIuHSIZE ", state->data_blk_size = %" PRIuHSIZE - "\n", - earray_stats.stored.data_blk_size, state->data_blk_size); + fprintf(stdout, + "earray_stats.stored.data_blk_size = %" PRIuHSIZE ", state->data_blk_size = %" PRIuHSIZE "\n", + earray_stats.stored.data_blk_size, state->data_blk_size); TEST_ERROR; } /* end if */ #endif /* NOT_YET */ if (earray_stats.stored.nsuper_blks != state->nsuper_blks) { - HDfprintf(stdout, - "earray_stats.stored.nsuper_blks = %" PRIuHSIZE ", state->nsuper_blks = %" PRIuHSIZE "\n", - earray_stats.stored.nsuper_blks, state->nsuper_blks); + fprintf(stdout, + "earray_stats.stored.nsuper_blks = %" PRIuHSIZE ", state->nsuper_blks = %" PRIuHSIZE "\n", + earray_stats.stored.nsuper_blks, state->nsuper_blks); TEST_ERROR; } /* end if */ /* Don't compare this currently, it's very hard to compute */ #ifdef NOT_YET if (earray_stats.stored.super_blk_size != state->super_blk_size) { - HDfprintf(stdout, - "earray_stats.stored.super_blk_size = %" PRIuHSIZE ", state->super_blk_size = %" PRIuHSIZE - "\n", - earray_stats.stored.super_blk_size, state->super_blk_size); + fprintf(stdout, + "earray_stats.stored.super_blk_size = %" PRIuHSIZE ", state->super_blk_size = %" PRIuHSIZE + "\n", + earray_stats.stored.super_blk_size, state->super_blk_size); TEST_ERROR; } /* end if */ #endif /* NOT_YET */ @@ -493,7 +491,7 @@ create_array(H5F_t *f, const H5EA_create_t *cparam, H5EA_t **ea, haddr_t *ea_add FAIL_STACK_ERROR; if (!H5F_addr_defined(*ea_addr)) TEST_ERROR; - HDmemset(&state, 0, sizeof(state)); + memset(&state, 0, sizeof(state)); state.hdr_size = EA_HDR_SIZE; if (check_stats(*ea, &state)) TEST_ERROR; @@ -524,7 +522,7 @@ verify_cparam(const H5EA_t *ea, const H5EA_create_t *cparam) H5EA_create_t test_cparam; /* Creation parameters for array */ /* Retrieve creation parameters */ - HDmemset(&test_cparam, 0, sizeof(H5EA_create_t)); + memset(&test_cparam, 0, sizeof(H5EA_create_t)); if (H5EA__get_cparam_test(ea, &test_cparam) < 0) FAIL_STACK_ERROR; @@ -620,7 +618,7 @@ test_create(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t H5_ATTR_UNUSE H5EA_create_t test_cparam; /* Creation parameters for array */ /* Set invalid element size */ - HDmemcpy(&test_cparam, cparam, sizeof(test_cparam)); + memcpy(&test_cparam, cparam, sizeof(test_cparam)); test_cparam.raw_elmt_size = 0; H5E_BEGIN_TRY { @@ -637,7 +635,7 @@ test_create(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t H5_ATTR_UNUSE } /* end if */ /* Set invalid max. # of elements bits */ - HDmemcpy(&test_cparam, cparam, sizeof(test_cparam)); + memcpy(&test_cparam, cparam, sizeof(test_cparam)); test_cparam.max_nelmts_bits = 0; H5E_BEGIN_TRY { @@ -653,7 +651,7 @@ test_create(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t H5_ATTR_UNUSE TEST_ERROR; } /* end if */ - HDmemcpy(&test_cparam, cparam, sizeof(test_cparam)); + memcpy(&test_cparam, cparam, sizeof(test_cparam)); test_cparam.max_nelmts_bits = 65; H5E_BEGIN_TRY { @@ -670,7 +668,7 @@ test_create(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t H5_ATTR_UNUSE } /* end if */ /* Set invalid min. # of data block pointers in super blocks */ - HDmemcpy(&test_cparam, cparam, sizeof(test_cparam)); + memcpy(&test_cparam, cparam, sizeof(test_cparam)); test_cparam.sup_blk_min_data_ptrs = 0; H5E_BEGIN_TRY { @@ -685,7 +683,7 @@ test_create(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t H5_ATTR_UNUSE /* Indicate error */ TEST_ERROR; } /* end if */ - HDmemcpy(&test_cparam, cparam, sizeof(test_cparam)); + memcpy(&test_cparam, cparam, sizeof(test_cparam)); test_cparam.sup_blk_min_data_ptrs = 1; H5E_BEGIN_TRY { @@ -700,7 +698,7 @@ test_create(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t H5_ATTR_UNUSE /* Indicate error */ TEST_ERROR; } /* end if */ - HDmemcpy(&test_cparam, cparam, sizeof(test_cparam)); + memcpy(&test_cparam, cparam, sizeof(test_cparam)); test_cparam.sup_blk_min_data_ptrs = 6; H5E_BEGIN_TRY { @@ -717,7 +715,7 @@ test_create(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t H5_ATTR_UNUSE } /* end if */ /* Set invalid min. # of elements per data block */ - HDmemcpy(&test_cparam, cparam, sizeof(test_cparam)); + memcpy(&test_cparam, cparam, sizeof(test_cparam)); test_cparam.data_blk_min_elmts = 0; H5E_BEGIN_TRY { @@ -735,7 +733,7 @@ test_create(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t H5_ATTR_UNUSE /* Set invalid max. # of elements per data block page bits */ if (test_cparam.idx_blk_elmts > 0) { - HDmemcpy(&test_cparam, cparam, sizeof(test_cparam)); + memcpy(&test_cparam, cparam, sizeof(test_cparam)); test_cparam.max_dblk_page_nelmts_bits = (uint8_t)(H5VM_log2_gen((uint64_t)test_cparam.idx_blk_elmts) - 1); H5E_BEGIN_TRY @@ -752,7 +750,7 @@ test_create(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t H5_ATTR_UNUSE TEST_ERROR; } /* end if */ } /* end if */ - HDmemcpy(&test_cparam, cparam, sizeof(test_cparam)); + memcpy(&test_cparam, cparam, sizeof(test_cparam)); test_cparam.max_dblk_page_nelmts_bits = 4; /* corresponds to 16 elements in data block page, which is less than the 64 elements for the default settings */ H5E_BEGIN_TRY @@ -768,7 +766,7 @@ test_create(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t H5_ATTR_UNUSE /* Indicate error */ TEST_ERROR; } /* end if */ - HDmemcpy(&test_cparam, cparam, sizeof(test_cparam)); + memcpy(&test_cparam, cparam, sizeof(test_cparam)); test_cparam.max_dblk_page_nelmts_bits = (uint8_t)(test_cparam.max_nelmts_bits + 1); H5E_BEGIN_TRY { @@ -1300,8 +1298,8 @@ eiter_fw_init(const H5EA_create_t H5_ATTR_UNUSED *cparam, const earray_test_para eiter_fw_t *eiter; /* Forward element iteration object */ /* Allocate space for the element iteration object */ - eiter = (eiter_fw_t *)HDmalloc(sizeof(eiter_fw_t)); - HDassert(eiter); + eiter = (eiter_fw_t *)malloc(sizeof(eiter_fw_t)); + assert(eiter); /* Initialize the element iteration object */ eiter->idx = 0; @@ -1331,7 +1329,7 @@ eiter_fw_next(void *in_eiter) hssize_t ret_val; /* Sanity check */ - HDassert(eiter); + assert(eiter); /* Get the next array index to test */ ret_val = (hssize_t)eiter->idx++; @@ -1358,7 +1356,7 @@ eiter_fw_max(const void *in_eiter) const eiter_fw_t *eiter = (const eiter_fw_t *)in_eiter; /* Sanity check */ - HDassert(eiter); + assert(eiter); /* Return the max. array index used */ return ((hssize_t)(eiter->idx - 1)); @@ -1384,10 +1382,10 @@ eiter_fw_state(void *in_eiter, const H5EA_create_t *cparam, const earray_test_pa eiter_fw_t *eiter = (eiter_fw_t *)in_eiter; /* Sanity check */ - HDassert(eiter); - HDassert(cparam); - HDassert(tparam); - HDassert(state); + assert(eiter); + assert(cparam); + assert(tparam); + assert(state); /* Compute the state of the extensible array */ state->hdr_size = EA_HDR_SIZE; @@ -1441,10 +1439,10 @@ static int eiter_fw_term(void *eiter) { /* Sanity check */ - HDassert(eiter); + assert(eiter); /* Free iteration object */ - HDfree(eiter); + free(eiter); return (0); } /* end eiter_fw_term() */ @@ -1487,8 +1485,8 @@ eiter_rv_init(const H5EA_create_t *cparam, const earray_test_param_t *tparam, hs eiter_rv_t *eiter; /* Reverse element iteration object */ /* Allocate space for the element iteration object */ - eiter = (eiter_rv_t *)HDmalloc(sizeof(eiter_rv_t)); - HDassert(eiter); + eiter = (eiter_rv_t *)malloc(sizeof(eiter_rv_t)); + assert(eiter); /* Initialize reverse iteration info */ eiter->idx = cnt - 1; @@ -1531,7 +1529,7 @@ eiter_rv_next(void *in_eiter) hssize_t ret_val; /* Sanity check */ - HDassert(eiter); + assert(eiter); /* Get the next array index to test */ ret_val = (hssize_t)eiter->idx--; @@ -1558,7 +1556,7 @@ eiter_rv_max(const void *in_eiter) const eiter_rv_t *eiter = (const eiter_rv_t *)in_eiter; /* Sanity check */ - HDassert(eiter); + assert(eiter); /* Return the max. array index used */ return ((hssize_t)eiter->max); @@ -1584,10 +1582,10 @@ eiter_rv_state(void *in_eiter, const H5EA_create_t *cparam, const earray_test_pa eiter_rv_t *eiter = (eiter_rv_t *)in_eiter; /* Sanity check */ - HDassert(eiter); - HDassert(cparam); - HDassert(tparam); - HDassert(state); + assert(eiter); + assert(cparam); + assert(tparam); + assert(state); /* Compute the state of the extensible array */ state->hdr_size = EA_HDR_SIZE; @@ -1666,10 +1664,10 @@ static int eiter_rv_term(void *eiter) { /* Sanity check */ - HDassert(eiter); + assert(eiter); /* Free iteration object */ - HDfree(eiter); + free(eiter); return (0); } /* end eiter_rv_term() */ @@ -1711,12 +1709,12 @@ eiter_rnd_init(const H5EA_create_t H5_ATTR_UNUSED *cparam, const earray_test_par size_t u; /* Local index variable */ /* Allocate space for the element iteration object */ - eiter = (eiter_rnd_t *)HDmalloc(sizeof(eiter_rnd_t)); - HDassert(eiter); + eiter = (eiter_rnd_t *)malloc(sizeof(eiter_rnd_t)); + assert(eiter); /* Allocate space for the array of shuffled indices */ - eiter->idx = (hsize_t *)HDmalloc(sizeof(hsize_t) * (size_t)cnt); - HDassert(eiter->idx); + eiter->idx = (hsize_t *)malloc(sizeof(hsize_t) * (size_t)cnt); + assert(eiter->idx); /* Initialize reverse iteration info */ eiter->max = 0; @@ -1761,7 +1759,7 @@ eiter_rnd_next(void *in_eiter) hssize_t ret_val; /* Sanity check */ - HDassert(eiter); + assert(eiter); /* Get the next array index to test */ ret_val = (hssize_t)eiter->idx[eiter->pos]; @@ -1793,7 +1791,7 @@ eiter_rnd_max(const void *in_eiter) const eiter_rnd_t *eiter = (const eiter_rnd_t *)in_eiter; /* Sanity check */ - HDassert(eiter); + assert(eiter); /* Return the max. array index used */ return ((hssize_t)eiter->max); @@ -1818,14 +1816,14 @@ eiter_rnd_term(void *in_eiter) eiter_rnd_t *eiter = (eiter_rnd_t *)in_eiter; /* Sanity check */ - HDassert(eiter); - HDassert(eiter->idx); + assert(eiter); + assert(eiter->idx); /* Free shuffled index array */ - HDfree(eiter->idx); + free(eiter->idx); /* Free iteration object */ - HDfree(eiter); + free(eiter); return (0); } /* end eiter_rnd_term() */ @@ -1860,12 +1858,12 @@ eiter_rnd2_init(const H5EA_create_t H5_ATTR_UNUSED *cparam, const earray_test_pa size_t u; /* Local index variable */ /* Allocate space for the element iteration object */ - eiter = (eiter_rnd_t *)HDmalloc(sizeof(eiter_rnd_t)); - HDassert(eiter); + eiter = (eiter_rnd_t *)malloc(sizeof(eiter_rnd_t)); + assert(eiter); /* Allocate space for the array of shuffled indices */ - eiter->idx = (hsize_t *)HDmalloc(sizeof(hsize_t) * (size_t)cnt); - HDassert(eiter->idx); + eiter->idx = (hsize_t *)malloc(sizeof(hsize_t) * (size_t)cnt); + assert(eiter->idx); /* Initialize reverse iteration info */ eiter->max = 0; @@ -1877,8 +1875,8 @@ eiter_rnd2_init(const H5EA_create_t H5_ATTR_UNUSED *cparam, const earray_test_pa hsize_t sparse_cnt = (hsize_t)(cnt * EA_RND2_SCALE); /* Sparse range to choose from */ /* Allocate temporary index array */ - tmp_idx = (hsize_t *)HDmalloc(sizeof(hsize_t) * (size_t)sparse_cnt); - HDassert(tmp_idx); + tmp_idx = (hsize_t *)malloc(sizeof(hsize_t) * (size_t)sparse_cnt); + assert(tmp_idx); /* Initialize temporary index array, for shuffling */ for (u = 0; u < (size_t)sparse_cnt; u++) @@ -1894,7 +1892,7 @@ eiter_rnd2_init(const H5EA_create_t H5_ATTR_UNUSED *cparam, const earray_test_pa } /* end for */ /* Release temporary array */ - HDfree(tmp_idx); + free(tmp_idx); } /* end if */ else { for (u = 0; u < (size_t)cnt; u++) @@ -1942,8 +1940,8 @@ eiter_cyc_init(const H5EA_create_t H5_ATTR_UNUSED *cparam, const earray_test_par eiter_cyc_t *eiter; /* Cyclic element iteration object */ /* Allocate space for the element iteration object */ - eiter = (eiter_cyc_t *)HDmalloc(sizeof(eiter_cyc_t)); - HDassert(eiter); + eiter = (eiter_cyc_t *)malloc(sizeof(eiter_cyc_t)); + assert(eiter); /* Initialize reverse iteration info */ eiter->max = 0; @@ -1975,7 +1973,7 @@ eiter_cyc_next(void *in_eiter) hssize_t ret_val; /* Sanity check */ - HDassert(eiter); + assert(eiter); /* Get the next array index to test */ ret_val = (hssize_t)eiter->pos; @@ -2009,7 +2007,7 @@ eiter_cyc_max(const void *in_eiter) const eiter_cyc_t *eiter = (const eiter_cyc_t *)in_eiter; /* Sanity check */ - HDassert(eiter); + assert(eiter); /* Return the max. array index used */ return ((hssize_t)eiter->max); @@ -2034,10 +2032,10 @@ eiter_cyc_term(void *in_eiter) eiter_cyc_t *eiter = (eiter_cyc_t *)in_eiter; /* Sanity check */ - HDassert(eiter); + assert(eiter); /* Free iteration object */ - HDfree(eiter); + free(eiter); return (0); } /* end eiter_cyc_term() */ @@ -2112,7 +2110,7 @@ test_set_elmts(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t *tparam, h TEST_ERROR; /* Verify array state */ - HDmemset(&state, 0, sizeof(state)); + memset(&state, 0, sizeof(state)); state.hdr_size = EA_HDR_SIZE; if (check_stats(ea, &state)) TEST_ERROR; @@ -2286,7 +2284,7 @@ test_skip_elmts(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t *tparam, TEST_ERROR; /* Verify array state */ - HDmemset(&state, 0, sizeof(state)); + memset(&state, 0, sizeof(state)); state.hdr_size = EA_HDR_SIZE; if (check_stats(ea, &state)) TEST_ERROR; @@ -2316,7 +2314,7 @@ test_skip_elmts(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t *tparam, TEST_ERROR; /* Set array state */ - HDmemset(&state, 0, sizeof(state)); + memset(&state, 0, sizeof(state)); state.hdr_size = EA_HDR_SIZE; state.nindex_blks = 1; state.index_blk_size = EA_IBLOCK_SIZE; @@ -2419,7 +2417,7 @@ main(void) fapl = h5_fileaccess(); ExpressMode = GetTestExpress(); if (ExpressMode > 1) - HDprintf("***Express test mode on. Some tests may be skipped\n"); + printf("***Express test mode on. Some tests may be skipped\n"); /* Set the filename to use for this test (dependent on fapl) */ h5_fixname(FILENAME[0], fapl, filename_g, sizeof(filename_g)); @@ -2666,7 +2666,7 @@ main(void) /* Allocate memory for filenames */ for (i = 0; i < N_FILENAMES; i++) { - filename[i] = (char *)HDcalloc(PATH_MAX, sizeof(char)); + filename[i] = (char *)calloc(PATH_MAX, sizeof(char)); } /* Patch filenames */ @@ -2716,7 +2716,7 @@ main(void) h5_clean_files(FILENAME, fapl_id); for (i = 0; i < N_FILENAMES; i++) { - HDfree(filename[i]); + free(filename[i]); } return EXIT_SUCCESS; @@ -2734,7 +2734,7 @@ error: H5CX_pop(FALSE); for (i = 0; i < N_FILENAMES; i++) { - HDfree(filename[i]); + free(filename[i]); } return EXIT_FAILURE; diff --git a/test/enc_dec_plist.c b/test/enc_dec_plist.c index 5b75178..83375f8 100644 --- a/test/enc_dec_plist.c +++ b/test/enc_dec_plist.c @@ -41,7 +41,7 @@ test_encode_decode(hid_t orig_pl, H5F_libver_t low, H5F_libver_t high) TEST_ERROR; /* Allocate the buffer for encoding */ - if (NULL == (temp_buf = (void *)HDmalloc(temp_size))) + if (NULL == (temp_buf = (void *)malloc(temp_size))) TEST_ERROR; /* Encode the property list to the buffer */ @@ -62,7 +62,7 @@ test_encode_decode(hid_t orig_pl, H5F_libver_t low, H5F_libver_t high) /* Free the buffer */ if (temp_buf) - HDfree(temp_buf); + free(temp_buf); #ifndef H5_NO_DEPRECATED_SYMBOLS /* Test H5Pencode1() */ @@ -71,7 +71,7 @@ test_encode_decode(hid_t orig_pl, H5F_libver_t low, H5F_libver_t high) if (H5Pencode1(orig_pl, NULL, &temp_size) < 0) STACK_ERROR; - if (NULL == (temp_buf = (void *)HDmalloc(temp_size))) + if (NULL == (temp_buf = (void *)malloc(temp_size))) TEST_ERROR; if (H5Pencode1(orig_pl, temp_buf, &temp_size) < 0) @@ -87,7 +87,7 @@ test_encode_decode(hid_t orig_pl, H5F_libver_t low, H5F_libver_t high) STACK_ERROR; if (temp_buf) - HDfree(temp_buf); + free(temp_buf); #endif /* H5_NO_DEPRECATED_SYMBOLS */ if ((H5Pclose(fapl)) < 0) @@ -98,7 +98,7 @@ test_encode_decode(hid_t orig_pl, H5F_libver_t low, H5F_libver_t high) error: if (temp_buf) - HDfree(temp_buf); + free(temp_buf); H5E_BEGIN_TRY { @@ -192,7 +192,7 @@ main(void) HDputs(msg); if (VERBOSE_MED) - HDprintf("Encode/Decode DCPLs\n"); + printf("Encode/Decode DCPLs\n"); /******* ENCODE/DECODE DCPLS *****/ TESTING("Default DCPL Encoding/Decoding"); @@ -242,7 +242,7 @@ main(void) /******* ENCODE/DECODE DCPLS *****/ TESTING("DCPL Encoding/Decoding for virtual layout"); if (high < H5F_LIBVER_V110) - HDprintf(" SKIPPED: virtual layout not supported yet\n"); + printf(" SKIPPED: virtual layout not supported yet\n"); else { if ((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0) @@ -679,6 +679,6 @@ main(void) return 0; error: - HDprintf("***** Plist Encode/Decode tests FAILED! *****\n"); + printf("***** Plist Encode/Decode tests FAILED! *****\n"); return 1; } diff --git a/test/enc_dec_plist_cross_platform.c b/test/enc_dec_plist_cross_platform.c index 8aac862..81464cb 100644 --- a/test/enc_dec_plist_cross_platform.c +++ b/test/enc_dec_plist_cross_platform.c @@ -27,7 +27,7 @@ int main(void) { if (VERBOSE_MED) - HDprintf("Encode/Decode property list endianness\n"); + printf("Encode/Decode property list endianness\n"); /******* ENCODE/DECODE DCPLS *****/ TESTING("Default DCPL Encoding/Decoding"); @@ -180,7 +180,7 @@ test_plists(const char *filename_prefix) TEST_ERROR; size_1 = (size_t)HDlseek(fd_1, (HDoff_t)0, SEEK_END); HDlseek(fd_1, (HDoff_t)0, SEEK_SET); - buf_1 = (void *)HDmalloc(size_1); + buf_1 = (void *)malloc(size_1); if (HDread(fd_1, buf_1, size_1) < 0) TEST_ERROR; HDclose(fd_1); @@ -196,7 +196,7 @@ test_plists(const char *filename_prefix) TEST_ERROR; size_2 = (size_t)HDlseek(fd_2, (HDoff_t)0, SEEK_END); HDlseek(fd_2, (HDoff_t)0, SEEK_SET); - buf_2 = (void *)HDmalloc(size_2); + buf_2 = (void *)malloc(size_2); if (HDread(fd_2, buf_2, size_2) < 0) TEST_ERROR; HDclose(fd_2); @@ -217,13 +217,13 @@ test_plists(const char *filename_prefix) if ((H5Pclose(plist_2)) < 0) FAIL_STACK_ERROR; - HDfree(buf_1); - HDfree(buf_2); + free(buf_1); + free(buf_2); } /* end for */ return 1; error: - HDprintf("***** Plist Encode/Decode tests FAILED! *****\n"); + printf("***** Plist Encode/Decode tests FAILED! *****\n"); return -1; } diff --git a/test/enum.c b/test/enum.c index 592236a..3aa2855 100644 --- a/test/enum.c +++ b/test/enum.c @@ -192,8 +192,8 @@ test_conv(hid_t file) for (i = 0; i < (size_t)ds_size[0]; i++) if (data1[i] != data2[i]) { H5_FAILED(); - HDprintf(" 1. data1[%lu]=%d, data2[%lu]=%d (should be same)\n", (unsigned long)i, - (int)(data1[i]), (unsigned long)i, (int)(data2[i])); + printf(" 1. data1[%lu]=%d, data2[%lu]=%d (should be same)\n", (unsigned long)i, + (int)(data1[i]), (unsigned long)i, (int)(data2[i])); goto error; } /* end if */ @@ -204,8 +204,8 @@ test_conv(hid_t file) for (i = 0; i < (size_t)ds_size[0]; i++) if ((short)data1[i] != data_short[i]) { H5_FAILED(); - HDprintf(" 2. data1[%lu]=%d, data_short[%lu]=%d (should be same)\n", (unsigned long)i, - (int)(data1[i]), (unsigned long)i, (int)(data_short[i])); + printf(" 2. data1[%lu]=%d, data_short[%lu]=%d (should be same)\n", (unsigned long)i, + (int)(data1[i]), (unsigned long)i, (int)(data_short[i])); goto error; } /* end if */ @@ -216,8 +216,8 @@ test_conv(hid_t file) for (i = 0; i < (size_t)ds_size[0]; i++) if ((int)data1[i] != (int)data_double[i]) { H5_FAILED(); - HDprintf(" 3. data1[%lu]=%d, data_double[%lu]=%d (should be same)\n", (unsigned long)i, - (int)(data1[i]), (unsigned long)i, (int)(data_double[i])); + printf(" 3. data1[%lu]=%d, data_double[%lu]=%d (should be same)\n", (unsigned long)i, + (int)(data1[i]), (unsigned long)i, (int)(data_double[i])); goto error; } /* end if */ @@ -242,8 +242,8 @@ test_conv(hid_t file) for (i = 0; i < (size_t)ds_size[0]; i++) if ((int)data1[i] != data_int[i]) { H5_FAILED(); - HDprintf(" 4. data1[%lu]=%d, data_int[%lu]=%d (should be same)\n", (unsigned long)i, - (int)(data1[i]), (unsigned long)i, (int)(data_int[i])); + printf(" 4. data1[%lu]=%d, data_int[%lu]=%d (should be same)\n", (unsigned long)i, + (int)(data1[i]), (unsigned long)i, (int)(data_int[i])); goto error; } /* end if */ @@ -268,8 +268,8 @@ test_conv(hid_t file) for (i = 0; i < (size_t)ds_size[0]; i++) if ((int)data1[i] != (int)data_double[i]) { H5_FAILED(); - HDprintf(" 5. data1[%lu]=%d, data_double[%lu]=%d (should be same)\n", (unsigned long)i, - (int)(data1[i]), (unsigned long)i, (int)(data_double[i])); + printf(" 5. data1[%lu]=%d, data_double[%lu]=%d (should be same)\n", (unsigned long)i, + (int)(data1[i]), (unsigned long)i, (int)(data_double[i])); goto error; } /* end if */ @@ -370,8 +370,8 @@ test_tr1(hid_t file) for (i = 0; i < (size_t)ds_size[0]; i++) if (data1[i] != data2[i]) { H5_FAILED(); - HDprintf(" data1[%lu]=%d, data2[%lu]=%d (should be same)\n", (unsigned long)i, (int)(data1[i]), - (unsigned long)i, (int)(data2[i])); + printf(" data1[%lu]=%d, data2[%lu]=%d (should be same)\n", (unsigned long)i, (int)(data1[i]), + (unsigned long)i, (int)(data2[i])); goto error; } @@ -472,8 +472,8 @@ test_tr2(hid_t file) for (i = 0; i < (size_t)ds_size[0]; i++) if (data1[i] != data2[i]) { H5_FAILED(); - HDprintf(" data1[%lu]=%d, data2[%lu]=%d (should be same)\n", (unsigned long)i, (int)(data1[i]), - (unsigned long)i, (int)(data2[i])); + printf(" data1[%lu]=%d, data2[%lu]=%d (should be same)\n", (unsigned long)i, (int)(data1[i]), + (unsigned long)i, (int)(data2[i])); goto error; } @@ -660,7 +660,7 @@ test_funcs(void) H5E_END_TRY; if (ret >= 0) { H5_FAILED(); - HDprintf("Operation not allowed for this type.\n"); + printf("Operation not allowed for this type.\n"); goto error; } /* end if */ @@ -671,7 +671,7 @@ test_funcs(void) H5E_END_TRY; if (size > 0) { H5_FAILED(); - HDprintf("Operation not allowed for this type.\n"); + printf("Operation not allowed for this type.\n"); goto error; } /* end if */ @@ -682,7 +682,7 @@ test_funcs(void) H5E_END_TRY; if (inpad > -1) { H5_FAILED(); - HDprintf("Operation not allowed for this type.\n"); + printf("Operation not allowed for this type.\n"); goto error; } /* end if */ @@ -693,7 +693,7 @@ test_funcs(void) H5E_END_TRY; if (cset > -1) { H5_FAILED(); - HDprintf("Operation not allowed for this type.\n"); + printf("Operation not allowed for this type.\n"); goto error; } /* end if */ @@ -705,7 +705,7 @@ test_funcs(void) H5E_END_TRY; if (ret >= 0) { H5_FAILED(); - HDprintf("Operation not allowed for this type.\n"); + printf("Operation not allowed for this type.\n"); goto error; } /* end if */ @@ -716,7 +716,7 @@ test_funcs(void) H5E_END_TRY; if (ret >= 0) { H5_FAILED(); - HDprintf("Operation not allowed for this type.\n"); + printf("Operation not allowed for this type.\n"); goto error; } /* end if */ diff --git a/test/err_compat.c b/test/err_compat.c index 1f7eb45..73cc797 100644 --- a/test/err_compat.c +++ b/test/err_compat.c @@ -22,7 +22,7 @@ int main(void) { - HDprintf("Test skipped because backward compatibility with v1.6 is NOT configured in\n"); + printf("Test skipped because backward compatibility with v1.6 is NOT configured in\n"); return 0; } #else /* H5_NO_DEPRECATED_SYMBOLS */ @@ -60,7 +60,7 @@ static herr_t user_print1(FILE *stream) { /* Customized way to print errors */ - HDfprintf(stderr, "\n********* Print error stack in customized way *********\n"); + fprintf(stderr, "\n********* Print error stack in customized way *********\n"); if (H5Ewalk1(H5E_WALK_UPWARD, (H5E_walk1_t)custom_print_cb1, stream) < 0) TEST_ERROR; @@ -88,7 +88,7 @@ static herr_t user_print2(hid_t err_stack, FILE *stream) { /* Customized way to print errors */ - HDfprintf(stderr, "\n********* Print error stack in customized way *********\n"); + fprintf(stderr, "\n********* Print error stack in customized way *********\n"); if (H5Ewalk2(err_stack, H5E_WALK_UPWARD, (H5E_walk2_t)custom_print_cb2, stream) < 0) TEST_ERROR; @@ -125,11 +125,11 @@ custom_print_cb1(int n, H5E_error1_t *err_desc, void *client_data) if (NULL == (maj = H5Eget_major(err_desc->maj_num))) TEST_ERROR; - HDfprintf(stream, "%*serror #%03d: %s in %s(): line %u\n", indent, "", n, err_desc->file_name, - err_desc->func_name, err_desc->line); + fprintf(stream, "%*serror #%03d: %s in %s(): line %u\n", indent, "", n, err_desc->file_name, + err_desc->func_name, err_desc->line); - HDfprintf(stream, "%*smajor: %s\n", indent * 2, "", maj); - HDfprintf(stream, "%*sminor: %s\n", indent * 2, "", min); + fprintf(stream, "%*smajor: %s\n", indent * 2, "", maj); + fprintf(stream, "%*sminor: %s\n", indent * 2, "", min); H5free_memory(maj); H5free_memory(min); @@ -172,11 +172,11 @@ custom_print_cb2(int n, H5E_error2_t *err_desc, void *client_data) if (NULL == (maj = H5Eget_major(err_desc->maj_num))) TEST_ERROR; - HDfprintf(stream, "%*serror #%03d: %s in %s(): line %u\n", indent, "", n, err_desc->file_name, - err_desc->func_name, err_desc->line); + fprintf(stream, "%*serror #%03d: %s in %s(): line %u\n", indent, "", n, err_desc->file_name, + err_desc->func_name, err_desc->line); - HDfprintf(stream, "%*smajor: %s\n", indent * 2, "", maj); - HDfprintf(stream, "%*sminor: %s\n", indent * 2, "", min); + fprintf(stream, "%*smajor: %s\n", indent * 2, "", maj); + fprintf(stream, "%*sminor: %s\n", indent * 2, "", min); H5free_memory(maj); H5free_memory(min); @@ -218,8 +218,8 @@ test_error_compat(void) TESTING("error API H5Eset/get_auto"); /* Add a newline and flush so the output file looks nicer */ - HDprintf("\n"); - HDfflush(stdout); + printf("\n"); + fflush(stdout); /* Create the dataspace */ dims[0] = DIM0; @@ -351,8 +351,8 @@ test_h5epush1(hid_t file) TESTING("error API based on data I/O"); /* Add a newline and flush so the output file looks nicer */ - HDprintf("\n"); - HDfflush(stdout); + printf("\n"); + fflush(stdout); /* Create the dataspace */ dims[0] = DIM0; @@ -430,12 +430,12 @@ static herr_t dump_error(void) { /* Print errors in library default way */ - HDfprintf(stderr, "********* Print error stack in HDF5 default way *********\n"); + fprintf(stderr, "********* Print error stack in HDF5 default way *********\n"); if (H5Eprint1(stderr) < 0) TEST_ERROR; /* Customized way to print errors */ - HDfprintf(stderr, "\n********* Print error stack in customized way *********\n"); + fprintf(stderr, "\n********* Print error stack in customized way *********\n"); if (H5Ewalk1(H5E_WALK_UPWARD, custom_print_cb1, stderr) < 0) TEST_ERROR; @@ -464,21 +464,21 @@ main(void) const char *FUNC_main = "main"; int i; - HDfprintf(stderr, " This program tests the Error API compatible with HDF5 v1.6. There are supposed to " - "be some error messages\n"); + fprintf(stderr, " This program tests the Error API compatible with HDF5 v1.6. There are supposed to " + "be some error messages\n"); fapl_id = h5_fileaccess(); /* Set up data arrays */ - if (NULL == (ipoints2_data = (int *)HDcalloc(DIM0 * DIM1, sizeof(int)))) + if (NULL == (ipoints2_data = (int *)calloc(DIM0 * DIM1, sizeof(int)))) TEST_ERROR; - if (NULL == (ipoints2 = (int **)HDcalloc(DIM0, sizeof(ipoints2_data)))) + if (NULL == (ipoints2 = (int **)calloc(DIM0, sizeof(ipoints2_data)))) TEST_ERROR; for (i = 0; i < DIM0; i++) ipoints2[i] = ipoints2_data + (i * DIM1); - if (NULL == (icheck2_data = (int *)HDcalloc(DIM0 * DIM1, sizeof(int)))) + if (NULL == (icheck2_data = (int *)calloc(DIM0 * DIM1, sizeof(int)))) TEST_ERROR; - if (NULL == (icheck2 = (int **)HDcalloc(DIM0, sizeof(icheck2_data)))) + if (NULL == (icheck2 = (int **)calloc(DIM0, sizeof(icheck2_data)))) TEST_ERROR; for (i = 0; i < DIM0; i++) icheck2[i] = icheck2_data + (i * DIM1); @@ -518,19 +518,19 @@ main(void) TEST_ERROR; h5_clean_files(FILENAME, fapl_id); - HDfree(ipoints2); - HDfree(ipoints2_data); - HDfree(icheck2); - HDfree(icheck2_data); + free(ipoints2); + free(ipoints2_data); + free(icheck2); + free(icheck2_data); - HDprintf("All error API tests passed.\n"); + printf("All error API tests passed.\n"); return EXIT_SUCCESS; error: - HDfree(ipoints2); - HDfree(ipoints2_data); - HDfree(icheck2); - HDfree(icheck2_data); + free(ipoints2); + free(ipoints2_data); + free(icheck2); + free(icheck2_data); H5E_BEGIN_TRY { @@ -539,7 +539,7 @@ error: } H5E_END_TRY - HDprintf("***** ERROR TEST FAILED! *****\n"); + printf("***** ERROR TEST FAILED! *****\n"); return EXIT_FAILURE; } #endif /* H5_NO_DEPRECATED_SYMBOLS */ diff --git a/test/error_test.c b/test/error_test.c index 3aa4970..739cbf5 100644 --- a/test/error_test.c +++ b/test/error_test.c @@ -23,7 +23,7 @@ int main(void) { - HDfprintf(stderr, "Test skipped because backward compatibility with v1.6 is configured in\n"); + fprintf(stderr, "Test skipped because backward compatibility with v1.6 is configured in\n"); return 0; } #else /* H5_USE_16_API */ @@ -100,7 +100,7 @@ test_error(hid_t file) H5E_auto2_t old_func; void *old_data = NULL; - HDfprintf(stderr, "\nTesting error API based on data I/O\n"); + fprintf(stderr, "\nTesting error API based on data I/O\n"); /* Create the data space */ dims[0] = DIM0; @@ -184,9 +184,9 @@ init_error(void) char *msg = NULL; H5E_type_t msg_type; - if (NULL == (cls_name = (char *)HDmalloc(HDstrlen(ERR_CLS_NAME) + 1))) + if (NULL == (cls_name = (char *)malloc(HDstrlen(ERR_CLS_NAME) + 1))) TEST_ERROR; - if (NULL == (msg = (char *)HDmalloc(HDstrlen(ERR_MIN_SUBROUTINE_MSG) + 1))) + if (NULL == (msg = (char *)malloc(HDstrlen(ERR_MIN_SUBROUTINE_MSG) + 1))) TEST_ERROR; if ((ERR_CLS = H5Eregister_class(ERR_CLS_NAME, PROG_NAME, PROG_VERS)) < 0) @@ -226,16 +226,16 @@ init_error(void) if ((ERR_CLS2 = H5Eregister_class(ERR_CLS2_NAME, PROG2_NAME, PROG_VERS)) < 0) TEST_ERROR; - HDfree(cls_name); - HDfree(msg); + free(cls_name); + free(msg); return 0; error: if (cls_name) - HDfree(cls_name); + free(cls_name); if (msg) - HDfree(msg); + free(msg); return -1; } /* end init_error() */ @@ -329,9 +329,9 @@ test_long_desc(void) const char *test_FUNC = "test_long_desc"; /* Allocate space for the error description info */ - if (NULL == (long_desc = (char *)HDmalloc(LONG_DESC_SIZE))) + if (NULL == (long_desc = (char *)malloc(LONG_DESC_SIZE))) TEST_ERROR; - if (NULL == (full_desc = (char *)HDmalloc(LONG_DESC_SIZE + 128))) + if (NULL == (full_desc = (char *)malloc(LONG_DESC_SIZE + 128))) TEST_ERROR; /* Create the long part of the error description */ @@ -361,16 +361,16 @@ test_long_desc(void) if (H5Eclear2(H5E_DEFAULT) < 0) TEST_ERROR; - HDfree(long_desc); - HDfree(full_desc); + free(long_desc); + free(full_desc); return 0; error: if (long_desc) - HDfree(long_desc); + free(long_desc); if (full_desc) - HDfree(full_desc); + free(full_desc); return -1; } /* end test_long_desc() */ @@ -390,12 +390,12 @@ static herr_t dump_error(hid_t estack) { /* Print errors in library default way */ - HDfprintf(stderr, "********* Print error stack in HDF5 default way *********\n"); + fprintf(stderr, "********* Print error stack in HDF5 default way *********\n"); if (H5Eprint2(estack, stderr) < 0) TEST_ERROR; /* Customized way to print errors */ - HDfprintf(stderr, "\n********* Print error stack in customized way *********\n"); + fprintf(stderr, "\n********* Print error stack in customized way *********\n"); if (H5Ewalk2(estack, H5E_WALK_UPWARD, custom_print_cb, stderr) < 0) TEST_ERROR; @@ -434,11 +434,11 @@ custom_print_cb(unsigned n, const H5E_error2_t *err_desc, void *client_data) if (H5Eget_msg(err_desc->min_num, NULL, min, MSG_SIZE) < 0) TEST_ERROR; - HDfprintf(stream, "%*serror #%03d: %s in %s(): line %u\n", indent, "", n, err_desc->file_name, - err_desc->func_name, err_desc->line); - HDfprintf(stream, "%*sclass: %s\n", indent * 2, "", cls); - HDfprintf(stream, "%*smajor: %s\n", indent * 2, "", maj); - HDfprintf(stream, "%*sminor: %s\n", indent * 2, "", min); + fprintf(stream, "%*serror #%03d: %s in %s(): line %u\n", indent, "", n, err_desc->file_name, + err_desc->func_name, err_desc->line); + fprintf(stream, "%*sclass: %s\n", indent * 2, "", cls); + fprintf(stream, "%*smajor: %s\n", indent * 2, "", maj); + fprintf(stream, "%*sminor: %s\n", indent * 2, "", min); return 0; @@ -744,7 +744,7 @@ test_filter_error(const char *fname, hid_t fapl) hid_t dataset = -1; int buf[20]; - HDfprintf(stderr, "\nTesting error message during data reading when filter isn't registered\n"); + fprintf(stderr, "\nTesting error message during data reading when filter isn't registered\n"); /* Open the file */ if ((file = H5Fopen(pathname, H5F_ACC_RDONLY, fapl)) < 0) @@ -793,7 +793,7 @@ main(void) if (env_h5_drvr == NULL) env_h5_drvr = "nomatch"; - HDfprintf(stderr, " This program tests the Error API. There're supposed to be some error messages\n"); + fprintf(stderr, " This program tests the Error API. There're supposed to be some error messages\n"); /* Initialize errors */ if (init_error() < 0) @@ -803,16 +803,16 @@ main(void) TEST_ERROR; /* Set up data arrays */ - if (NULL == (ipoints2_data = (int *)HDcalloc(DIM0 * DIM1, sizeof(int)))) + if (NULL == (ipoints2_data = (int *)calloc(DIM0 * DIM1, sizeof(int)))) TEST_ERROR; - if (NULL == (ipoints2 = (int **)HDcalloc(DIM0, sizeof(ipoints2_data)))) + if (NULL == (ipoints2 = (int **)calloc(DIM0, sizeof(ipoints2_data)))) TEST_ERROR; for (i = 0; i < DIM0; i++) ipoints2[i] = ipoints2_data + (i * DIM1); - if (NULL == (icheck2_data = (int *)HDcalloc(DIM0 * DIM1, sizeof(int)))) + if (NULL == (icheck2_data = (int *)calloc(DIM0 * DIM1, sizeof(int)))) TEST_ERROR; - if (NULL == (icheck2 = (int **)HDcalloc(DIM0, sizeof(icheck2_data)))) + if (NULL == (icheck2 = (int **)calloc(DIM0, sizeof(icheck2_data)))) TEST_ERROR; for (i = 0; i < DIM0; i++) icheck2[i] = icheck2_data + (i * DIM1); @@ -895,21 +895,21 @@ main(void) h5_clean_files(FILENAME, fapl); - HDfree(ipoints2); - HDfree(ipoints2_data); - HDfree(icheck2); - HDfree(icheck2_data); + free(ipoints2); + free(ipoints2_data); + free(icheck2); + free(icheck2_data); - HDfprintf(stderr, "\nAll error API tests passed.\n"); + fprintf(stderr, "\nAll error API tests passed.\n"); return 0; error: - HDfree(ipoints2); - HDfree(ipoints2_data); - HDfree(icheck2); - HDfree(icheck2_data); + free(ipoints2); + free(ipoints2_data); + free(icheck2); + free(icheck2_data); - HDfprintf(stderr, "\n***** ERROR TEST FAILED (real problem)! *****\n"); + fprintf(stderr, "\n***** ERROR TEST FAILED (real problem)! *****\n"); return 1; } #endif /* H5_USE_16_API */ diff --git a/test/event_set.c b/test/event_set.c index df6b8cb..9340457 100644 --- a/test/event_set.c +++ b/test/event_set.c @@ -698,9 +698,9 @@ main(void) /* Report status */ HDputs("All event set tests passed."); - HDexit(EXIT_SUCCESS); + exit(EXIT_SUCCESS); error: HDputs("***** EVENT SET TESTS FAILED *****"); - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); } /* end main() */ diff --git a/test/evict_on_close.c b/test/evict_on_close.c index 7efe0e8..89a1ae0 100644 --- a/test/evict_on_close.c +++ b/test/evict_on_close.c @@ -151,7 +151,7 @@ generate_eoc_test_file(hid_t fapl_id) TEST_ERROR; /* Create a data buffer for dataset writes */ - if (NULL == (data = (int *)HDcalloc(NELEMENTS, sizeof(int)))) + if (NULL == (data = (int *)calloc(NELEMENTS, sizeof(int)))) TEST_ERROR; /* Create file */ @@ -183,7 +183,7 @@ generate_eoc_test_file(hid_t fapl_id) char subgroup_name[SUBGROUP_NAME_SIZE]; /* Create the group name */ - HDmemset(subgroup_name, '\0', SUBGROUP_NAME_SIZE); + memset(subgroup_name, '\0', SUBGROUP_NAME_SIZE); if (HDsnprintf(subgroup_name, (size_t)(SUBGROUP_NAME_SIZE - 1), "%d", i) < 0) TEST_ERROR; @@ -278,7 +278,7 @@ generate_eoc_test_file(hid_t fapl_id) char subgroup_name[SUBGROUP_NAME_SIZE]; /* Create the group name */ - HDmemset(subgroup_name, '\0', SUBGROUP_NAME_SIZE); + memset(subgroup_name, '\0', SUBGROUP_NAME_SIZE); if (HDsnprintf(subgroup_name, (size_t)(SUBGROUP_NAME_SIZE - 1), "%d", i) < 0) TEST_ERROR; @@ -546,7 +546,7 @@ generate_eoc_test_file(hid_t fapl_id) if (H5Pclose(fapl_copy_id) < 0) TEST_ERROR; - HDfree(data); + free(data); PASSED(); return fid; @@ -564,7 +564,7 @@ error: } H5E_END_TRY; - HDfree(data); + free(data); H5_FAILED(); return -1; @@ -601,10 +601,10 @@ check_group_layout(hid_t fid, const char *group_name) before = file_ptr->shared->cache->index_len; #ifdef EOC_MANUAL_INSPECTION - HDprintf("\nCACHE BEFORE GROUP OPEN:\n"); + printf("\nCACHE BEFORE GROUP OPEN:\n"); if (H5AC_dump_cache(file_ptr) < 0) TEST_ERROR; - HDprintf("NUMBER OF CACHE ENTRIES: %u\n", before); + printf("NUMBER OF CACHE ENTRIES: %u\n", before); #endif /* Open the main group and get its tag */ @@ -619,7 +619,7 @@ check_group_layout(hid_t fid, const char *group_name) char subgroup_name[SUBGROUP_NAME_SIZE]; /* Create the group name */ - HDmemset(subgroup_name, '\0', SUBGROUP_NAME_SIZE); + memset(subgroup_name, '\0', SUBGROUP_NAME_SIZE); if (HDsnprintf(subgroup_name, (size_t)(SUBGROUP_NAME_SIZE - 1), "%d", i) < 0) TEST_ERROR; @@ -641,11 +641,11 @@ check_group_layout(hid_t fid, const char *group_name) during = file_ptr->shared->cache->index_len; #ifdef EOC_MANUAL_INSPECTION - HDprintf("\nCACHE AFTER OPENING GROUPS (WHILE OPEN):\n"); + printf("\nCACHE AFTER OPENING GROUPS (WHILE OPEN):\n"); if (H5AC_dump_cache(file_ptr) < 0) TEST_ERROR; - HDprintf("MAIN GROUP TAG: %#X\n", tag1); - HDprintf("NUMBER OF CACHE ENTRIES: %u\n", during); + printf("MAIN GROUP TAG: %#X\n", tag1); + printf("NUMBER OF CACHE ENTRIES: %u\n", during); #endif /* Close the main group */ @@ -656,10 +656,10 @@ check_group_layout(hid_t fid, const char *group_name) after = file_ptr->shared->cache->index_len; #ifdef EOC_MANUAL_INSPECTION - HDprintf("\nCACHE AFTER CLOSING GROUPS:\n"); + printf("\nCACHE AFTER CLOSING GROUPS:\n"); if (H5AC_dump_cache(file_ptr) < 0) TEST_ERROR; - HDprintf("NUMBER OF CACHE ENTRIES: %u\n", after); + printf("NUMBER OF CACHE ENTRIES: %u\n", after); #endif /* Ensure that the cache does not contain entries with the tag */ @@ -712,17 +712,17 @@ check_dset_scheme(hid_t fid, const char *dset_name) TEST_ERROR; /* Create the data buffer */ - if (NULL == (data = (int *)HDcalloc(NELEMENTS, sizeof(int)))) + if (NULL == (data = (int *)calloc(NELEMENTS, sizeof(int)))) TEST_ERROR; /* Record the number of cache entries */ before = file_ptr->shared->cache->index_len; #ifdef EOC_MANUAL_INSPECTION - HDprintf("\nCACHE BEFORE DATASET OPEN:\n"); + printf("\nCACHE BEFORE DATASET OPEN:\n"); if (H5AC_dump_cache(file_ptr) < 0) TEST_ERROR; - HDprintf("NUMBER OF CACHE ENTRIES: %u\n", before); + printf("NUMBER OF CACHE ENTRIES: %u\n", before); #endif /* Open dataset and get the metadata tag */ @@ -742,11 +742,11 @@ check_dset_scheme(hid_t fid, const char *dset_name) during = file_ptr->shared->cache->index_len; #ifdef EOC_MANUAL_INSPECTION - HDprintf("\nCACHE AFTER DATA READ (WHILE OPEN):\n"); + printf("\nCACHE AFTER DATA READ (WHILE OPEN):\n"); if (H5AC_dump_cache(file_ptr) < 0) TEST_ERROR; - HDprintf("TAG: %#X\n", tag); - HDprintf("NUMBER OF CACHE ENTRIES: %u\n", during); + printf("TAG: %#X\n", tag); + printf("NUMBER OF CACHE ENTRIES: %u\n", during); #endif /* Close the dataset */ @@ -757,10 +757,10 @@ check_dset_scheme(hid_t fid, const char *dset_name) after = file_ptr->shared->cache->index_len; #ifdef EOC_MANUAL_INSPECTION - HDprintf("\nCACHE AFTER DATASET CLOSE:\n"); + printf("\nCACHE AFTER DATASET CLOSE:\n"); if (H5AC_dump_cache(file_ptr) < 0) TEST_ERROR; - HDprintf("NUMBER OF CACHE ENTRIES: %u\n", after); + printf("NUMBER OF CACHE ENTRIES: %u\n", after); #endif /* Ensure that the cache does not contain entries with the tag */ @@ -771,7 +771,7 @@ check_dset_scheme(hid_t fid, const char *dset_name) if (before != after || before == during) TEST_ERROR; - HDfree(data); + free(data); PASSED(); return SUCCEED; @@ -887,7 +887,7 @@ main(void) hid_t fid = -1; /* file ID */ unsigned nerrors = 0; /* number of test errors */ - HDprintf("Testing evict-on-close cache behavior\n"); + printf("Testing evict-on-close cache behavior\n"); /* Initialize */ h5_reset(); @@ -955,13 +955,13 @@ main(void) if (nerrors) goto error; - HDprintf("All evict-on-close tests passed.\n"); + printf("All evict-on-close tests passed.\n"); - HDexit(EXIT_SUCCESS); + exit(EXIT_SUCCESS); error: - HDprintf("***** %u evict-on-close test%s FAILED! *****\n", nerrors, nerrors > 1 ? "S" : ""); + printf("***** %u evict-on-close test%s FAILED! *****\n", nerrors, nerrors > 1 ? "S" : ""); h5_delete_all_test_files(FILENAMES, fapl_id); H5E_BEGIN_TRY @@ -971,7 +971,7 @@ error: } H5E_END_TRY; - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); } /* end main() */ @@ -1035,7 +1035,7 @@ main(void) { unsigned nerrors = 0; /* number of test errors */ - HDprintf("Testing evict-on-close cache behavior\n"); + printf("Testing evict-on-close cache behavior\n"); /* Initialize */ h5_reset(); @@ -1046,16 +1046,16 @@ main(void) if (nerrors) goto error; - HDprintf("All evict-on-close tests passed.\n"); - HDprintf("Note that EoC is not supported under parallel so most tests are skipped.\n"); + printf("All evict-on-close tests passed.\n"); + printf("Note that EoC is not supported under parallel so most tests are skipped.\n"); - HDexit(EXIT_SUCCESS); + exit(EXIT_SUCCESS); error: - HDprintf("***** %u evict-on-close test%s FAILED! *****\n", nerrors, nerrors > 1 ? "S" : ""); + printf("***** %u evict-on-close test%s FAILED! *****\n", nerrors, nerrors > 1 ? "S" : ""); - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); } /* main() - parallel */ diff --git a/test/extend.c b/test/extend.c index 33d68b7..40e90a6 100644 --- a/test/extend.c +++ b/test/extend.c @@ -115,10 +115,10 @@ write_data(const char *msg, hid_t file, const char *name, hid_t cparms, hid_t me for (k = 0; k < N2X; k++) for (m = 0; m < N2Y; m++) if (buf2[k][m] != buf1[(i % 2) * N2X + k][(j % 2) * N2Y + m]) { - HDprintf(" i=%d, j=%d, k=%d, m=%d\n", i, j, k, m); - HDprintf(" buf2[%d][%d]=%d\n", k, m, buf2[k][m]); - HDprintf(" buf1[%d][%d]=%d\n", (i % 2) * N2X + k, (j % 2) * N2Y + m, - buf1[(i % 2) * N2X + k][(j % 2) * N2Y + m]); + printf(" i=%d, j=%d, k=%d, m=%d\n", i, j, k, m); + printf(" buf2[%d][%d]=%d\n", k, m, buf2[k][m]); + printf(" buf1[%d][%d]=%d\n", (i % 2) * N2X + k, (j % 2) * N2Y + m, + buf1[(i % 2) * N2X + k][(j % 2) * N2Y + m]); TEST_ERROR; } /* end if */ } /* end for */ @@ -218,10 +218,10 @@ write_data_deprec(const char *msg, hid_t file, const char *name, hid_t cparms, h for (k = 0; k < N2X; k++) for (m = 0; m < N2Y; m++) if (buf2[k][m] != buf1[(i % 2) * N2X + k][(j % 2) * N2Y + m]) { - HDprintf(" i=%d, j=%d, k=%d, m=%d\n", i, j, k, m); - HDprintf(" buf2[%d][%d]=%d\n", k, m, buf2[k][m]); - HDprintf(" buf1[%d][%d]=%d\n", (i % 2) * N2X + k, (j % 2) * N2Y + m, - buf1[(i % 2) * N2X + k][(j % 2) * N2Y + m]); + printf(" i=%d, j=%d, k=%d, m=%d\n", i, j, k, m); + printf(" buf2[%d][%d]=%d\n", k, m, buf2[k][m]); + printf(" buf1[%d][%d]=%d\n", (i % 2) * N2X + k, (j % 2) * N2Y + m, + buf1[(i % 2) * N2X + k][(j % 2) * N2Y + m]); TEST_ERROR; } /* end if */ } /* end for */ @@ -271,16 +271,16 @@ main(void) fapl = h5_fileaccess(); /* Initialize buffer and space */ - if (NULL == (buf1_data = (int *)HDcalloc(N1X * N1Y, sizeof(int)))) + if (NULL == (buf1_data = (int *)calloc(N1X * N1Y, sizeof(int)))) TEST_ERROR; - if (NULL == (buf1 = (int **)HDcalloc(N1X, sizeof(buf1_data)))) + if (NULL == (buf1 = (int **)calloc(N1X, sizeof(buf1_data)))) TEST_ERROR; for (i = 0; i < N1X; i++) buf1[i] = buf1_data + (i * N1Y); - if (NULL == (buf2_data = (int *)HDcalloc(N2X * N2Y, sizeof(int)))) + if (NULL == (buf2_data = (int *)calloc(N2X * N2Y, sizeof(int)))) TEST_ERROR; - if (NULL == (buf2 = (int **)HDcalloc(N2X, sizeof(buf2_data)))) + if (NULL == (buf2 = (int **)calloc(N2X, sizeof(buf2_data)))) TEST_ERROR; for (i = 0; i < N2X; i++) buf2[i] = buf2_data + (i * N2Y); @@ -338,27 +338,27 @@ main(void) nerrors += (h5_verify_cached_stabs(FILENAME, fapl) < 0 ? 1 : 0); if (nerrors) { - HDprintf("***** %d FAILURE%s! *****\n", nerrors, (1 == nerrors) ? "" : "S"); - HDexit(EXIT_FAILURE); + printf("***** %d FAILURE%s! *****\n", nerrors, (1 == nerrors) ? "" : "S"); + exit(EXIT_FAILURE); } /* end if */ - HDprintf("All extend tests passed.\n"); + printf("All extend tests passed.\n"); h5_cleanup(FILENAME, fapl); - HDfree(buf1); - HDfree(buf1_data); - HDfree(buf2); - HDfree(buf2_data); + free(buf1); + free(buf1_data); + free(buf2); + free(buf2_data); - HDexit(EXIT_SUCCESS); + exit(EXIT_SUCCESS); error: - HDfree(buf1); - HDfree(buf1_data); - HDfree(buf2); - HDfree(buf2_data); + free(buf1); + free(buf1_data); + free(buf2); + free(buf2_data); - HDprintf("*** One or more extend tests failed ***\n"); - HDexit(EXIT_FAILURE); + printf("*** One or more extend tests failed ***\n"); + exit(EXIT_FAILURE); } /* end main() */ diff --git a/test/external.c b/test/external.c index d0d7f60..9914c5b 100644 --- a/test/external.c +++ b/test/external.c @@ -53,8 +53,8 @@ files_have_same_contents(const char *name1, const char *name2) /* Loop until files are empty or we encounter a problem */ while (1) { - HDmemset(buf1, 0, sizeof(buf1)); - HDmemset(buf2, 0, sizeof(buf2)); + memset(buf1, 0, sizeof(buf1)); + memset(buf2, 0, sizeof(buf2)); n1 = HDread(fd1, buf1, sizeof(buf1)); if (n1 < 0 || (size_t)n1 > sizeof(buf1)) @@ -71,7 +71,7 @@ files_have_same_contents(const char *name1, const char *name2) break; } - if (HDmemcmp(buf1, buf2, (size_t)n1) != 0) + if (memcmp(buf1, buf2, (size_t)n1) != 0) break; } /* end while */ @@ -149,7 +149,7 @@ test_non_extendible(hid_t file) if (1 != n) { H5_FAILED(); HDputs(" Returned external count is wrong."); - HDprintf(" got: %d\n ans: 1\n", n); + printf(" got: %d\n ans: 1\n", n); goto error; } @@ -159,13 +159,13 @@ test_non_extendible(hid_t file) if (file_offset != 0) { H5_FAILED(); HDputs(" Wrong file offset."); - HDprintf(" got: %lu\n ans: 0\n", (unsigned long)file_offset); + printf(" got: %lu\n ans: 0\n", (unsigned long)file_offset); goto error; } if (file_size != (max_size[0] * sizeof(int))) { H5_FAILED(); HDputs(" Wrong file size."); - HDprintf(" got: %" PRIuHSIZE "\n ans: %" PRIuHSIZE "\n", file_size, max_size[0] * sizeof(int)); + printf(" got: %" PRIuHSIZE "\n ans: %" PRIuHSIZE "\n", file_size, max_size[0] * sizeof(int)); goto error; } @@ -418,7 +418,7 @@ test_unlimited(hid_t file) if (1 != n) { H5_FAILED(); HDputs(" Returned external count is wrong."); - HDprintf(" got: %d\n ans: 1\n", n); + printf(" got: %d\n ans: 1\n", n); goto error; } /* end if */ @@ -427,13 +427,13 @@ test_unlimited(hid_t file) if (file_offset != 0) { H5_FAILED(); HDputs(" Wrong file offset."); - HDprintf(" got: %lu\n ans: 0\n", (unsigned long)file_offset); + printf(" got: %lu\n ans: 0\n", (unsigned long)file_offset); goto error; } if (H5F_UNLIMITED != file_size) { H5_FAILED(); HDputs(" Wrong file size."); - HDprintf(" got: %lu\n ans: INF\n", (unsigned long)file_size); + printf(" got: %lu\n ans: INF\n", (unsigned long)file_size); goto error; } @@ -482,13 +482,13 @@ add_external_files(hid_t dcpl_id, unsigned int n_external_files, off_t offset, h } for (i = 0; i < n_external_files; i++) { if (HDsnprintf(exname, AEF_EXNAME_MAX_LEN, "ext%d.data", i + 1) > AEF_EXNAME_MAX_LEN) { - HDfprintf(stderr, "External file %d overflows name buffer\n", i + 1); - HDfflush(stderr); + fprintf(stderr, "External file %d overflows name buffer\n", i + 1); + fflush(stderr); return -1; } if (H5Pset_external(dcpl_id, exname, offset, max_ext_size) < 0) { - HDfprintf(stderr, "Problem adding external file %s\n", exname); - HDfflush(stderr); + fprintf(stderr, "Problem adding external file %s\n", exname); + fflush(stderr); return -1; } } @@ -756,7 +756,7 @@ test_read_file_set(hid_t fapl) FAIL_STACK_ERROR; /* Read the entire dataset */ - HDmemset(whole, 0, sizeof(whole)); + memset(whole, 0, sizeof(whole)); if (H5Dread(dset, H5T_NATIVE_INT, space, space, H5P_DEFAULT, whole) < 0) FAIL_STACK_ERROR; @@ -774,7 +774,7 @@ test_read_file_set(hid_t fapl) FAIL_STACK_ERROR; /* Read */ - HDmemset(whole, 0, sizeof(whole)); + memset(whole, 0, sizeof(whole)); if (H5Dread(dset, H5T_NATIVE_INT, hs_space, hs_space, H5P_DEFAULT, whole) < 0) FAIL_STACK_ERROR; @@ -1004,7 +1004,7 @@ test_path_absolute(hid_t fapl) FAIL_STACK_ERROR; /* Read the entire dataset and compare with the original */ - HDmemset(whole, 0, sizeof(whole)); + memset(whole, 0, sizeof(whole)); if (H5Dread(dset, H5T_NATIVE_INT, space, space, H5P_DEFAULT, whole) < 0) FAIL_STACK_ERROR; for (i = 0; i < TOTAL_SIZE; i++) @@ -1094,7 +1094,7 @@ test_path_relative(hid_t fapl) FAIL_STACK_ERROR; /* Read the entire dataset and compare with the original */ - HDmemset(whole, 0, sizeof(whole)); + memset(whole, 0, sizeof(whole)); if (H5Dread(dset, H5T_NATIVE_INT, space, space, H5P_DEFAULT, whole) < 0) FAIL_STACK_ERROR; for (i = 0; i < TOTAL_SIZE; i++) @@ -1218,7 +1218,7 @@ test_path_relative_cwd(hid_t fapl) FAIL_PUTS_ERROR("reopening the dataset with a different efile_prefix succeeded"); /* Read the entire dataset and compare with the original */ - HDmemset(whole, 0, sizeof(whole)); + memset(whole, 0, sizeof(whole)); if (H5Dread(dset, H5T_NATIVE_INT, space, space, H5P_DEFAULT, whole) < 0) FAIL_STACK_ERROR; for (i = 0; i < TOTAL_SIZE; i++) @@ -1255,7 +1255,7 @@ test_path_relative_cwd(hid_t fapl) FAIL_PUTS_ERROR("reopening the dataset with a different efile_prefix succeeded"); /* Read the entire dataset and compare with the original */ - HDmemset(whole, 0, sizeof(whole)); + memset(whole, 0, sizeof(whole)); if (H5Dread(dset, H5T_NATIVE_INT, space, space, H5P_DEFAULT, whole) < 0) FAIL_STACK_ERROR; for (i = 0; i < TOTAL_SIZE; i++) @@ -1362,7 +1362,7 @@ test_h5d_get_access_plist(hid_t fapl_id) FAIL_STACK_ERROR; /* Check the value for the external prefix */ - if ((buffer = (char *)HDcalloc((size_t)64, sizeof(char))) == NULL) + if ((buffer = (char *)calloc((size_t)64, sizeof(char))) == NULL) TEST_ERROR; if (H5Pget_efile_prefix(dapl_id, buffer, (size_t)64) < 0) FAIL_STACK_ERROR; @@ -1370,7 +1370,7 @@ test_h5d_get_access_plist(hid_t fapl_id) FAIL_PUTS_ERROR("external file prefix from dapl incorrect"); /* Close everything */ - HDfree(buffer); + free(buffer); if (H5Sclose(sid) < 0) FAIL_STACK_ERROR; if (H5Dclose(did) < 0) @@ -1387,7 +1387,7 @@ test_h5d_get_access_plist(hid_t fapl_id) error: if (buffer) - HDfree(buffer); + free(buffer); H5E_BEGIN_TRY { H5Dclose(did); @@ -1527,6 +1527,6 @@ error: } H5E_END_TRY; nerrors = MAX(1, nerrors); - HDprintf("%d TEST%s FAILED.\n", nerrors, 1 == nerrors ? "" : "s"); + printf("%d TEST%s FAILED.\n", nerrors, 1 == nerrors ? "" : "s"); return EXIT_FAILURE; } /* end main() */ diff --git a/test/external_common.c b/test/external_common.c index 7d72605..25bf43e 100644 --- a/test/external_common.c +++ b/test/external_common.c @@ -46,7 +46,7 @@ reset_raw_data_files(hbool_t is_env) /* Set up garbage buffer */ garbage_count = N_EXT_FILES * GARBAGE_PER_FILE; - if (NULL == (garbage = (uint8_t *)HDcalloc(garbage_count, sizeof(uint8_t)))) + if (NULL == (garbage = (uint8_t *)calloc(garbage_count, sizeof(uint8_t)))) goto error; for (i = 0; i < garbage_count; i++) garbage[i] = 0xFF; @@ -113,13 +113,13 @@ reset_raw_data_files(hbool_t is_env) HDclose(fd); } /* end for */ - HDfree(garbage); + free(garbage); return SUCCEED; error: if (fd) HDclose(fd); if (garbage) - HDfree(garbage); + free(garbage); return FAIL; } diff --git a/test/external_env.c b/test/external_env.c index 3718dc2..da7715c 100644 --- a/test/external_env.c +++ b/test/external_env.c @@ -94,7 +94,7 @@ test_path_env(hid_t fapl) FAIL_STACK_ERROR; /* Read the entire dataset and compare with the original */ - HDmemset(whole, 0, sizeof(whole)); + memset(whole, 0, sizeof(whole)); if (H5Dread(dset, H5T_NATIVE_INT, space, space, H5P_DEFAULT, whole) < 0) FAIL_STACK_ERROR; for (i = 0; i < TOTAL_SIZE; i++) @@ -214,6 +214,6 @@ error: } H5E_END_TRY; nerrors = MAX(1, nerrors); - HDprintf("%d TEST%s FAILED.\n", nerrors, 1 == nerrors ? "" : "s"); + printf("%d TEST%s FAILED.\n", nerrors, 1 == nerrors ? "" : "s"); return EXIT_FAILURE; } /* end main() */ diff --git a/test/farray.c b/test/farray.c index b772ce3..c4627dc 100644 --- a/test/farray.c +++ b/test/farray.c @@ -116,7 +116,7 @@ static herr_t init_cparam(H5FA_create_t *cparam, farray_test_param_t *tparam) { /* Wipe out background */ - HDmemset(cparam, 0, sizeof(*cparam)); + memset(cparam, 0, sizeof(*cparam)); cparam->cls = H5FA_CLS_TEST; cparam->raw_elmt_size = ELMT_SIZE; @@ -177,20 +177,20 @@ check_stats(const H5FA_t *fa, const farray_state_t *state) /* Compare information */ if (farray_stats.hdr_size != state->hdr_size) { - HDfprintf(stdout, "farray_stats.hdr_size = %" PRIuHSIZE ", state->hdr_size = %" PRIuHSIZE "\n", - farray_stats.hdr_size, state->hdr_size); + fprintf(stdout, "farray_stats.hdr_size = %" PRIuHSIZE ", state->hdr_size = %" PRIuHSIZE "\n", + farray_stats.hdr_size, state->hdr_size); TEST_ERROR; } if (farray_stats.dblk_size != state->dblk_size) { - HDfprintf(stdout, "farray_stats.dblk_size = %" PRIuHSIZE ", state->dblk_size = %" PRIuHSIZE "\n", - farray_stats.dblk_size, state->dblk_size); + fprintf(stdout, "farray_stats.dblk_size = %" PRIuHSIZE ", state->dblk_size = %" PRIuHSIZE "\n", + farray_stats.dblk_size, state->dblk_size); TEST_ERROR; } if (farray_stats.nelmts != state->nelmts) { - HDfprintf(stdout, "farray_stats.nelmts = %" PRIuHSIZE ", state->nelmts = %" PRIuHSIZE "\n", - farray_stats.nelmts, state->nelmts); + fprintf(stdout, "farray_stats.nelmts = %" PRIuHSIZE ", state->nelmts = %" PRIuHSIZE "\n", + farray_stats.nelmts, state->nelmts); TEST_ERROR; } @@ -216,8 +216,8 @@ set_fa_state(const H5FA_create_t *cparam, farray_state_t *state) size_t dblk_page_nelmts; /* # of elements per page */ /* Sanity check */ - HDassert(cparam); - HDassert(state); + assert(cparam); + assert(state); /* Compute the state of the fixed array */ state->hdr_size = FA_HDR_SIZE; @@ -320,7 +320,7 @@ create_array(H5F_t *f, const H5FA_create_t *cparam, H5FA_t **fa, haddr_t *fa_add TEST_ERROR; /* Check array stats */ - HDmemset(&state, 0, sizeof(state)); + memset(&state, 0, sizeof(state)); state.hdr_size = FA_HDR_SIZE; state.nelmts = cparam->nelmts; if (check_stats(*fa, &state)) @@ -348,7 +348,7 @@ verify_cparam(const H5FA_t *fa, const H5FA_create_t *cparam) H5FA_create_t test_cparam; /* Creation parameters for array */ /* Retrieve creation parameters */ - HDmemset(&test_cparam, 0, sizeof(H5FA_create_t)); + memset(&test_cparam, 0, sizeof(H5FA_create_t)); if (H5FA__get_cparam_test(fa, &test_cparam) < 0) FAIL_STACK_ERROR; @@ -437,7 +437,7 @@ test_create(hid_t fapl, H5FA_create_t *cparam, farray_test_param_t H5_ATTR_UNUSE H5FA_create_t test_cparam; /* Creation parameters for array */ /* Set invalid element size */ - HDmemcpy(&test_cparam, cparam, sizeof(test_cparam)); + memcpy(&test_cparam, cparam, sizeof(test_cparam)); test_cparam.raw_elmt_size = 0; H5E_BEGIN_TRY { @@ -454,7 +454,7 @@ test_create(hid_t fapl, H5FA_create_t *cparam, farray_test_param_t H5_ATTR_UNUSE } /* end if */ /* Set invalid max. # of elements bits */ - HDmemcpy(&test_cparam, cparam, sizeof(test_cparam)); + memcpy(&test_cparam, cparam, sizeof(test_cparam)); test_cparam.max_dblk_page_nelmts_bits = 0; H5E_BEGIN_TRY { @@ -471,7 +471,7 @@ test_create(hid_t fapl, H5FA_create_t *cparam, farray_test_param_t H5_ATTR_UNUSE } /* end if */ /* Set invalid max. # of elements */ - HDmemcpy(&test_cparam, cparam, sizeof(test_cparam)); + memcpy(&test_cparam, cparam, sizeof(test_cparam)); test_cparam.nelmts = 0; H5E_BEGIN_TRY { @@ -982,8 +982,8 @@ fiter_fw_init(const H5FA_create_t H5_ATTR_UNUSED *cparam, const farray_test_para fiter_fw_t *fiter; /* Forward element iteration object */ /* Allocate space for the element iteration object */ - fiter = (fiter_fw_t *)HDmalloc(sizeof(fiter_fw_t)); - HDassert(fiter); + fiter = (fiter_fw_t *)malloc(sizeof(fiter_fw_t)); + assert(fiter); /* Initialize the element iteration object */ fiter->idx = 0; @@ -1009,7 +1009,7 @@ fiter_fw_next(void *_fiter) hssize_t ret_val; /* Sanity check */ - HDassert(fiter); + assert(fiter); /* Get the next array index to test */ ret_val = (hssize_t)fiter->idx++; @@ -1031,10 +1031,10 @@ static int fiter_term(void *fiter) { /* Sanity check */ - HDassert(fiter); + assert(fiter); /* Free iteration object */ - HDfree(fiter); + free(fiter); return (0); } /* end fiter_term() */ @@ -1068,8 +1068,8 @@ fiter_rv_init(const H5FA_create_t *cparam, const farray_test_param_t H5_ATTR_UNU fiter_rv_t *fiter; /* Reverse element iteration object */ /* Allocate space for the element iteration object */ - fiter = (fiter_rv_t *)HDmalloc(sizeof(fiter_rv_t)); - HDassert(fiter); + fiter = (fiter_rv_t *)malloc(sizeof(fiter_rv_t)); + assert(fiter); /* Initialize reverse iteration info */ fiter->idx = cparam->nelmts - 1; @@ -1095,7 +1095,7 @@ fiter_rv_next(void *_fiter) hssize_t ret_val; /* Sanity check */ - HDassert(fiter); + assert(fiter); /* Get the next array index to test */ ret_val = (hssize_t)fiter->idx--; @@ -1134,12 +1134,12 @@ fiter_rnd_init(const H5FA_create_t H5_ATTR_UNUSED *cparam, const farray_test_par size_t u; /* Local index variable */ /* Allocate space for the element iteration object */ - fiter = (fiter_rnd_t *)HDmalloc(sizeof(fiter_rnd_t)); - HDassert(fiter); + fiter = (fiter_rnd_t *)malloc(sizeof(fiter_rnd_t)); + assert(fiter); /* Allocate space for the array of shuffled indices */ - fiter->idx = (hsize_t *)HDmalloc(sizeof(hsize_t) * (size_t)cnt); - HDassert(fiter->idx); + fiter->idx = (hsize_t *)malloc(sizeof(hsize_t) * (size_t)cnt); + assert(fiter->idx); /* Initialize reverse iteration info */ fiter->pos = 0; @@ -1180,7 +1180,7 @@ fiter_rnd_next(void *_fiter) hssize_t ret_val; /* Sanity check */ - HDassert(fiter); + assert(fiter); /* Get the next array index to test */ ret_val = (hssize_t)fiter->idx[fiter->pos]; @@ -1205,14 +1205,14 @@ fiter_rnd_term(void *_fiter) fiter_rnd_t *fiter = (fiter_rnd_t *)_fiter; /* Sanity check */ - HDassert(fiter); - HDassert(fiter->idx); + assert(fiter); + assert(fiter->idx); /* Free shuffled index array */ - HDfree(fiter->idx); + free(fiter->idx); /* Free iteration object */ - HDfree(fiter); + free(fiter); return (0); } /* end fiter_rnd_term() */ @@ -1248,8 +1248,8 @@ fiter_cyc_init(const H5FA_create_t H5_ATTR_UNUSED *cparam, const farray_test_par fiter_cyc_t *fiter; /* Cyclic element iteration object */ /* Allocate space for the element iteration object */ - fiter = (fiter_cyc_t *)HDmalloc(sizeof(fiter_cyc_t)); - HDassert(fiter); + fiter = (fiter_cyc_t *)malloc(sizeof(fiter_cyc_t)); + assert(fiter); /* Initialize reverse iteration info */ fiter->pos = 0; @@ -1277,7 +1277,7 @@ fiter_cyc_next(void *_fiter) hssize_t ret_val; /* Sanity check */ - HDassert(fiter); + assert(fiter); /* Get the next array index to test */ ret_val = (hssize_t)fiter->pos; @@ -1356,7 +1356,7 @@ test_set_elmts(hid_t fapl, H5FA_create_t *cparam, farray_test_param_t *tparam, h hsize_t fa_nelmts; /* # of elements in fixed array */ haddr_t fa_addr = HADDR_UNDEF; /* Array address in file */ - HDassert(nelmts); + assert(nelmts); /* * Display testing message */ @@ -1385,7 +1385,7 @@ test_set_elmts(hid_t fapl, H5FA_create_t *cparam, farray_test_param_t *tparam, h TEST_ERROR; /* Verify array state */ - HDmemset(&state, 0, sizeof(state)); + memset(&state, 0, sizeof(state)); state.hdr_size = FA_HDR_SIZE; state.nelmts = cparam->nelmts; state.dblk_size = 0; @@ -1456,7 +1456,7 @@ test_set_elmts(hid_t fapl, H5FA_create_t *cparam, farray_test_param_t *tparam, h } /* end for */ /* Verify array state */ - HDmemset(&state, 0, sizeof(state)); + memset(&state, 0, sizeof(state)); set_fa_state(cparam, &state); if (check_stats(fa, &state)) TEST_ERROR; @@ -1540,7 +1540,7 @@ test_skip_elmts(hid_t fapl, H5FA_create_t *cparam, farray_test_param_t *tparam, TEST_ERROR; /* Verify array state */ - HDmemset(&state, 0, sizeof(state)); + memset(&state, 0, sizeof(state)); state.hdr_size = FA_HDR_SIZE; state.nelmts = cparam->nelmts; state.dblk_size = 0; @@ -1565,7 +1565,7 @@ test_skip_elmts(hid_t fapl, H5FA_create_t *cparam, farray_test_param_t *tparam, FAIL_STACK_ERROR; /* Verify array state */ - HDmemset(&state, 0, sizeof(state)); + memset(&state, 0, sizeof(state)); set_fa_state(cparam, &state); if (check_stats(fa, &state)) TEST_ERROR; @@ -1642,7 +1642,7 @@ main(void) fapl = h5_fileaccess(); ExpressMode = GetTestExpress(); if (ExpressMode > 1) - HDprintf("***Express test mode on. Some tests may be skipped\n"); + printf("***Express test mode on. Some tests may be skipped\n"); /* Set the filename to use for this test (dependent on fapl) */ h5_fixname(FILENAME[0], fapl, filename_g, sizeof(filename_g)); @@ -1676,7 +1676,7 @@ main(void) for (curr_test = FARRAY_TEST_NORMAL; curr_test < FARRAY_TEST_NTESTS; curr_test++) { /* Initialize the testing parameters */ - HDmemset(&tparam, 0, sizeof(tparam)); + memset(&tparam, 0, sizeof(tparam)); tparam.nelmts = TEST_NELMTS; /* Set appropriate testing parameters for each test */ @@ -1792,7 +1792,7 @@ main(void) /* Clean up file used */ h5_cleanup(FILENAME, fapl); - HDexit(EXIT_SUCCESS); + exit(EXIT_SUCCESS); error: HDputs("*** TESTS FAILED ***"); @@ -1806,5 +1806,5 @@ error: if (api_ctx_pushed) H5CX_pop(FALSE); - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); } /* end main() */ diff --git a/test/fheap.c b/test/fheap.c index 8709879..759bce3 100644 --- a/test/fheap.c +++ b/test/fheap.c @@ -195,7 +195,7 @@ static int init_small_cparam(H5HF_create_t *cparam) { /* Wipe out background */ - HDmemset(cparam, 0, sizeof(H5HF_create_t)); + memset(cparam, 0, sizeof(H5HF_create_t)); /* General parameters */ cparam->id_len = SMALL_ID_LEN; @@ -231,7 +231,7 @@ static int init_large_cparam(H5HF_create_t *cparam) { /* Wipe out background */ - HDmemset(cparam, 0, sizeof(H5HF_create_t)); + memset(cparam, 0, sizeof(H5HF_create_t)); /* General parameters */ cparam->id_len = LARGE_ID_LEN; @@ -271,45 +271,45 @@ check_stats(const H5HF_t *fh, const fheap_heap_state_t *state) if (H5HF_stat_info(fh, &heap_stats) < 0) FAIL_STACK_ERROR; if (heap_stats.man_nobjs != state->man_nobjs) { - HDfprintf(stdout, "heap_stats.man_nobjs = %" PRIuHSIZE ", state->man_nobjs = %zu\n", - heap_stats.man_nobjs, state->man_nobjs); + fprintf(stdout, "heap_stats.man_nobjs = %" PRIuHSIZE ", state->man_nobjs = %zu\n", + heap_stats.man_nobjs, state->man_nobjs); TEST_ERROR; } /* end if */ if (heap_stats.man_size != state->man_size) { - HDfprintf(stdout, "heap_stats.man_size = %" PRIuHSIZE ", state->man_size = %" PRIuHSIZE "\n", - heap_stats.man_size, state->man_size); + fprintf(stdout, "heap_stats.man_size = %" PRIuHSIZE ", state->man_size = %" PRIuHSIZE "\n", + heap_stats.man_size, state->man_size); TEST_ERROR; } /* end if */ if (heap_stats.man_alloc_size != state->man_alloc_size) { - HDfprintf(stdout, - "heap_stats.man_alloc_size = %" PRIuHSIZE ", state->man_alloc_size = %" PRIuHSIZE "\n", - heap_stats.man_alloc_size, state->man_alloc_size); + fprintf(stdout, + "heap_stats.man_alloc_size = %" PRIuHSIZE ", state->man_alloc_size = %" PRIuHSIZE "\n", + heap_stats.man_alloc_size, state->man_alloc_size); TEST_ERROR; } /* end if */ if (heap_stats.man_free_space != state->man_free_space) { - HDfprintf(stdout, - "heap_stats.man_free_space = %" PRIuHSIZE ", state->man_free_space = %" PRIuHSIZE "\n", - heap_stats.man_free_space, state->man_free_space); + fprintf(stdout, + "heap_stats.man_free_space = %" PRIuHSIZE ", state->man_free_space = %" PRIuHSIZE "\n", + heap_stats.man_free_space, state->man_free_space); TEST_ERROR; } /* end if */ if (heap_stats.huge_nobjs != state->huge_nobjs) { - HDfprintf(stdout, "heap_stats.huge_nobjs = %" PRIuHSIZE ", state->huge_nobjs = %zu\n", - heap_stats.huge_nobjs, state->huge_nobjs); + fprintf(stdout, "heap_stats.huge_nobjs = %" PRIuHSIZE ", state->huge_nobjs = %zu\n", + heap_stats.huge_nobjs, state->huge_nobjs); TEST_ERROR; } /* end if */ if (heap_stats.huge_size != state->huge_size) { - HDfprintf(stdout, "heap_stats.huge_size = %" PRIuHSIZE ", state->huge_size = %" PRIuHSIZE "\n", - heap_stats.huge_size, state->huge_size); + fprintf(stdout, "heap_stats.huge_size = %" PRIuHSIZE ", state->huge_size = %" PRIuHSIZE "\n", + heap_stats.huge_size, state->huge_size); TEST_ERROR; } /* end if */ if (heap_stats.tiny_nobjs != state->tiny_nobjs) { - HDfprintf(stdout, "heap_stats.tiny_nobjs = %" PRIuHSIZE ", state->tiny_nobjs = %zu\n", - heap_stats.tiny_nobjs, state->tiny_nobjs); + fprintf(stdout, "heap_stats.tiny_nobjs = %" PRIuHSIZE ", state->tiny_nobjs = %zu\n", + heap_stats.tiny_nobjs, state->tiny_nobjs); TEST_ERROR; } /* end if */ if (heap_stats.tiny_size != state->tiny_size) { - HDfprintf(stdout, "heap_stats.tiny_size = %" PRIuHSIZE ", state->tiny_size = %" PRIuHSIZE "\n", - heap_stats.tiny_size, state->tiny_size); + fprintf(stdout, "heap_stats.tiny_size = %" PRIuHSIZE ", state->tiny_size = %" PRIuHSIZE "\n", + heap_stats.tiny_size, state->tiny_size); TEST_ERROR; } /* end if */ @@ -338,7 +338,7 @@ static herr_t op_memcpy(const void *obj, size_t obj_len, void *op_data) { /* Make copy of the object */ - HDmemcpy(op_data, obj, obj_len); + memcpy(op_data, obj, obj_len); return (SUCCEED); } /* op_memcpy() */ @@ -376,7 +376,7 @@ add_obj(H5HF_t *fh, size_t obj_off, size_t obj_size, fheap_heap_state_t *state, size_t robj_size; /* Object size read in */ /* Sanity check */ - HDassert(fh); + assert(fh); /* Initialize object buffer */ obj = &shared_wobj_g[obj_off]; @@ -388,7 +388,7 @@ add_obj(H5HF_t *fh, size_t obj_off, size_t obj_size, fheap_heap_state_t *state, TEST_ERROR; /* Insert object */ - HDmemset(heap_id, 0, id_len); + memset(heap_id, 0, id_len); if (H5HF_insert(fh, obj_size, obj, heap_id) < 0) FAIL_STACK_ERROR; @@ -423,7 +423,7 @@ add_obj(H5HF_t *fh, size_t obj_off, size_t obj_size, fheap_heap_state_t *state, TEST_ERROR; if (H5HF_read(fh, heap_id, shared_robj_g) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(obj, shared_robj_g, obj_size) != 0) + if (memcmp(obj, shared_robj_g, obj_size) != 0) TEST_ERROR; /* If the heap IDs are to be retained, append them to the list */ @@ -450,7 +450,7 @@ add_obj(H5HF_t *fh, size_t obj_off, size_t obj_size, fheap_heap_state_t *state, } /* end if */ /* Append the object info onto the array */ - HDmemcpy(&keep_ids->ids[keep_ids->num_ids * id_len], heap_id, id_len); + memcpy(&keep_ids->ids[keep_ids->num_ids * id_len], heap_id, id_len); keep_ids->lens[keep_ids->num_ids] = obj_size; keep_ids->offs[keep_ids->num_ids] = obj_off; @@ -510,7 +510,7 @@ get_fill_size(const fheap_test_param_t *tparam) case FHEAP_TEST_FILL_N: default: - HDassert(0 && "Unknown bulk fill type?!?"); + assert(0 && "Unknown bulk fill type?!?"); } /* end switch */ return (0); @@ -547,7 +547,7 @@ begin_test(fheap_test_param_t *tparam, const char *base_desc, fheap_heap_ids_t * H5MM_xfree(test_desc); /* Initialize the heap ID structure */ - HDmemset(keep_ids, 0, sizeof(fheap_heap_ids_t)); + memset(keep_ids, 0, sizeof(fheap_heap_ids_t)); /* Retrieve "bulk" filling object size */ if (fill_size) @@ -661,7 +661,7 @@ open_heap(char *filename, hid_t fapl, const H5HF_create_t *cparam, const fheap_t FAIL_STACK_ERROR; if (!H5F_addr_defined(*fh_addr)) TEST_ERROR; - HDmemset(state, 0, sizeof(fheap_heap_state_t)); + memset(state, 0, sizeof(fheap_heap_state_t)); if (check_stats(*fh, state)) TEST_ERROR; @@ -706,7 +706,7 @@ open_heap(char *filename, hid_t fapl, const H5HF_create_t *cparam, const fheap_t FAIL_STACK_ERROR; if (!H5F_addr_defined(*fh_addr)) TEST_ERROR; - HDmemset(state, 0, sizeof(fheap_heap_state_t)); + memset(state, 0, sizeof(fheap_heap_state_t)); if (check_stats(*fh, state)) TEST_ERROR; } /* end if */ @@ -849,9 +849,9 @@ del_objs_half_refill(H5F_t *f, H5HF_t **fh, fheap_test_param_t *tparam, fheap_he size_t u; /* Local index variable */ /* Sanity check */ - HDassert(fh); - HDassert(*fh); - HDassert(keep_ids); + assert(fh); + assert(*fh); + assert(keep_ids); /* Check for closing & re-opening the heap */ if (tparam->reopen_heap) { @@ -940,10 +940,10 @@ del_objs(H5F_t *f, H5HF_t **fh, fheap_test_param_t *tparam, fheap_heap_state_t * size_t u; /* Local index variable */ /* Sanity check */ - HDassert(fh); - HDassert(*fh); - HDassert(state); - HDassert(keep_ids); + assert(fh); + assert(*fh); + assert(state); + assert(keep_ids); /* Check for first deleting half of objects & then re-inserting them */ if (tparam->drain_half == FHEAP_DEL_DRAIN_HALF) @@ -984,7 +984,7 @@ del_objs(H5F_t *f, H5HF_t **fh, fheap_test_param_t *tparam, fheap_heap_state_t * } /* end for */ /* Heap should be completely empty now, reset our state */ - HDmemset(state, 0, sizeof(fheap_heap_state_t)); + memset(state, 0, sizeof(fheap_heap_state_t)); /* Check up on heap... */ if (check_stats(*fh, state)) @@ -1037,9 +1037,9 @@ fill_heap(H5HF_t *fh, unsigned block_row, size_t obj_size, fheap_heap_state_t *s unsigned u; /* Local index variable */ /* Sanity check */ - HDassert(fh); - HDassert(state); - HDassert(obj_size + 256 < shared_obj_size_g); + assert(fh); + assert(state); + assert(obj_size + 256 < shared_obj_size_g); /* Initialize starting information */ data_size = (size_t)DBLOCK_FREE(fh, block_row); @@ -1166,7 +1166,7 @@ fill_heap(H5HF_t *fh, unsigned block_row, size_t obj_size, fheap_heap_state_t *s /* Check that object is correct */ wobj = &shared_wobj_g[*curr_off_ptr]; - if (HDmemcmp(wobj, shared_robj_g, *curr_len_ptr) != 0) + if (memcmp(wobj, shared_robj_g, *curr_len_ptr) != 0) TEST_ERROR; /* Adjust object & ID pointers */ @@ -1192,9 +1192,9 @@ fill_heap(H5HF_t *fh, unsigned block_row, size_t obj_size, fheap_heap_state_t *s } /* end if */ /* Append the IDs onto the array */ - HDmemcpy(&keep_ids->ids[keep_ids->num_ids * id_len], shared_ids_g, (num_ids * id_len)); - HDmemcpy(&keep_ids->lens[keep_ids->num_ids], shared_lens_g, (num_ids * sizeof(size_t))); - HDmemcpy(&keep_ids->offs[keep_ids->num_ids], shared_offs_g, (num_ids * sizeof(size_t))); + memcpy(&keep_ids->ids[keep_ids->num_ids * id_len], shared_ids_g, (num_ids * id_len)); + memcpy(&keep_ids->lens[keep_ids->num_ids], shared_lens_g, (num_ids * sizeof(size_t))); + memcpy(&keep_ids->offs[keep_ids->num_ids], shared_offs_g, (num_ids * sizeof(size_t))); /* Increment the number of IDs kept */ keep_ids->num_ids += num_ids; @@ -1236,8 +1236,8 @@ fill_root_row(H5HF_t *fh, unsigned row, size_t obj_size, fheap_heap_state_t *sta unsigned u; /* Local index variable */ /* Sanity check */ - HDassert(fh); - HDassert(state); + assert(fh); + assert(state); /* Get some information for the heap */ block_size = (size_t)DBLOCK_SIZE(fh, row); @@ -1325,8 +1325,8 @@ fill_partial_row(H5HF_t *fh, unsigned row, unsigned width, size_t obj_size, fhea unsigned u; /* Local index variable */ /* Sanity check */ - HDassert(fh); - HDassert(state); + assert(fh); + assert(state); /* Get some information for the heap */ block_size = (size_t)DBLOCK_SIZE(fh, row); @@ -1366,8 +1366,8 @@ static int fill_row(H5HF_t *fh, unsigned row, size_t obj_size, fheap_heap_state_t *state, fheap_heap_ids_t *keep_ids) { /* Sanity check */ - HDassert(fh); - HDassert(state); + assert(fh); + assert(state); /* Fill the entire row (with the partial row fill routine) */ if (fill_partial_row(fh, row, DTABLE_WIDTH(fh), obj_size, state, keep_ids)) @@ -1405,7 +1405,7 @@ fill_root_direct(H5HF_t *fh, size_t obj_size, fheap_heap_state_t *state, fheap_h /* Get heap info */ max_dblock_rows = DTABLE_MAX_DROWS(fh); - HDassert(max_dblock_rows); + assert(max_dblock_rows); /* Loop over rows */ for (row = 0; row < max_dblock_rows; row++) @@ -1444,7 +1444,7 @@ fill_2nd_indirect(H5HF_t *fh, unsigned pos, size_t obj_size, fheap_heap_state_t /* Get some information for the heap */ max_dblock_rows = IBLOCK_MAX_DROWS(fh, pos); - HDassert(max_dblock_rows); + assert(max_dblock_rows); /* Loop over rows */ for (row = 0; row < max_dblock_rows; row++) @@ -1481,7 +1481,7 @@ fill_all_direct(H5HF_t *fh, size_t obj_size, fheap_heap_state_t *state, fheap_he /* Get heap info */ max_dblock_rows = DTABLE_MAX_DROWS(fh); - HDassert(max_dblock_rows); + assert(max_dblock_rows); /* Loop over rows */ for (row = 0; row < max_dblock_rows; row++) @@ -1859,14 +1859,14 @@ test_create(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam) FAIL_STACK_ERROR; if (!H5F_addr_defined(fh_addr)) TEST_ERROR; - HDmemset(&state, 0, sizeof(fheap_heap_state_t)); + memset(&state, 0, sizeof(fheap_heap_state_t)); if (check_stats(fh, &state)) TEST_ERROR; PASSED(); /* Query the type of address mapping */ TESTING("query heap creation parameters"); - HDmemset(&test_cparam, 0, sizeof(H5HF_create_t)); + memset(&test_cparam, 0, sizeof(H5HF_create_t)); if (H5HF_get_cparam_test(fh, &test_cparam) < 0) FAIL_STACK_ERROR; if (H5HF_cmp_cparam_test(cparam, &test_cparam)) @@ -1984,7 +1984,7 @@ test_reopen(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam) FAIL_STACK_ERROR; if (!H5F_addr_defined(fh_addr)) TEST_ERROR; - HDmemset(&state, 0, sizeof(fheap_heap_state_t)); + memset(&state, 0, sizeof(fheap_heap_state_t)); if (check_stats(fh, &state)) TEST_ERROR; @@ -2018,7 +2018,7 @@ test_reopen(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam) FAIL_STACK_ERROR; /* Query the creation parameters */ - HDmemset(&test_cparam, 0, sizeof(H5HF_create_t)); + memset(&test_cparam, 0, sizeof(H5HF_create_t)); if (H5HF_get_cparam_test(fh, &test_cparam) < 0) FAIL_STACK_ERROR; if (H5HF_cmp_cparam_test(cparam, &test_cparam)) @@ -2139,7 +2139,7 @@ test_open_twice(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam) FAIL_STACK_ERROR; if (!H5F_addr_defined(fh_addr)) TEST_ERROR; - HDmemset(&state, 0, sizeof(fheap_heap_state_t)); + memset(&state, 0, sizeof(fheap_heap_state_t)); if (check_stats(fh, &state)) TEST_ERROR; @@ -2148,7 +2148,7 @@ test_open_twice(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam) FAIL_STACK_ERROR; /* Verify the creation parameters */ - HDmemset(&test_cparam, 0, sizeof(H5HF_create_t)); + memset(&test_cparam, 0, sizeof(H5HF_create_t)); if (H5HF_get_cparam_test(fh2, &test_cparam) < 0) FAIL_STACK_ERROR; if (H5HF_cmp_cparam_test(cparam, &test_cparam)) @@ -2180,7 +2180,7 @@ test_open_twice(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam) FAIL_STACK_ERROR; /* Verify the creation parameters */ - HDmemset(&test_cparam, 0, sizeof(H5HF_create_t)); + memset(&test_cparam, 0, sizeof(H5HF_create_t)); if (H5HF_get_cparam_test(fh2, &test_cparam) < 0) FAIL_STACK_ERROR; if (H5HF_cmp_cparam_test(cparam, &test_cparam)) @@ -2309,7 +2309,7 @@ test_delete_open(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam) FAIL_STACK_ERROR; if (!H5F_addr_defined(fh_addr)) TEST_ERROR; - HDmemset(&state, 0, sizeof(fheap_heap_state_t)); + memset(&state, 0, sizeof(fheap_heap_state_t)); if (check_stats(fh, &state)) TEST_ERROR; @@ -2322,7 +2322,7 @@ test_delete_open(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam) FAIL_STACK_ERROR; /* Verify the creation parameters */ - HDmemset(&test_cparam, 0, sizeof(H5HF_create_t)); + memset(&test_cparam, 0, sizeof(H5HF_create_t)); if (H5HF_get_cparam_test(fh2, &test_cparam) < 0) FAIL_STACK_ERROR; if (H5HF_cmp_cparam_test(cparam, &test_cparam)) @@ -2464,7 +2464,7 @@ test_id_limits(hid_t fapl, H5HF_create_t *cparam, hid_t fcpl) TESTING("limits of heap ID lengths"); /* Copy heap creation properties */ - HDmemcpy(&tmp_cparam, cparam, sizeof(H5HF_create_t)); + memcpy(&tmp_cparam, cparam, sizeof(H5HF_create_t)); /* Set the 'default' heap ID length */ tmp_cparam.id_len = 0; @@ -2800,7 +2800,7 @@ test_filtered_create(hid_t fapl, H5HF_create_t *cparam, hid_t fcpl) TESTING("creating heaps with I/O filters"); /* Copy heap creation properties */ - HDmemcpy(&tmp_cparam, cparam, sizeof(H5HF_create_t)); + memcpy(&tmp_cparam, cparam, sizeof(H5HF_create_t)); /* Set an I/O filter for heap data */ deflate_level = 6; @@ -2843,7 +2843,7 @@ test_filtered_create(hid_t fapl, H5HF_create_t *cparam, hid_t fcpl) FAIL_STACK_ERROR; /* Query the heap creation parameters */ - HDmemset(&test_cparam, 0, sizeof(H5HF_create_t)); + memset(&test_cparam, 0, sizeof(H5HF_create_t)); if (H5HF_get_cparam_test(fh, &test_cparam) < 0) FAIL_STACK_ERROR; if (H5HF_cmp_cparam_test(&tmp_cparam, &test_cparam)) @@ -3204,7 +3204,7 @@ test_man_insert_weird(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpa FAIL_STACK_ERROR; if (!H5F_addr_defined(fh_addr)) TEST_ERROR; - HDmemset(&state, 0, sizeof(fheap_heap_state_t)); + memset(&state, 0, sizeof(fheap_heap_state_t)); if (check_stats(fh, &state)) TEST_ERROR; @@ -3317,7 +3317,7 @@ test_man_insert_first(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpa FAIL_STACK_ERROR; if (!H5F_addr_defined(fh_addr)) TEST_ERROR; - HDmemset(&state, 0, sizeof(fheap_heap_state_t)); + memset(&state, 0, sizeof(fheap_heap_state_t)); if (check_stats(fh, &state)) TEST_ERROR; @@ -3418,7 +3418,7 @@ test_man_insert_second(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tp FAIL_STACK_ERROR; if (!H5F_addr_defined(fh_addr)) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(fheap_heap_state_t)); + memset(&state, 0, sizeof(fheap_heap_state_t)); /* * Test inserting first (small) object into absolute heap @@ -3515,7 +3515,7 @@ test_man_insert_root_mult(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t FAIL_STACK_ERROR; if (!H5F_addr_defined(fh_addr)) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(fheap_heap_state_t)); + memset(&state, 0, sizeof(fheap_heap_state_t)); /* * Test inserting mult. (small) object into absolute heap @@ -3614,7 +3614,7 @@ test_man_insert_force_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_test_par FAIL_STACK_ERROR; if (!H5F_addr_defined(fh_addr)) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(fheap_heap_state_t)); + memset(&state, 0, sizeof(fheap_heap_state_t)); /* * Test forcing creation of indirect root block & second direct block @@ -3720,7 +3720,7 @@ test_man_insert_fill_second(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_ FAIL_STACK_ERROR; if (!H5F_addr_defined(fh_addr)) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(fheap_heap_state_t)); + memset(&state, 0, sizeof(fheap_heap_state_t)); /* * Test inserting mult. (small) objects to fill second direct block @@ -3827,7 +3827,7 @@ test_man_insert_third_direct(hid_t fapl, H5HF_create_t *cparam, fheap_test_param FAIL_STACK_ERROR; if (!H5F_addr_defined(fh_addr)) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(fheap_heap_state_t)); + memset(&state, 0, sizeof(fheap_heap_state_t)); /* * Test inserting mult. (small) objects to create third direct block @@ -3938,7 +3938,7 @@ test_man_fill_first_row(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *t FAIL_STACK_ERROR; if (!H5F_addr_defined(fh_addr)) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(fheap_heap_state_t)); + memset(&state, 0, sizeof(fheap_heap_state_t)); /* * Test inserting mult. (small) objects to fill first row in root indirect block @@ -4034,7 +4034,7 @@ test_man_start_second_row(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t FAIL_STACK_ERROR; if (!H5F_addr_defined(fh_addr)) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(fheap_heap_state_t)); + memset(&state, 0, sizeof(fheap_heap_state_t)); /* * Test inserting mult. (small) objects to start second row in root indirect block @@ -4137,7 +4137,7 @@ test_man_fill_second_row(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t * FAIL_STACK_ERROR; if (!H5F_addr_defined(fh_addr)) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(fheap_heap_state_t)); + memset(&state, 0, sizeof(fheap_heap_state_t)); /* * Test inserting mult. (small) objects to start second row in root indirect block @@ -4238,7 +4238,7 @@ test_man_start_third_row(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t * FAIL_STACK_ERROR; if (!H5F_addr_defined(fh_addr)) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(fheap_heap_state_t)); + memset(&state, 0, sizeof(fheap_heap_state_t)); /* * Test inserting mult. (small) objects to start third row in root indirect block @@ -4349,7 +4349,7 @@ test_man_fill_fourth_row(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t * FAIL_STACK_ERROR; if (!H5F_addr_defined(fh_addr)) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(fheap_heap_state_t)); + memset(&state, 0, sizeof(fheap_heap_state_t)); /* * Test inserting mult. (small) objects to fill four rows in root indirect block @@ -4446,7 +4446,7 @@ test_man_fill_all_root_direct(hid_t fapl, H5HF_create_t *cparam, fheap_test_para FAIL_STACK_ERROR; if (!H5F_addr_defined(fh_addr)) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(fheap_heap_state_t)); + memset(&state, 0, sizeof(fheap_heap_state_t)); /* * Test inserting mult. (small) objects to fill all direct rows in root indirect block @@ -4542,7 +4542,7 @@ test_man_first_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_test_ FAIL_STACK_ERROR; if (!H5F_addr_defined(fh_addr)) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(fheap_heap_state_t)); + memset(&state, 0, sizeof(fheap_heap_state_t)); /* * Test inserting mult. (small) objects to force creation of first recursive indirect block @@ -4644,7 +4644,7 @@ test_man_second_direct_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fhe FAIL_STACK_ERROR; if (!H5F_addr_defined(fh_addr)) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(fheap_heap_state_t)); + memset(&state, 0, sizeof(fheap_heap_state_t)); /* * Test inserting mult. (small) objects to force creation of second direct @@ -4754,7 +4754,7 @@ test_man_fill_first_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_ FAIL_STACK_ERROR; if (!H5F_addr_defined(fh_addr)) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(fheap_heap_state_t)); + memset(&state, 0, sizeof(fheap_heap_state_t)); /* * Test inserting mult. (small) objects to fill all direct @@ -4857,7 +4857,7 @@ test_man_second_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_test FAIL_STACK_ERROR; if (!H5F_addr_defined(fh_addr)) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(fheap_heap_state_t)); + memset(&state, 0, sizeof(fheap_heap_state_t)); /* * Test inserting mult. (small) objects to fill all direct @@ -4968,7 +4968,7 @@ test_man_fill_second_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fheap FAIL_STACK_ERROR; if (!H5F_addr_defined(fh_addr)) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(fheap_heap_state_t)); + memset(&state, 0, sizeof(fheap_heap_state_t)); /* * Test inserting mult. (small) objects to fill all direct @@ -5072,7 +5072,7 @@ test_man_fill_recursive_indirect_row(hid_t fapl, H5HF_create_t *cparam, fheap_te FAIL_STACK_ERROR; if (!H5F_addr_defined(fh_addr)) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(fheap_heap_state_t)); + memset(&state, 0, sizeof(fheap_heap_state_t)); /* * Test inserting mult. (small) objects to fill all direct @@ -5174,7 +5174,7 @@ test_man_start_2nd_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_t FAIL_STACK_ERROR; if (!H5F_addr_defined(fh_addr)) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(fheap_heap_state_t)); + memset(&state, 0, sizeof(fheap_heap_state_t)); /* * Test inserting mult. (small) objects to fill all direct @@ -5283,7 +5283,7 @@ test_man_recursive_indirect_two_deep(hid_t fapl, H5HF_create_t *cparam, fheap_te FAIL_STACK_ERROR; if (!H5F_addr_defined(fh_addr)) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(fheap_heap_state_t)); + memset(&state, 0, sizeof(fheap_heap_state_t)); /* * Test inserting mult. (small) objects to fill all direct @@ -5386,7 +5386,7 @@ test_man_start_3rd_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_t FAIL_STACK_ERROR; if (!H5F_addr_defined(fh_addr)) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(fheap_heap_state_t)); + memset(&state, 0, sizeof(fheap_heap_state_t)); /* * Test inserting mult. (small) objects to fill all direct @@ -5496,7 +5496,7 @@ test_man_fill_first_3rd_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fh FAIL_STACK_ERROR; if (!H5F_addr_defined(fh_addr)) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(fheap_heap_state_t)); + memset(&state, 0, sizeof(fheap_heap_state_t)); /* * Test inserting mult. (small) objects to fill all direct @@ -5607,7 +5607,7 @@ test_man_fill_3rd_recursive_indirect_row(hid_t fapl, H5HF_create_t *cparam, fhea FAIL_STACK_ERROR; if (!H5F_addr_defined(fh_addr)) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(fheap_heap_state_t)); + memset(&state, 0, sizeof(fheap_heap_state_t)); /* * Test inserting mult. (small) objects to fill all direct @@ -5715,7 +5715,7 @@ test_man_fill_all_3rd_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fhea FAIL_STACK_ERROR; if (!H5F_addr_defined(fh_addr)) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(fheap_heap_state_t)); + memset(&state, 0, sizeof(fheap_heap_state_t)); /* * Test inserting mult. (small) objects to fill all direct @@ -5824,7 +5824,7 @@ test_man_start_4th_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_t FAIL_STACK_ERROR; if (!H5F_addr_defined(fh_addr)) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(fheap_heap_state_t)); + memset(&state, 0, sizeof(fheap_heap_state_t)); /* * Test inserting mult. (small) objects to fill all direct @@ -5939,7 +5939,7 @@ test_man_fill_first_4th_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fh FAIL_STACK_ERROR; if (!H5F_addr_defined(fh_addr)) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(fheap_heap_state_t)); + memset(&state, 0, sizeof(fheap_heap_state_t)); /* * Test inserting mult. (small) objects to fill all direct @@ -6060,7 +6060,7 @@ test_man_fill_4th_recursive_indirect_row(hid_t fapl, H5HF_create_t *cparam, fhea FAIL_STACK_ERROR; if (!H5F_addr_defined(fh_addr)) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(fheap_heap_state_t)); + memset(&state, 0, sizeof(fheap_heap_state_t)); /* * Test inserting mult. (small) objects to fill all direct @@ -6172,7 +6172,7 @@ test_man_fill_all_4th_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fhea FAIL_STACK_ERROR; if (!H5F_addr_defined(fh_addr)) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(fheap_heap_state_t)); + memset(&state, 0, sizeof(fheap_heap_state_t)); /* * Test inserting mult. (small) objects to fill all direct @@ -6286,7 +6286,7 @@ test_man_start_5th_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_t FAIL_STACK_ERROR; if (!H5F_addr_defined(fh_addr)) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(fheap_heap_state_t)); + memset(&state, 0, sizeof(fheap_heap_state_t)); /* * Test inserting mult. (small) objects to fill all direct @@ -6418,7 +6418,7 @@ test_man_remove_bogus(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpa FAIL_STACK_ERROR; if (!H5F_addr_defined(fh_addr)) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(fheap_heap_state_t)); + memset(&state, 0, sizeof(fheap_heap_state_t)); if (check_stats(fh, &state)) FAIL_STACK_ERROR; @@ -6438,7 +6438,7 @@ test_man_remove_bogus(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpa seed = (unsigned long)HDtime(NULL); #if 0 /* seed = (unsigned long)1155438845; */ -HDfprintf(stderr, "Random # seed was: %lu\n", seed); +fprintf(stderr, "Random # seed was: %lu\n", seed); #endif HDsrandom((unsigned)seed); @@ -6510,7 +6510,7 @@ HDfprintf(stderr, "Random # seed was: %lu\n", seed); return (0); error: - HDfprintf(stderr, "Random # seed was: %lu\n", seed); + fprintf(stderr, "Random # seed was: %lu\n", seed); H5E_BEGIN_TRY { if (fh) @@ -6577,7 +6577,7 @@ test_man_remove_one(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpara FAIL_STACK_ERROR; if (!H5F_addr_defined(fh_addr)) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(fheap_heap_state_t)); + memset(&state, 0, sizeof(fheap_heap_state_t)); if (check_stats(fh, &state)) FAIL_STACK_ERROR; @@ -6742,7 +6742,7 @@ test_man_remove_two(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpara FAIL_STACK_ERROR; if (!H5F_addr_defined(fh_addr)) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(fheap_heap_state_t)); + memset(&state, 0, sizeof(fheap_heap_state_t)); if (check_stats(fh, &state)) FAIL_STACK_ERROR; @@ -6936,7 +6936,7 @@ test_man_remove_one_larger(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t FAIL_STACK_ERROR; if (!H5F_addr_defined(fh_addr)) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(fheap_heap_state_t)); + memset(&state, 0, sizeof(fheap_heap_state_t)); if (check_stats(fh, &state)) FAIL_STACK_ERROR; @@ -7106,7 +7106,7 @@ test_man_remove_two_larger(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t FAIL_STACK_ERROR; if (!H5F_addr_defined(fh_addr)) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(fheap_heap_state_t)); + memset(&state, 0, sizeof(fheap_heap_state_t)); if (check_stats(fh, &state)) FAIL_STACK_ERROR; @@ -7347,7 +7347,7 @@ test_man_remove_three_larger(hid_t fapl, H5HF_create_t *cparam, fheap_test_param FAIL_STACK_ERROR; if (!H5F_addr_defined(fh_addr)) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(fheap_heap_state_t)); + memset(&state, 0, sizeof(fheap_heap_state_t)); if (check_stats(fh, &state)) FAIL_STACK_ERROR; @@ -7622,9 +7622,9 @@ test_man_incr_insert_remove(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_ h5_fixname(FILENAME[0], fapl, filename, sizeof(filename)); /* Set up data array */ - if (NULL == (heap_id_data = (unsigned char *)HDcalloc(100 * MAX_HEAP_ID_LEN, sizeof(unsigned char)))) + if (NULL == (heap_id_data = (unsigned char *)calloc(100 * MAX_HEAP_ID_LEN, sizeof(unsigned char)))) TEST_ERROR; - if (NULL == (heap_id = (unsigned char **)HDcalloc(100, sizeof(heap_id_data)))) + if (NULL == (heap_id = (unsigned char **)calloc(100, sizeof(heap_id_data)))) TEST_ERROR; for (i = 0; i < 100; i++) heap_id[i] = heap_id_data + (i * MAX_HEAP_ID_LEN); @@ -7652,7 +7652,7 @@ test_man_incr_insert_remove(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_ FAIL_STACK_ERROR; if (!H5F_addr_defined(fh_addr)) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(fheap_heap_state_t)); + memset(&state, 0, sizeof(fheap_heap_state_t)); if (check_stats(fh, &state)) FAIL_STACK_ERROR; @@ -7661,8 +7661,8 @@ test_man_incr_insert_remove(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_ */ TESTING("incremental object insertion and removal"); - HDmemset(&obj1, 0, sizeof(obj1)); - HDmemset(&obj2, 0, sizeof(obj2)); + memset(&obj1, 0, sizeof(obj1)); + memset(&obj2, 0, sizeof(obj2)); for (i = 0; i < 100; i++) { for (j = 0; j < i; j++) { if (H5HF_remove(fh, heap_id[j]) < 0) @@ -7678,7 +7678,7 @@ test_man_incr_insert_remove(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_ TEST_ERROR; /* Insert object */ - HDmemset(heap_id[i], 0, id_len); + memset(heap_id[i], 0, id_len); HDsnprintf(obj1.b, sizeof(obj1.b), "%s%2d", "ABCDEFGHIJKLMNOPQRSTUVWXYZ", i); if (H5HF_insert(fh, (sizeof(obj1)), &obj1, heap_id[i]) < 0) FAIL_STACK_ERROR; @@ -7695,8 +7695,8 @@ test_man_incr_insert_remove(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_ /* All tests passed */ PASSED(); - HDfree(heap_id); - HDfree(heap_id_data); + free(heap_id); + free(heap_id_data); return 0; @@ -7709,8 +7709,8 @@ error: } H5E_END_TRY; - HDfree(heap_id); - HDfree(heap_id_data); + free(heap_id); + free(heap_id_data); return 1; } /* test_man_incr_insert_remove() */ @@ -12692,10 +12692,10 @@ test_huge_insert_one(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpar FAIL_STACK_ERROR; if (obj_size != robj_size) TEST_ERROR; - HDmemset(shared_robj_g, 0, obj_size); + memset(shared_robj_g, 0, obj_size); if (H5HF_read(fh, heap_id, shared_robj_g) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) + if (memcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) TEST_ERROR; /* Delete individual objects, if we won't be deleting the entire heap later */ @@ -12845,10 +12845,10 @@ test_huge_insert_two(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpar FAIL_STACK_ERROR; if (obj_size != robj_size) TEST_ERROR; - HDmemset(shared_robj_g, 0, obj_size); + memset(shared_robj_g, 0, obj_size); if (H5HF_read(fh, heap_id, shared_robj_g) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) + if (memcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) TEST_ERROR; /* Insert second object too large for managed heap blocks */ @@ -12875,10 +12875,10 @@ test_huge_insert_two(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpar FAIL_STACK_ERROR; if (obj_size != robj_size) TEST_ERROR; - HDmemset(shared_robj_g, 0, obj_size); + memset(shared_robj_g, 0, obj_size); if (H5HF_read(fh, heap_id2, shared_robj_g) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) + if (memcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) TEST_ERROR; /* Delete individual objects, if we won't be deleting the entire heap later */ @@ -13078,10 +13078,10 @@ test_huge_insert_three(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tp FAIL_STACK_ERROR; if (obj_size != robj_size) TEST_ERROR; - HDmemset(shared_robj_g, 0, obj_size); + memset(shared_robj_g, 0, obj_size); if (H5HF_read(fh, heap_id, shared_robj_g) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) + if (memcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) TEST_ERROR; /* Insert second object too large for managed heap blocks */ @@ -13108,10 +13108,10 @@ test_huge_insert_three(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tp FAIL_STACK_ERROR; if (obj_size != robj_size) TEST_ERROR; - HDmemset(shared_robj_g, 0, obj_size); + memset(shared_robj_g, 0, obj_size); if (H5HF_read(fh, heap_id2, shared_robj_g) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) + if (memcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) TEST_ERROR; /* Insert third object too large for managed heap blocks */ @@ -13138,10 +13138,10 @@ test_huge_insert_three(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tp FAIL_STACK_ERROR; if (obj_size != robj_size) TEST_ERROR; - HDmemset(shared_robj_g, 0, obj_size); + memset(shared_robj_g, 0, obj_size); if (H5HF_read(fh, heap_id3, shared_robj_g) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) + if (memcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) TEST_ERROR; /* Delete individual objects, if we won't be deleting the entire heap later */ @@ -13389,10 +13389,10 @@ test_huge_insert_mix(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpar FAIL_STACK_ERROR; if (obj_size != robj_size) TEST_ERROR; - HDmemset(shared_robj_g, 0, obj_size); + memset(shared_robj_g, 0, obj_size); if (H5HF_read(fh, heap_id, shared_robj_g) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) + if (memcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) TEST_ERROR; /* Insert second object too large for managed heap blocks */ @@ -13419,10 +13419,10 @@ test_huge_insert_mix(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpar FAIL_STACK_ERROR; if (obj_size != robj_size) TEST_ERROR; - HDmemset(shared_robj_g, 0, obj_size); + memset(shared_robj_g, 0, obj_size); if (H5HF_read(fh, heap_id2, shared_robj_g) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) + if (memcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) TEST_ERROR; /* Insert third object too large for managed heap blocks */ @@ -13449,10 +13449,10 @@ test_huge_insert_mix(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpar FAIL_STACK_ERROR; if (obj_size != robj_size) TEST_ERROR; - HDmemset(shared_robj_g, 0, obj_size); + memset(shared_robj_g, 0, obj_size); if (H5HF_read(fh, heap_id3, shared_robj_g) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) + if (memcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) TEST_ERROR; /* Insert fourth object small enough to fit into 'normal' heap blocks */ @@ -13486,10 +13486,10 @@ test_huge_insert_mix(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpar FAIL_STACK_ERROR; if (obj_size != robj_size) TEST_ERROR; - HDmemset(shared_robj_g, 0, obj_size); + memset(shared_robj_g, 0, obj_size); if (H5HF_read(fh, heap_id4, shared_robj_g) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) + if (memcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) TEST_ERROR; /* Insert fifth object small enough to fit into 'normal' heap blocks */ @@ -13524,10 +13524,10 @@ test_huge_insert_mix(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpar FAIL_STACK_ERROR; if (obj_size != robj_size) TEST_ERROR; - HDmemset(shared_robj_g, 0, obj_size); + memset(shared_robj_g, 0, obj_size); if (H5HF_read(fh, heap_id5, shared_robj_g) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) + if (memcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) TEST_ERROR; /* Delete individual objects, if we won't be deleting the entire heap later */ @@ -13662,7 +13662,7 @@ test_huge_insert_mix(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpar } /* end else */ /* Check up on heap... */ - HDmemset(&state, 0, sizeof(fheap_heap_state_t)); + memset(&state, 0, sizeof(fheap_heap_state_t)); if (check_stats(fh, &state)) TEST_ERROR; } /* end if */ @@ -13764,7 +13764,7 @@ test_filtered_huge(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam const char *base_desc = "insert 'huge' object into heap with I/O filters, then remove"; /* Copy heap creation properties */ - HDmemcpy(&tmp_cparam, cparam, sizeof(H5HF_create_t)); + memcpy(&tmp_cparam, cparam, sizeof(H5HF_create_t)); /* Set an I/O filter for heap data */ deflate_level = 6; @@ -13862,10 +13862,10 @@ test_filtered_huge(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam FAIL_STACK_ERROR; if (obj_size != robj_size) TEST_ERROR; - HDmemset(shared_robj_g, 0, obj_size); + memset(shared_robj_g, 0, obj_size); if (H5HF_read(fh, heap_id, shared_robj_g) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) + if (memcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) TEST_ERROR; /* Delete individual objects, if we won't be deleting the entire heap later */ @@ -14013,10 +14013,10 @@ test_tiny_insert_one(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpar FAIL_STACK_ERROR; if (obj_size != robj_size) TEST_ERROR; - HDmemset(shared_robj_g, 0, obj_size); + memset(shared_robj_g, 0, obj_size); if (H5HF_read(fh, heap_id, shared_robj_g) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) + if (memcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) TEST_ERROR; /* Delete individual objects, if we won't be deleting the entire heap later */ @@ -14166,10 +14166,10 @@ test_tiny_insert_two(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpar FAIL_STACK_ERROR; if (obj_size != robj_size) TEST_ERROR; - HDmemset(shared_robj_g, 0, obj_size); + memset(shared_robj_g, 0, obj_size); if (H5HF_read(fh, heap_id, shared_robj_g) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) + if (memcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) TEST_ERROR; /* Insert second object small enough to encode in heap ID */ @@ -14196,10 +14196,10 @@ test_tiny_insert_two(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpar FAIL_STACK_ERROR; if (obj_size != robj_size) TEST_ERROR; - HDmemset(shared_robj_g, 0, obj_size); + memset(shared_robj_g, 0, obj_size); if (H5HF_read(fh, heap_id2, shared_robj_g) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) + if (memcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) TEST_ERROR; /* Delete individual objects, if we won't be deleting the entire heap later */ @@ -14412,17 +14412,17 @@ test_tiny_insert_mix(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpar FAIL_STACK_ERROR; if (obj_size != robj_size) TEST_ERROR; - HDmemset(shared_robj_g, 0, obj_size); + memset(shared_robj_g, 0, obj_size); if (H5HF_read(fh, heap_id, shared_robj_g) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) + if (memcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) TEST_ERROR; /* Check 'op' functionality on first huge object */ - HDmemset(shared_robj_g, 0, obj_size); + memset(shared_robj_g, 0, obj_size); if (H5HF_op(fh, heap_id, op_memcpy, shared_robj_g) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) + if (memcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) TEST_ERROR; /* Insert second object too large for managed heap blocks */ @@ -14449,17 +14449,17 @@ test_tiny_insert_mix(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpar FAIL_STACK_ERROR; if (obj_size != robj_size) TEST_ERROR; - HDmemset(shared_robj_g, 0, obj_size); + memset(shared_robj_g, 0, obj_size); if (H5HF_read(fh, heap_id2, shared_robj_g) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) + if (memcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) TEST_ERROR; /* Check 'op' functionality on second huge object */ - HDmemset(shared_robj_g, 0, obj_size); + memset(shared_robj_g, 0, obj_size); if (H5HF_op(fh, heap_id2, op_memcpy, shared_robj_g) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) + if (memcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) TEST_ERROR; /* Insert third object too large for managed heap blocks */ @@ -14486,17 +14486,17 @@ test_tiny_insert_mix(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpar FAIL_STACK_ERROR; if (obj_size != robj_size) TEST_ERROR; - HDmemset(shared_robj_g, 0, obj_size); + memset(shared_robj_g, 0, obj_size); if (H5HF_read(fh, heap_id3, shared_robj_g) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) + if (memcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) TEST_ERROR; /* Check 'op' functionality on third huge object */ - HDmemset(shared_robj_g, 0, obj_size); + memset(shared_robj_g, 0, obj_size); if (H5HF_op(fh, heap_id3, op_memcpy, shared_robj_g) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) + if (memcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) TEST_ERROR; /* Insert fourth object small enough to fit into 'normal' heap blocks */ @@ -14530,17 +14530,17 @@ test_tiny_insert_mix(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpar FAIL_STACK_ERROR; if (obj_size != robj_size) TEST_ERROR; - HDmemset(shared_robj_g, 0, obj_size); + memset(shared_robj_g, 0, obj_size); if (H5HF_read(fh, heap_id4, shared_robj_g) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) + if (memcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) TEST_ERROR; /* Check 'op' functionality on fourth ('normal') object */ - HDmemset(shared_robj_g, 0, obj_size); + memset(shared_robj_g, 0, obj_size); if (H5HF_op(fh, heap_id4, op_memcpy, shared_robj_g) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) + if (memcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) TEST_ERROR; /* Insert fifth object small enough to fit into 'normal' heap blocks */ @@ -14575,17 +14575,17 @@ test_tiny_insert_mix(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpar FAIL_STACK_ERROR; if (obj_size != robj_size) TEST_ERROR; - HDmemset(shared_robj_g, 0, obj_size); + memset(shared_robj_g, 0, obj_size); if (H5HF_read(fh, heap_id5, shared_robj_g) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) + if (memcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) TEST_ERROR; /* Check 'op' functionality on fifth ('normal') object */ - HDmemset(shared_robj_g, 0, obj_size); + memset(shared_robj_g, 0, obj_size); if (H5HF_op(fh, heap_id5, op_memcpy, shared_robj_g) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) + if (memcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) TEST_ERROR; /* Insert sixth object small enough to encode in heap ID */ @@ -14612,17 +14612,17 @@ test_tiny_insert_mix(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpar FAIL_STACK_ERROR; if (obj_size != robj_size) TEST_ERROR; - HDmemset(shared_robj_g, 0, obj_size); + memset(shared_robj_g, 0, obj_size); if (H5HF_read(fh, heap_id6, shared_robj_g) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) + if (memcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) TEST_ERROR; /* Check 'op' functionality on sixth ('tiny') object */ - HDmemset(shared_robj_g, 0, obj_size); + memset(shared_robj_g, 0, obj_size); if (H5HF_op(fh, heap_id6, op_memcpy, shared_robj_g) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) + if (memcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) TEST_ERROR; /* Insert seventh object small enough to encode in heap ID */ @@ -14649,17 +14649,17 @@ test_tiny_insert_mix(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpar FAIL_STACK_ERROR; if (obj_size != robj_size) TEST_ERROR; - HDmemset(shared_robj_g, 0, obj_size); + memset(shared_robj_g, 0, obj_size); if (H5HF_read(fh, heap_id7, shared_robj_g) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) + if (memcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) TEST_ERROR; /* Check 'op' functionality on seventh ('tiny') object */ - HDmemset(shared_robj_g, 0, obj_size); + memset(shared_robj_g, 0, obj_size); if (H5HF_op(fh, heap_id7, op_memcpy, shared_robj_g) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) + if (memcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) TEST_ERROR; /* Delete individual objects, if we won't be deleting the entire heap later */ @@ -14856,7 +14856,7 @@ test_tiny_insert_mix(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpar } /* end else */ /* Check up on heap... */ - HDmemset(&state, 0, sizeof(fheap_heap_state_t)); + memset(&state, 0, sizeof(fheap_heap_state_t)); if (check_stats(fh, &state)) TEST_ERROR; } /* end if */ @@ -14960,7 +14960,7 @@ test_filtered_man_root_direct(hid_t fapl, H5HF_create_t *cparam, fheap_test_para const char *base_desc = "insert one 'managed' object into heap with I/O filters, then remove"; /* Copy heap creation properties */ - HDmemcpy(&tmp_cparam, cparam, sizeof(H5HF_create_t)); + memcpy(&tmp_cparam, cparam, sizeof(H5HF_create_t)); /* Set an I/O filter for heap data */ deflate_level = 6; @@ -15026,10 +15026,10 @@ test_filtered_man_root_direct(hid_t fapl, H5HF_create_t *cparam, fheap_test_para FAIL_STACK_ERROR; if (obj_size != robj_size) TEST_ERROR; - HDmemset(shared_robj_g, 0, obj_size); + memset(shared_robj_g, 0, obj_size); if (H5HF_read(fh, heap_id, shared_robj_g) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) + if (memcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) TEST_ERROR; /* Delete individual objects, if we won't be deleting the entire heap later */ @@ -15045,7 +15045,7 @@ test_filtered_man_root_direct(hid_t fapl, H5HF_create_t *cparam, fheap_test_para TEST_ERROR; /* Check up on heap... */ - HDmemset(&state, 0, sizeof(fheap_heap_state_t)); + memset(&state, 0, sizeof(fheap_heap_state_t)); if (check_stats(fh, &state)) TEST_ERROR; } /* end if */ @@ -15134,7 +15134,7 @@ test_filtered_man_root_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_test_pa const char *base_desc = "insert two 'managed' objects into heap with I/O filters, then remove"; /* Copy heap creation properties */ - HDmemcpy(&tmp_cparam, cparam, sizeof(H5HF_create_t)); + memcpy(&tmp_cparam, cparam, sizeof(H5HF_create_t)); /* Set an I/O filter for heap data */ deflate_level = 6; @@ -15209,10 +15209,10 @@ test_filtered_man_root_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_test_pa FAIL_STACK_ERROR; if (obj_size != robj_size) TEST_ERROR; - HDmemset(shared_robj_g, 0, obj_size); + memset(shared_robj_g, 0, obj_size); if (H5HF_read(fh, heap_id1, shared_robj_g) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) + if (memcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) TEST_ERROR; /* Read in ('normal') object #2 */ @@ -15220,10 +15220,10 @@ test_filtered_man_root_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_test_pa FAIL_STACK_ERROR; if (obj_size != robj_size) TEST_ERROR; - HDmemset(shared_robj_g, 0, obj_size); + memset(shared_robj_g, 0, obj_size); if (H5HF_read(fh, heap_id2, shared_robj_g) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) + if (memcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) TEST_ERROR; /* Delete individual objects, if we won't be deleting the entire heap later */ @@ -15267,7 +15267,7 @@ test_filtered_man_root_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_test_pa FAIL_STACK_ERROR; /* Check up on heap... */ - HDmemset(&state, 0, sizeof(fheap_heap_state_t)); + memset(&state, 0, sizeof(fheap_heap_state_t)); if (check_stats(fh, &state)) TEST_ERROR; @@ -15297,7 +15297,7 @@ test_filtered_man_root_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_test_pa FAIL_STACK_ERROR; /* Check up on heap... */ - HDmemset(&state, 0, sizeof(fheap_heap_state_t)); + memset(&state, 0, sizeof(fheap_heap_state_t)); if (check_stats(fh, &state)) TEST_ERROR; } /* end if */ @@ -15340,7 +15340,7 @@ test_filtered_man_root_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_test_pa FAIL_STACK_ERROR; /* Check up on heap... */ - HDmemset(&state, 0, sizeof(fheap_heap_state_t)); + memset(&state, 0, sizeof(fheap_heap_state_t)); if (check_stats(fh, &state)) TEST_ERROR; @@ -15370,7 +15370,7 @@ test_filtered_man_root_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_test_pa FAIL_STACK_ERROR; /* Check up on heap... */ - HDmemset(&state, 0, sizeof(fheap_heap_state_t)); + memset(&state, 0, sizeof(fheap_heap_state_t)); if (check_stats(fh, &state)) TEST_ERROR; } /* end else */ @@ -15460,10 +15460,10 @@ test_random(hsize_t size_limit, hid_t fapl, H5HF_create_t *cparam, fheap_test_pa size_t u; /* Local index variable */ /* Initialize the heap ID structure */ - HDmemset(&keep_ids, 0, sizeof(fheap_heap_ids_t)); + memset(&keep_ids, 0, sizeof(fheap_heap_ids_t)); /* Copy heap creation properties */ - HDmemcpy(&tmp_cparam, cparam, sizeof(H5HF_create_t)); + memcpy(&tmp_cparam, cparam, sizeof(H5HF_create_t)); /* Check if we are compressing the blocks */ if (tparam->comp == FHEAP_TEST_COMPRESS) { @@ -15508,7 +15508,7 @@ test_random(hsize_t size_limit, hid_t fapl, H5HF_create_t *cparam, fheap_test_pa seed = (unsigned long)HDtime(NULL); #if 0 /* seed = (unsigned long)1156158635; */ -HDfprintf(stderr, "Random # seed was: %lu\n", seed); +fprintf(stderr, "Random # seed was: %lu\n", seed); #endif HDsrandom((unsigned)seed); @@ -15545,9 +15545,9 @@ HDfprintf(stderr, "Random # seed was: %lu\n", seed); /* Swap current position with future position */ /* (just swap the heap ID, the len & offset isn't used */ - HDmemcpy(temp_id, &keep_ids.ids[u * id_len], id_len); - HDmemcpy(&keep_ids.ids[u * id_len], &keep_ids.ids[(u + pos) * id_len], id_len); - HDmemcpy(&keep_ids.ids[(u + pos) * id_len], temp_id, id_len); + memcpy(temp_id, &keep_ids.ids[u * id_len], id_len); + memcpy(&keep_ids.ids[u * id_len], &keep_ids.ids[(u + pos) * id_len], id_len); + memcpy(&keep_ids.ids[(u + pos) * id_len], temp_id, id_len); } /* end if */ } /* end for */ @@ -15608,7 +15608,7 @@ HDfprintf(stderr, "Random # seed was: %lu\n", seed); return (0); error: - HDfprintf(stderr, "Random # seed was: %lu\n", seed); + fprintf(stderr, "Random # seed was: %lu\n", seed); H5E_BEGIN_TRY { H5MM_xfree(keep_ids.ids); @@ -15664,10 +15664,10 @@ test_random_pow2(hsize_t size_limit, hid_t fapl, H5HF_create_t *cparam, fheap_te size_t u; /* Local index variable */ /* Initialize the heap ID structure */ - HDmemset(&keep_ids, 0, sizeof(fheap_heap_ids_t)); + memset(&keep_ids, 0, sizeof(fheap_heap_ids_t)); /* Copy heap creation properties */ - HDmemcpy(&tmp_cparam, cparam, sizeof(H5HF_create_t)); + memcpy(&tmp_cparam, cparam, sizeof(H5HF_create_t)); /* Check if we are compressing the blocks */ if (tparam->comp == FHEAP_TEST_COMPRESS) { @@ -15714,7 +15714,7 @@ test_random_pow2(hsize_t size_limit, hid_t fapl, H5HF_create_t *cparam, fheap_te seed = (unsigned long)HDtime(NULL); #if 0 /* seed = (unsigned long)1155181717; */ -HDfprintf(stderr, "Random # seed was: %lu\n", seed); +fprintf(stderr, "Random # seed was: %lu\n", seed); #endif HDsrandom((unsigned)seed); @@ -15763,9 +15763,9 @@ HDfprintf(stderr, "Random # seed was: %lu\n", seed); /* Swap current position with future position */ /* (just swap the heap ID, the len & offset isn't used */ - HDmemcpy(temp_id, &keep_ids.ids[u * id_len], id_len); - HDmemcpy(&keep_ids.ids[u * id_len], &keep_ids.ids[(u + pos) * id_len], id_len); - HDmemcpy(&keep_ids.ids[(u + pos) * id_len], temp_id, id_len); + memcpy(temp_id, &keep_ids.ids[u * id_len], id_len); + memcpy(&keep_ids.ids[u * id_len], &keep_ids.ids[(u + pos) * id_len], id_len); + memcpy(&keep_ids.ids[(u + pos) * id_len], temp_id, id_len); } /* end if */ } /* end for */ @@ -15826,7 +15826,7 @@ HDfprintf(stderr, "Random # seed was: %lu\n", seed); return (0); error: - HDfprintf(stderr, "Random # seed was: %lu\n", seed); + fprintf(stderr, "Random # seed was: %lu\n", seed); H5E_BEGIN_TRY { H5MM_xfree(keep_ids.ids); @@ -15899,10 +15899,10 @@ test_write(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam) TESTING("writing objects in heap"); /* Initialize the heap ID structure */ - HDmemset(&keep_ids, 0, sizeof(fheap_heap_ids_t)); + memset(&keep_ids, 0, sizeof(fheap_heap_ids_t)); /* Copy heap creation properties */ - HDmemcpy(&tmp_cparam, cparam, sizeof(H5HF_create_t)); + memcpy(&tmp_cparam, cparam, sizeof(H5HF_create_t)); /* Check if we are compressing the blocks */ if (tparam->comp == FHEAP_TEST_COMPRESS) { @@ -15956,7 +15956,7 @@ test_write(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam) ret = H5HF_write(fh, huge_heap_id, &id_changed, shared_wobj_g); } H5E_END_TRY; - HDassert(!id_changed); + assert(!id_changed); if (tparam->comp == FHEAP_TEST_COMPRESS) { if (ret >= 0) TEST_ERROR; @@ -15972,7 +15972,7 @@ test_write(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam) ret = H5HF_write(fh, tiny_heap_id, &id_changed, shared_wobj_g); } H5E_END_TRY; - HDassert(!id_changed); + assert(!id_changed); if (ret >= 0) TEST_ERROR; @@ -16028,14 +16028,14 @@ test_write(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam) /* Overwrite data just written */ if (H5HF_write(fh, &keep_ids.ids[id_len * u], &id_changed, rewrite_obj) < 0) FAIL_STACK_ERROR; - HDassert(!id_changed); + assert(!id_changed); /* Read data back in */ if (H5HF_read(fh, &keep_ids.ids[id_len * u], shared_robj_g) < 0) FAIL_STACK_ERROR; /* Compare data read in */ - if (HDmemcmp(rewrite_obj, shared_robj_g, obj_size) != 0) + if (memcmp(rewrite_obj, shared_robj_g, obj_size) != 0) TEST_ERROR; /* Change size of data to write */ @@ -16084,7 +16084,7 @@ test_write(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam) FAIL_STACK_ERROR; /* Compare data read in */ - if (HDmemcmp(rewrite_obj, shared_robj_g, obj_size) != 0) + if (memcmp(rewrite_obj, shared_robj_g, obj_size) != 0) TEST_ERROR; /* Change size of data to write */ @@ -16169,7 +16169,7 @@ test_bug1(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam) TESTING("bug1: inserting several objects & removing one, then re-inserting"); /* Initialize the heap ID structure */ - HDmemset(&keep_ids, 0, sizeof(fheap_heap_ids_t)); + memset(&keep_ids, 0, sizeof(fheap_heap_ids_t)); /* Perform common file & heap open operations */ if (open_heap(filename, fapl, cparam, tparam, &file, &f, &fh, &fh_addr, &state, &empty_size) < 0) @@ -16362,7 +16362,7 @@ main(void) * in the future for parallel build. */ if (ExpressMode > 1) - HDprintf("***Express test mode on. Some tests may be skipped\n"); + printf("***Express test mode on. Some tests may be skipped\n"); else if (ExpressMode == 0) { #ifdef H5_HAVE_PARALLEL num_pb_fs = NUM_PB_FS - 2; @@ -16477,7 +16477,7 @@ main(void) /* Iterate over the testing parameters */ for (curr_test = FHEAP_TEST_NORMAL; curr_test < FHEAP_TEST_NTESTS; curr_test++) { /* Clear the testing parameters */ - HDmemset(&tparam, 0, sizeof(fheap_test_param_t)); + memset(&tparam, 0, sizeof(fheap_test_param_t)); tparam.actual_id_len = HEAP_ID_LEN; /* Set to run with different file space setting */ @@ -16580,7 +16580,7 @@ main(void) * level of complexity gradually. -QAK */ if (ExpressMode > 1) - HDprintf( + printf( "***Express test mode on. test_man_start_5th_recursive_indirect is skipped\n"); else nerrors += test_man_start_5th_recursive_indirect(fapl, &small_cparam, &tparam); @@ -16628,7 +16628,7 @@ main(void) nerrors += test_man_remove_first_two_rows(fapl, &small_cparam, &tparam); nerrors += test_man_remove_first_four_rows(fapl, &small_cparam, &tparam); if (ExpressMode > 1) - HDprintf("***Express test mode on. Some tests skipped\n"); + printf("***Express test mode on. Some tests skipped\n"); else { nerrors += test_man_remove_all_root_direct(fapl, &small_cparam, &tparam); nerrors += test_man_remove_2nd_indirect(fapl, &small_cparam, &tparam); @@ -16678,7 +16678,7 @@ main(void) test_man_fill_1st_row_3rd_direct_fill_2nd_direct_less_one_wrap_start_block_add_skipped( fapl, &small_cparam, &tparam); if (ExpressMode > 1) - HDprintf("***Express test mode on. Some tests skipped\n"); + printf("***Express test mode on. Some tests skipped\n"); else { nerrors += test_man_fill_3rd_direct_fill_direct_skip_start_block_add_skipped( @@ -16808,7 +16808,7 @@ main(void) /* Random object insertion & deletion */ if (ExpressMode > 1) - HDprintf("***Express test mode on. Some tests skipped\n"); + printf("***Express test mode on. Some tests skipped\n"); else { /* Random tests using "small" heap creation parameters */ HDputs("Using 'small' heap creation parameters"); diff --git a/test/file_image.c b/test/file_image.c index e9f50c3..9d591a6 100644 --- a/test/file_image.c +++ b/test/file_image.c @@ -102,7 +102,7 @@ test_properties(void) * not be the case. */ size = (size_t)count * sizeof(char); - if (NULL == (buffer = (char *)HDmalloc(size))) + if (NULL == (buffer = (char *)malloc(size))) TEST_ERROR; for (i = 0; i < count - 1; i++) buffer[i] = (char)(65 + i); @@ -132,7 +132,7 @@ test_properties(void) VERIFY(temp != NULL, "temp is null!"); VERIFY(temp_size == size, "Sizes of buffers don't match"); VERIFY(temp != buffer, "Retrieved buffer is the same as original"); - VERIFY(0 == HDmemcmp(temp, buffer, size), "Buffers contain different data"); + VERIFY(0 == memcmp(temp, buffer, size), "Buffers contain different data"); /* Copy the fapl */ if ((fapl_2 = H5Pcopy(fapl_1)) < 0) @@ -147,7 +147,7 @@ test_properties(void) VERIFY(temp2 != NULL, "Received buffer not set"); VERIFY(temp2 != buffer, "Retrieved buffer is the same as original"); VERIFY(temp2 != temp, "Retrieved buffer is the same as previously retrieved buffer"); - VERIFY(0 == HDmemcmp(temp2, buffer, size), "Buffers contain different data"); + VERIFY(0 == memcmp(temp2, buffer, size), "Buffers contain different data"); retval = 0; @@ -158,7 +158,7 @@ error: retval = 1; if (H5Pclose(fapl_2) < 0) retval = 1; - HDfree(buffer); + free(buffer); H5free_memory(temp); H5free_memory(temp2); @@ -187,7 +187,7 @@ malloc_cb(size_t size, H5FD_file_image_op_t op, void *udata) u->used_callbacks |= MALLOC; u->malloc_src = op; - return HDmalloc(size); + return malloc(size); } /****************************************************************************** @@ -209,7 +209,7 @@ memcpy_cb(void *dest, const void *src, size_t size, H5FD_file_image_op_t op, voi u->used_callbacks |= MEMCPY; u->memcpy_src = op; - return HDmemcpy(dest, src, size); + return memcpy(dest, src, size); } /****************************************************************************** @@ -231,7 +231,7 @@ realloc_cb(void *ptr, size_t size, H5FD_file_image_op_t op, void *udata) u->used_callbacks |= REALLOC; u->realloc_src = op; - return HDrealloc(ptr, size); + return realloc(ptr, size); } /****************************************************************************** @@ -251,7 +251,7 @@ free_cb(void *ptr, H5FD_file_image_op_t op, void *udata) u->used_callbacks |= FREE; u->free_src = op; - HDfree(ptr); + free(ptr); return (SUCCEED); } @@ -349,7 +349,7 @@ test_callbacks(void) TESTING("Callback use in property list operations"); /* Allocate and initialize udata */ - udata = (udata_t *)HDmalloc(sizeof(udata_t)); + udata = (udata_t *)malloc(sizeof(udata_t)); VERIFY(udata != NULL, "udata malloc failed"); reset_udata(udata); @@ -358,7 +358,7 @@ test_callbacks(void) /* Allocate and initialize file image buffer */ size = (size_t)count * sizeof(char); - file_image = (char *)HDmalloc(size); + file_image = (char *)malloc(size); VERIFY(file_image != NULL, "file_image malloc failed"); for (i = 0; i < count - 1; i++) file_image[i] = (char)(65 + i); @@ -523,16 +523,16 @@ test_callbacks(void) /* Close stuff */ if (H5Pclose(fapl_1) < 0) FAIL_STACK_ERROR; - HDfree(file_image); - HDfree(temp_file_image); - HDfree(udata); + free(file_image); + free(temp_file_image); + free(udata); PASSED(); return 0; error: - HDfree(file_image); - HDfree(udata); + free(file_image); + free(udata); return 1; } /* test_callbacks() */ @@ -592,7 +592,7 @@ test_core(void) VERIFY(ret >= 0, "h5_make_local_copy"); /* Allocate and initialize udata */ - udata = (udata_t *)HDmalloc(sizeof(udata_t)); + udata = (udata_t *)malloc(sizeof(udata_t)); VERIFY(udata != NULL, "udata malloc failed"); /* copy the address of the udata into the callbacks structure */ @@ -661,7 +661,7 @@ test_core(void) ret = HDfstat(fd, &sb); VERIFY(ret == 0, "fstat failed"); size = (size_t)sb.st_size; - file_image = (unsigned char *)HDmalloc(size); + file_image = (unsigned char *)malloc(size); if (HDread(fd, file_image, size) < 0) FAIL_PUTS_ERROR("unable to read from file descriptor"); ret = HDclose(fd); @@ -679,8 +679,8 @@ test_core(void) /* Release resources */ h5_clean_files(FILENAME, fapl); - HDfree(udata); - HDfree(file_image); + free(udata); + free(file_image); HDremove(copied_filename); PASSED(); @@ -785,8 +785,8 @@ test_get_file_image(const char *test_banner, const int file_name_num, hid_t fapl VERIFY(image_size > 0, "H5Fget_file_image(1) failed."); /* allocate a buffer of the appropriate size */ - image_ptr = HDmalloc((size_t)image_size); - VERIFY(image_ptr != NULL, "HDmalloc(1) failed."); + image_ptr = malloc((size_t)image_size); + VERIFY(image_ptr != NULL, "malloc(1) failed."); /* load the image of the file into the buffer */ bytes_read = H5Fget_file_image(file_id, image_ptr, (size_t)image_size); @@ -835,8 +835,8 @@ test_get_file_image(const char *test_banner, const int file_name_num, hid_t fapl VERIFY(file_size >= image_size, "file size != image size."); /* allocate a buffer for the test file image */ - file_image_ptr = HDmalloc((size_t)file_size); - VERIFY(file_image_ptr != NULL, "HDmalloc(2f) failed."); + file_image_ptr = malloc((size_t)file_size); + VERIFY(file_image_ptr != NULL, "malloc(2f) failed."); size_remaining = image_size; insertion_ptr = file_image_ptr; @@ -893,8 +893,8 @@ test_get_file_image(const char *test_banner, const int file_name_num, hid_t fapl VERIFY(file_size == image_size, "file size != image size."); /* allocate a buffer for the test file image */ - file_image_ptr = HDmalloc((size_t)file_size); - VERIFY(file_image_ptr != NULL, "HDmalloc(2) failed."); + file_image_ptr = malloc((size_t)file_size); + VERIFY(file_image_ptr != NULL, "malloc(2) failed."); /* open the test file using standard I/O calls */ fd = HDopen(file_name, O_RDONLY); @@ -958,11 +958,11 @@ test_get_file_image(const char *test_banner, const int file_name_num, hid_t fapl /* discard the image buffer if it exists */ if (image_ptr != NULL) - HDfree(image_ptr); + free(image_ptr); /* discard the image buffer if it exists */ if (file_image_ptr != NULL) - HDfree(file_image_ptr); + free(file_image_ptr); PASSED(); @@ -1061,8 +1061,8 @@ test_get_file_image_error_rejection(void) VERIFY(image_size > 0, "H5Fget_file_image(1 -- test 1) failed."); /* allocate a buffer of the appropriate size */ - image_ptr = HDmalloc((size_t)image_size); - VERIFY(image_ptr != NULL, "HDmalloc(1) failed."); + image_ptr = malloc((size_t)image_size); + VERIFY(image_ptr != NULL, "malloc(1) failed."); /* load the image of the file into the buffer */ H5E_BEGIN_TRY @@ -1107,7 +1107,7 @@ test_get_file_image_error_rejection(void) /* discard the image buffer if it exists */ if (image_ptr != NULL) - HDfree(image_ptr); + free(image_ptr); /************************** Test #2 **********************************/ /* set up a multi file driver test file, and try to get its image @@ -1349,7 +1349,7 @@ main(void) h5_reset(); - HDprintf("Testing File Image Functionality.\n"); + printf("Testing File Image Functionality.\n"); errors += test_properties(); errors += test_callbacks(); @@ -1412,10 +1412,10 @@ main(void) h5_restore_err(); if (errors) { - HDprintf("***** %d File Image TEST%s FAILED! *****\n", errors, errors > 1 ? "S" : ""); + printf("***** %d File Image TEST%s FAILED! *****\n", errors, errors > 1 ? "S" : ""); return 1; } - HDprintf("All File Image tests passed.\n"); + printf("All File Image tests passed.\n"); return 0; } diff --git a/test/filenotclosed.c b/test/filenotclosed.c index 7f4d5d7..a2b0bdb 100644 --- a/test/filenotclosed.c +++ b/test/filenotclosed.c @@ -34,7 +34,7 @@ static void catch_signal(int H5_ATTR_UNUSED signo) { - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); } /* catch_signal() */ /*------------------------------------------------------------------------- @@ -80,7 +80,7 @@ main(void) if (!contig_addr_vfd) { SKIPPED(); HDputs(" Temporary skipped for a spilt/multi driver"); - HDexit(EXIT_SUCCESS); + exit(EXIT_SUCCESS); } h5_reset(); @@ -136,9 +136,9 @@ main(void) /* The file is not closed. */ /* The library will call H5_term_library to shut down the library. */ - HDexit(EXIT_SUCCESS); + exit(EXIT_SUCCESS); error: HDputs("*** TEST FAILED ***"); - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); } diff --git a/test/fillval.c b/test/fillval.c index 489aa76..8254ba3 100644 --- a/test/fillval.c +++ b/test/fillval.c @@ -323,7 +323,7 @@ test_getset_vl(hid_t fapl) TEST_ERROR; /* Release the fill value retrieved */ - HDfree(f2); + free(f2); /* Open file. */ h5_fixname(FILENAME[0], fapl, filename, sizeof filename); @@ -365,7 +365,7 @@ test_getset_vl(hid_t fapl) TEST_ERROR; /* Release the fill value retrieved */ - HDfree(f2); + free(f2); /* Close IDs */ if (H5Dclose(datasetid) < 0) @@ -610,8 +610,8 @@ test_create(hid_t fapl, const char *base_name, H5D_layout_t layout) goto error; if (rd_s != fill_s) { H5_FAILED(); - HDprintf(" %d: Got a different fill value than what was set.", __LINE__); - HDprintf(" Got %d, set %d\n", rd_s, fill_s); + printf(" %d: Got a different fill value than what was set.", __LINE__); + printf(" Got %d, set %d\n", rd_s, fill_s); goto error; } #endif @@ -630,8 +630,8 @@ test_create(hid_t fapl, const char *base_name, H5D_layout_t layout) goto error; if (rd_l != fill_l) { H5_FAILED(); - HDprintf(" %d: Got a different fill value than what was set.", __LINE__); - HDprintf(" Got %ld, set %ld\n", rd_l, fill_l); + printf(" %d: Got a different fill value than what was set.", __LINE__); + printf(" Got %ld, set %ld\n", rd_l, fill_l); goto error; } #endif @@ -650,8 +650,8 @@ test_create(hid_t fapl, const char *base_name, H5D_layout_t layout) goto error; if (rd_l != fill_l) { H5_FAILED(); - HDprintf(" %d: Got a different fill value than what was set.", __LINE__); - HDprintf(" Got %ld, set %ld\n", rd_l, fill_l); + printf(" %d: Got a different fill value than what was set.", __LINE__); + printf(" Got %ld, set %ld\n", rd_l, fill_l); goto error; } #endif @@ -662,12 +662,12 @@ test_create(hid_t fapl, const char *base_name, H5D_layout_t layout) if (alloc_time != H5D_ALLOC_TIME_LATE) { H5_FAILED(); HDputs(" Got non-H5D_ALLOC_TIME_LATE space allocation time."); - HDprintf(" Got %d\n", alloc_time); + printf(" Got %d\n", alloc_time); } if (fill_time != H5D_FILL_TIME_ALLOC) { H5_FAILED(); HDputs(" Got non-H5D_FILL_TIME_ALLOC fill value write time."); - HDprintf(" Got %d\n", fill_time); + printf(" Got %d\n", fill_time); } if (H5Dclose(dset3) < 0) goto error; @@ -682,7 +682,7 @@ test_create(hid_t fapl, const char *base_name, H5D_layout_t layout) if (layout == H5D_CONTIGUOUS && allocation != H5D_SPACE_STATUS_NOT_ALLOCATED) { H5_FAILED(); HDputs(" Got allocated space instead of unallocated."); - HDprintf(" Got %d\n", allocation); + printf(" Got %d\n", allocation); goto error; } if ((dcpl = H5Dget_create_plist(dset4)) < 0) @@ -694,12 +694,12 @@ test_create(hid_t fapl, const char *base_name, H5D_layout_t layout) if (alloc_time != H5D_ALLOC_TIME_LATE) { H5_FAILED(); HDputs(" Got non-H5D_ALLOC_TIME_LATE space allocation time."); - HDprintf(" Got %d\n", alloc_time); + printf(" Got %d\n", alloc_time); } if (fill_time != H5D_FILL_TIME_NEVER) { H5_FAILED(); HDputs(" Got non-H5D_FILL_TIME_NEVER fill value write time."); - HDprintf(" Got %d\n", fill_time); + printf(" Got %d\n", fill_time); } if (H5Dclose(dset4) < 0) goto error; @@ -717,8 +717,8 @@ test_create(hid_t fapl, const char *base_name, H5D_layout_t layout) rd_c.z != '\0') { H5_FAILED(); HDputs(" Got wrong fill value"); - HDprintf(" Got rd_c.a=%f, rd_c.y=%f and rd_c.x=%d, rd_c.z=%c\n", (double)rd_c.a, rd_c.y, - rd_c.x, rd_c.z); + printf(" Got rd_c.a=%f, rd_c.y=%f and rd_c.x=%d, rd_c.z=%c\n", (double)rd_c.a, rd_c.y, rd_c.x, + rd_c.z); } if (H5Dclose(dset9) < 0) goto error; @@ -737,8 +737,8 @@ test_create(hid_t fapl, const char *base_name, H5D_layout_t layout) goto error; if (layout == H5D_CONTIGUOUS && allocation != H5D_SPACE_STATUS_ALLOCATED) { H5_FAILED(); - HDprintf(" %d: Got unallocated space instead of allocated.\n", __LINE__); - HDprintf(" Got %d\n", allocation); + printf(" %d: Got unallocated space instead of allocated.\n", __LINE__); + printf(" Got %d\n", allocation); goto error; } if (H5Pget_alloc_time(dcpl, &alloc_time) < 0) @@ -746,14 +746,14 @@ test_create(hid_t fapl, const char *base_name, H5D_layout_t layout) if (alloc_time != H5D_ALLOC_TIME_EARLY) { H5_FAILED(); HDputs(" Got non-H5D_ALLOC_TIME_EARLY space allocation time."); - HDprintf(" Got %d\n", alloc_time); + printf(" Got %d\n", alloc_time); } if (H5Pget_fill_time(dcpl, &fill_time) < 0) goto error; if (fill_time != H5D_FILL_TIME_NEVER) { H5_FAILED(); HDputs(" Got non-H5D_FILL_TIME_NEVER fill value write time."); - HDprintf(" Got %d\n", fill_time); + printf(" Got %d\n", fill_time); } if (H5Dclose(dset5) < 0) goto error; @@ -769,16 +769,16 @@ test_create(hid_t fapl, const char *base_name, H5D_layout_t layout) goto error; if (layout == H5D_CONTIGUOUS && allocation != H5D_SPACE_STATUS_ALLOCATED) { H5_FAILED(); - HDprintf(" %d: Got unallocated space instead of allocated.\n", __LINE__); - HDprintf(" Got %d\n", allocation); + printf(" %d: Got unallocated space instead of allocated.\n", __LINE__); + printf(" Got %d\n", allocation); goto error; } if (H5Pget_fill_value(dcpl, H5T_NATIVE_LONG, &rd_l) < 0) goto error; if (rd_l != fill_l) { H5_FAILED(); - HDprintf(" %d: Got a different fill value than what was set.", __LINE__); - HDprintf(" Got %ld, set %ld\n", rd_l, fill_l); + printf(" %d: Got a different fill value than what was set.", __LINE__); + printf(" Got %ld, set %ld\n", rd_l, fill_l); goto error; } if (H5Pget_alloc_time(dcpl, &alloc_time) < 0) @@ -786,14 +786,14 @@ test_create(hid_t fapl, const char *base_name, H5D_layout_t layout) if (alloc_time != H5D_ALLOC_TIME_EARLY) { H5_FAILED(); HDputs(" Got non-H5D_ALLOC_TIME_EARLY space allocation time."); - HDprintf(" Got %d\n", alloc_time); + printf(" Got %d\n", alloc_time); } if (H5Pget_fill_time(dcpl, &fill_time) < 0) goto error; if (fill_time != H5D_FILL_TIME_ALLOC) { H5_FAILED(); HDputs(" Got non-H5D_FILL_TIME_ALLOC fill value write time."); - HDprintf(" Got %d\n", fill_time); + printf(" Got %d\n", fill_time); } if (H5Dclose(dset6) < 0) goto error; @@ -811,8 +811,8 @@ test_create(hid_t fapl, const char *base_name, H5D_layout_t layout) rd_c.z != '\0') { H5_FAILED(); HDputs(" Got wrong fill value"); - HDprintf(" Got rd_c.a=%f, rd_c.y=%f and rd_c.x=%d, rd_c.z=%c\n", (double)rd_c.a, rd_c.y, rd_c.x, - rd_c.z); + printf(" Got rd_c.a=%f, rd_c.y=%f and rd_c.x=%d, rd_c.z=%c\n", (double)rd_c.a, rd_c.y, rd_c.x, + rd_c.z); } if (H5Dclose(dset8) < 0) goto error; @@ -920,13 +920,13 @@ test_rdwr_cases(hid_t file, hid_t dcpl, const char *dname, void *_fillval, H5D_f goto error; if (fill_time != H5D_FILL_TIME_NEVER && val_rd != fillval) { H5_FAILED(); - HDfprintf(stdout, "%u: Value read was not a fill value.\n", (unsigned)__LINE__); - HDfprintf(stdout, - " Elmt={%" PRIuHSIZE ",%" PRIuHSIZE ",%" PRIuHSIZE ",%" PRIuHSIZE ",%" PRIuHSIZE - "}, read: %u, " - "Fill value: %u\n", - hs_offset[0], hs_offset[1], hs_offset[2], hs_offset[3], hs_offset[4], val_rd, - fillval); + fprintf(stdout, "%u: Value read was not a fill value.\n", (unsigned)__LINE__); + fprintf(stdout, + " Elmt={%" PRIuHSIZE ",%" PRIuHSIZE ",%" PRIuHSIZE ",%" PRIuHSIZE ",%" PRIuHSIZE + "}, read: %u, " + "Fill value: %u\n", + hs_offset[0], hs_offset[1], hs_offset[2], hs_offset[3], hs_offset[4], val_rd, + fillval); goto error; } /* case for compound datatype */ @@ -938,14 +938,13 @@ test_rdwr_cases(hid_t file, hid_t dcpl, const char *dname, void *_fillval, H5D_f (!H5_FLT_ABS_EQUAL(rd_c.a, fill_c.a) || rd_c.x != fill_c.x || !H5_DBL_ABS_EQUAL(rd_c.y, fill_c.y) || rd_c.z != fill_c.z)) { H5_FAILED(); - HDfprintf(stdout, "%u: Value read was not a fill value.\n", (unsigned)__LINE__); - HDfprintf(stdout, - " Elmt={%" PRIuHSIZE ",%" PRIuHSIZE ",%" PRIuHSIZE ",%" PRIuHSIZE ",%" PRIuHSIZE - "}, read: %f, %d, %f, %c" - "Fill value: %f, %d, %f, %c\n", - hs_offset[0], hs_offset[1], hs_offset[2], hs_offset[3], hs_offset[4], - (double)rd_c.a, rd_c.x, rd_c.y, rd_c.z, (double)fill_c.a, fill_c.x, fill_c.y, - fill_c.z); + fprintf(stdout, "%u: Value read was not a fill value.\n", (unsigned)__LINE__); + fprintf(stdout, + " Elmt={%" PRIuHSIZE ",%" PRIuHSIZE ",%" PRIuHSIZE ",%" PRIuHSIZE ",%" PRIuHSIZE + "}, read: %f, %d, %f, %c" + "Fill value: %f, %d, %f, %c\n", + hs_offset[0], hs_offset[1], hs_offset[2], hs_offset[3], hs_offset[4], (double)rd_c.a, + rd_c.x, rd_c.y, rd_c.z, (double)fill_c.a, fill_c.x, fill_c.y, fill_c.z); goto error; } } @@ -970,8 +969,8 @@ test_rdwr_cases(hid_t file, hid_t dcpl, const char *dname, void *_fillval, H5D_f /* case for atomic datatype */ if (datatype == H5T_INTEGER) { /*check for overflow*/ - HDassert((nelmts * sizeof(int)) == (hsize_t)((size_t)(nelmts * sizeof(int)))); - buf = (int *)HDmalloc((size_t)(nelmts * sizeof(int))); + assert((nelmts * sizeof(int)) == (hsize_t)((size_t)(nelmts * sizeof(int)))); + buf = (int *)malloc((size_t)(nelmts * sizeof(int))); if (H5Dread(dset1, H5T_NATIVE_INT, mspace, fspace, H5P_DEFAULT, buf) < 0) goto error; @@ -981,13 +980,13 @@ test_rdwr_cases(hid_t file, hid_t dcpl, const char *dname, void *_fillval, H5D_f for (u = 0; u < nelmts; u++) { if (buf[u] != fillval) { H5_FAILED(); - HDfprintf(stdout, "%u: Value read was not a fill value.\n", (unsigned)__LINE__); - HDfprintf(stdout, - " Elmt={%" PRIuHSIZE ", %" PRIuHSIZE ", %" PRIuHSIZE ", %" PRIuHSIZE - ", %" PRIuHSIZE "}, read: %u, " - "Fill value: %u\n", - hs_offset[0], hs_offset[1], hs_offset[2], hs_offset[3], hs_offset[4], buf[u], - fillval); + fprintf(stdout, "%u: Value read was not a fill value.\n", (unsigned)__LINE__); + fprintf(stdout, + " Elmt={%" PRIuHSIZE ", %" PRIuHSIZE ", %" PRIuHSIZE ", %" PRIuHSIZE + ", %" PRIuHSIZE "}, read: %u, " + "Fill value: %u\n", + hs_offset[0], hs_offset[1], hs_offset[2], hs_offset[3], hs_offset[4], buf[u], + fillval); goto error; } /* end if */ } /* end for */ @@ -996,8 +995,8 @@ test_rdwr_cases(hid_t file, hid_t dcpl, const char *dname, void *_fillval, H5D_f /* case for compound datatype */ else if (datatype == H5T_COMPOUND) { /*check for overflow*/ - HDassert((nelmts * sizeof(comp_datatype)) == (hsize_t)((size_t)(nelmts * sizeof(comp_datatype)))); - buf_c = (comp_datatype *)HDmalloc((size_t)nelmts * sizeof(comp_datatype)); + assert((nelmts * sizeof(comp_datatype)) == (hsize_t)((size_t)(nelmts * sizeof(comp_datatype)))); + buf_c = (comp_datatype *)malloc((size_t)nelmts * sizeof(comp_datatype)); if (H5Dread(dset2, ctype_id, mspace, fspace, H5P_DEFAULT, buf_c) < 0) goto error; @@ -1008,14 +1007,14 @@ test_rdwr_cases(hid_t file, hid_t dcpl, const char *dname, void *_fillval, H5D_f if (!H5_FLT_ABS_EQUAL(buf_c[u].a, fill_c.a) || buf_c[u].x != fill_c.x || !H5_DBL_ABS_EQUAL(buf_c[u].y, fill_c.y) || buf_c[u].z != fill_c.z) { H5_FAILED(); - HDfprintf(stdout, "%u: Value read was not a fill value.\n", (unsigned)__LINE__); - HDfprintf(stdout, - " Elmt={%" PRIuHSIZE ", %" PRIuHSIZE ", %" PRIuHSIZE ", %" PRIuHSIZE - ", %" PRIuHSIZE "}, read: %f, %d, %f, %c" - "Fill value: %f, %d, %f, %c\n", - hs_offset[0], hs_offset[1], hs_offset[2], hs_offset[3], hs_offset[4], - (double)buf_c[u].a, buf_c[u].x, buf_c[u].y, buf_c[u].z, (double)fill_c.a, - fill_c.x, fill_c.y, fill_c.z); + fprintf(stdout, "%u: Value read was not a fill value.\n", (unsigned)__LINE__); + fprintf(stdout, + " Elmt={%" PRIuHSIZE ", %" PRIuHSIZE ", %" PRIuHSIZE ", %" PRIuHSIZE + ", %" PRIuHSIZE "}, read: %f, %d, %f, %c" + "Fill value: %f, %d, %f, %c\n", + hs_offset[0], hs_offset[1], hs_offset[2], hs_offset[3], hs_offset[4], + (double)buf_c[u].a, buf_c[u].x, buf_c[u].y, buf_c[u].z, (double)fill_c.a, + fill_c.x, fill_c.y, fill_c.z); goto error; } /* end if */ } /* end for */ @@ -1033,7 +1032,7 @@ test_rdwr_cases(hid_t file, hid_t dcpl, const char *dname, void *_fillval, H5D_f } /* case for compound datatype */ else if (datatype == H5T_COMPOUND) { - HDmemset(buf_c, 0, ((size_t)nelmts * sizeof(comp_datatype))); + memset(buf_c, 0, ((size_t)nelmts * sizeof(comp_datatype))); for (u = 0; u < nelmts; u++) { buf_c[u].a = 1111.11F; buf_c[u].x = 2222; @@ -1051,11 +1050,11 @@ test_rdwr_cases(hid_t file, hid_t dcpl, const char *dname, void *_fillval, H5D_f goto error; if (layout == H5D_CONTIGUOUS && allocation != H5D_SPACE_STATUS_ALLOCATED) { H5_FAILED(); - HDprintf(" %d: Got unallocated space instead of allocated.\n", __LINE__); - HDprintf(" Got %d\n", allocation); + printf(" %d: Got unallocated space instead of allocated.\n", __LINE__); + printf(" Got %d\n", allocation); goto error; } - HDfree(buf); + free(buf); buf = NULL; H5Sclose(mspace); @@ -1078,11 +1077,11 @@ test_rdwr_cases(hid_t file, hid_t dcpl, const char *dname, void *_fillval, H5D_f should_be = odd ? fillval : 9999; if (val_rd != should_be) { H5_FAILED(); - HDfprintf(stdout, "%u: Value read was not correct.\n", (unsigned)__LINE__); - HDprintf(" Elmt={%ld,%ld,%ld,%ld,%ld}, read: %u, " - "should be: %u\n", - (long)hs_offset[0], (long)hs_offset[1], (long)hs_offset[2], (long)hs_offset[3], - (long)hs_offset[4], val_rd, should_be); + fprintf(stdout, "%u: Value read was not correct.\n", (unsigned)__LINE__); + printf(" Elmt={%ld,%ld,%ld,%ld,%ld}, read: %u, " + "should be: %u\n", + (long)hs_offset[0], (long)hs_offset[1], (long)hs_offset[2], (long)hs_offset[3], + (long)hs_offset[4], val_rd, should_be); goto error; } } @@ -1090,11 +1089,11 @@ test_rdwr_cases(hid_t file, hid_t dcpl, const char *dname, void *_fillval, H5D_f should_be = 9999; if (val_rd != should_be) { H5_FAILED(); - HDfprintf(stdout, "%u: Value read was not correct.\n", (unsigned)__LINE__); - HDprintf(" Elmt={%ld,%ld,%ld,%ld,%ld}, read: %u, " - "should be: %u\n", - (long)hs_offset[0], (long)hs_offset[1], (long)hs_offset[2], (long)hs_offset[3], - (long)hs_offset[4], val_rd, should_be); + fprintf(stdout, "%u: Value read was not correct.\n", (unsigned)__LINE__); + printf(" Elmt={%ld,%ld,%ld,%ld,%ld}, read: %u, " + "should be: %u\n", + (long)hs_offset[0], (long)hs_offset[1], (long)hs_offset[2], (long)hs_offset[3], + (long)hs_offset[4], val_rd, should_be); goto error; } } @@ -1122,12 +1121,12 @@ test_rdwr_cases(hid_t file, hid_t dcpl, const char *dname, void *_fillval, H5D_f if (!H5_FLT_ABS_EQUAL(rd_c.a, should_be_c.a) || rd_c.x != should_be_c.x || !H5_DBL_ABS_EQUAL(rd_c.y, should_be_c.y) || rd_c.z != should_be_c.z) { H5_FAILED(); - HDfprintf(stdout, "%u: Value read was not correct.\n", (unsigned)__LINE__); - HDprintf(" Elmt={%ld,%ld,%ld,%ld,%ld}, read: %f,%d,%f,%c " - "should be: %f,%d,%f,%c\n", - (long)hs_offset[0], (long)hs_offset[1], (long)hs_offset[2], (long)hs_offset[3], - (long)hs_offset[4], (double)rd_c.a, rd_c.x, rd_c.y, rd_c.z, - (double)should_be_c.a, should_be_c.x, should_be_c.y, should_be_c.z); + fprintf(stdout, "%u: Value read was not correct.\n", (unsigned)__LINE__); + printf(" Elmt={%ld,%ld,%ld,%ld,%ld}, read: %f,%d,%f,%c " + "should be: %f,%d,%f,%c\n", + (long)hs_offset[0], (long)hs_offset[1], (long)hs_offset[2], (long)hs_offset[3], + (long)hs_offset[4], (double)rd_c.a, rd_c.x, rd_c.y, rd_c.z, (double)should_be_c.a, + should_be_c.x, should_be_c.y, should_be_c.z); goto error; } } /* end for fill_time == H5D_FILL_TIME_ALLOC */ @@ -1139,12 +1138,12 @@ test_rdwr_cases(hid_t file, hid_t dcpl, const char *dname, void *_fillval, H5D_f if (!H5_FLT_ABS_EQUAL(rd_c.a, should_be_c.a) || rd_c.x != should_be_c.x || !H5_DBL_ABS_EQUAL(rd_c.y, should_be_c.y) || rd_c.z != should_be_c.z) { H5_FAILED(); - HDfprintf(stdout, "%u: Value read was not correct.\n", (unsigned)__LINE__); - HDprintf(" Elmt={%ld,%ld,%ld,%ld,%ld}, read: %f,%d,%f,%c " - "should be: %f,%d,%f,%c\n", - (long)hs_offset[0], (long)hs_offset[1], (long)hs_offset[2], (long)hs_offset[3], - (long)hs_offset[4], (double)rd_c.a, rd_c.x, rd_c.y, rd_c.z, - (double)should_be_c.a, should_be_c.x, should_be_c.y, should_be_c.z); + fprintf(stdout, "%u: Value read was not correct.\n", (unsigned)__LINE__); + printf(" Elmt={%ld,%ld,%ld,%ld,%ld}, read: %f,%d,%f,%c " + "should be: %f,%d,%f,%c\n", + (long)hs_offset[0], (long)hs_offset[1], (long)hs_offset[2], (long)hs_offset[3], + (long)hs_offset[4], (double)rd_c.a, rd_c.x, rd_c.y, rd_c.z, (double)should_be_c.a, + should_be_c.x, should_be_c.y, should_be_c.z); goto error; } } /* end for fill_time == H5D_FILL_TIME_NEVER */ @@ -1154,7 +1153,7 @@ test_rdwr_cases(hid_t file, hid_t dcpl, const char *dname, void *_fillval, H5D_f } /* end for datatype==H5T_COMPOUND */ } if (datatype == H5T_COMPOUND) { - HDfree(buf_c); + free(buf_c); buf_c = NULL; } /* end if */ @@ -1286,7 +1285,7 @@ test_rdwr(hid_t fapl, const char *base_name, H5D_layout_t layout) * as compound type */ if (H5Pset_fill_time(dcpl, H5D_FILL_TIME_ALLOC) < 0) goto error; - HDmemset(&fill_ctype, 0, sizeof(fill_ctype)); + memset(&fill_ctype, 0, sizeof(fill_ctype)); fill_ctype.y = 4444.4444; if (H5Pset_fill_value(dcpl, ctype_id, &fill_ctype) < 0) goto error; @@ -1352,7 +1351,7 @@ test_rdwr(hid_t fapl, const char *base_name, H5D_layout_t layout) * as compound type */ if (H5Pset_fill_time(dcpl, H5D_FILL_TIME_ALLOC) < 0) goto error; - HDmemset(&fill_ctype, 0, sizeof(fill_ctype)); + memset(&fill_ctype, 0, sizeof(fill_ctype)); fill_ctype.y = 4444.4444; if (H5Pset_fill_value(dcpl, ctype_id, &fill_ctype) < 0) goto error; @@ -1430,12 +1429,12 @@ test_extend_verify_integer(unsigned lineno, const hsize_t *offset, const void *_ /* Verify value */ if (*test_val != *compare_val) { - HDfprintf(stdout, "%u: Value read was not expected.\n", lineno); - HDfprintf(stdout, - " Elmt = {%" PRIuHSIZE ", %" PRIuHSIZE ", %" PRIuHSIZE ", %" PRIuHSIZE ", %" PRIuHSIZE - "}, read: %d, " - "expected: %d\n", - offset[0], offset[1], offset[2], offset[3], offset[4], *test_val, *compare_val); + fprintf(stdout, "%u: Value read was not expected.\n", lineno); + fprintf(stdout, + " Elmt = {%" PRIuHSIZE ", %" PRIuHSIZE ", %" PRIuHSIZE ", %" PRIuHSIZE ", %" PRIuHSIZE + "}, read: %d, " + "expected: %d\n", + offset[0], offset[1], offset[2], offset[3], offset[4], *test_val, *compare_val); goto error; } /* end if */ @@ -1522,13 +1521,13 @@ test_extend_verify_cmpd_vl(unsigned lineno, const hsize_t *offset, const void *_ /* Verify value */ if ((test_val->x != compare_val->x) || HDstrcmp(test_val->a, compare_val->a) != 0 || HDstrcmp(test_val->b, compare_val->b) != 0 || (test_val->y != compare_val->y)) { - HDfprintf(stdout, "%u: Value read was not expected.\n", lineno); - HDfprintf(stdout, - " Elmt = {%" PRIuHSIZE ", %" PRIuHSIZE ", %" PRIuHSIZE ", %" PRIuHSIZE ", %" PRIuHSIZE - "}, read: {%d, '%s', '%s', %d} " - "expected: {%d, '%s', '%s', %d}\n", - offset[0], offset[1], offset[2], offset[3], offset[4], test_val->x, test_val->a, - test_val->b, test_val->y, compare_val->x, compare_val->a, compare_val->b, compare_val->y); + fprintf(stdout, "%u: Value read was not expected.\n", lineno); + fprintf(stdout, + " Elmt = {%" PRIuHSIZE ", %" PRIuHSIZE ", %" PRIuHSIZE ", %" PRIuHSIZE ", %" PRIuHSIZE + "}, read: {%d, '%s', '%s', %d} " + "expected: {%d, '%s', '%s', %d}\n", + offset[0], offset[1], offset[2], offset[3], offset[4], test_val->x, test_val->a, test_val->b, + test_val->y, compare_val->x, compare_val->a, compare_val->b, compare_val->y); goto error; } /* end if */ @@ -1557,8 +1556,8 @@ test_extend_release_cmpd_vl(void *_elmt) comp_vl_datatype *elmt = (comp_vl_datatype *)_elmt; /* Element to free */ /* Free memory for string fields */ - HDfree(elmt->a); - HDfree(elmt->b); + free(elmt->a); + free(elmt->b); return 0; } /* end test_extend_release_integer() */ @@ -1640,7 +1639,7 @@ test_extend_cases(hid_t file, hid_t _dcpl, const char *dset_name, const hsize_t } /* end if */ else { /* Sanity check */ - HDassert(dtype_class == H5T_COMPOUND); + assert(dtype_class == H5T_COMPOUND); /* Initialize specific values for this datatype */ val_size = sizeof(comp_vl_datatype); @@ -1678,7 +1677,7 @@ test_extend_cases(hid_t file, hid_t _dcpl, const char *dset_name, const hsize_t TEST_ERROR; /* Clear the read buffer */ - HDmemset(val_rd, 0, val_size); + memset(val_rd, 0, val_size); } /* end for */ if (H5Sclose(mspace) < 0) TEST_ERROR; @@ -1692,10 +1691,10 @@ test_extend_cases(hid_t file, hid_t _dcpl, const char *dset_name, const hsize_t } /* end for */ /* Check for overflow */ - HDassert((nelmts * val_size) == (hsize_t)((size_t)(nelmts * val_size))); + assert((nelmts * val_size) == (hsize_t)((size_t)(nelmts * val_size))); /* Allocate & initialize buffer */ - buf = HDmalloc((size_t)(nelmts * val_size)); + buf = malloc((size_t)(nelmts * val_size)); init_rtn(buf, nelmts, init_val); /* Create dataspace describing memory buffer */ @@ -1742,7 +1741,7 @@ test_extend_cases(hid_t file, hid_t _dcpl, const char *dset_name, const hsize_t TEST_ERROR; /* Clear the read buffer */ - HDmemset(val_rd, 0, val_size); + memset(val_rd, 0, val_size); } /* end for */ if (H5Sclose(mspace) < 0) TEST_ERROR; @@ -1790,7 +1789,7 @@ test_extend_cases(hid_t file, hid_t _dcpl, const char *dset_name, const hsize_t TEST_ERROR; /* Clear the read buffer */ - HDmemset(val_rd, 0, val_size); + memset(val_rd, 0, val_size); } /* end for */ if (H5Sclose(mspace) < 0) TEST_ERROR; @@ -1836,7 +1835,7 @@ test_extend_cases(hid_t file, hid_t _dcpl, const char *dset_name, const hsize_t TEST_ERROR; /* Clear the read buffer */ - HDmemset(val_rd, 0, val_size); + memset(val_rd, 0, val_size); } /* end for */ if (H5Sclose(mspace) < 0) TEST_ERROR; @@ -1884,7 +1883,7 @@ test_extend_cases(hid_t file, hid_t _dcpl, const char *dset_name, const hsize_t TEST_ERROR; /* Clear the read buffer */ - HDmemset(val_rd, 0, val_size); + memset(val_rd, 0, val_size); } /* end for */ if (H5Sclose(mspace) < 0) TEST_ERROR; @@ -1939,7 +1938,7 @@ test_extend_cases(hid_t file, hid_t _dcpl, const char *dset_name, const hsize_t TEST_ERROR; /* Clear the read buffer */ - HDmemset(val_rd, 0, val_size); + memset(val_rd, 0, val_size); /* Set location for another element initialized by H5Dset_extent() */ hs_offset[3] -= 1; @@ -1961,7 +1960,7 @@ test_extend_cases(hid_t file, hid_t _dcpl, const char *dset_name, const hsize_t TEST_ERROR; /* Clear the read buffer */ - HDmemset(val_rd, 0, val_size); + memset(val_rd, 0, val_size); /* Read some data and make sure it's the right value */ for (i = 0; i < 1000; i++) { @@ -1992,7 +1991,7 @@ test_extend_cases(hid_t file, hid_t _dcpl, const char *dset_name, const hsize_t TEST_ERROR; /* Clear the read buffer */ - HDmemset(val_rd, 0, val_size); + memset(val_rd, 0, val_size); } /* end for */ if (H5Sclose(mspace) < 0) TEST_ERROR; @@ -2001,9 +2000,9 @@ test_extend_cases(hid_t file, hid_t _dcpl, const char *dset_name, const hsize_t for (i = 0; i < nelmts; i++) release_rtn((void *)((char *)buf + (val_size * i))); - HDfree(init_val_c.a); - HDfree(init_val_c.b); - HDfree(buf); + free(init_val_c.a); + free(init_val_c.b); + free(buf); /* Cleanup IDs */ if (H5Pclose(dcpl) < 0) @@ -2016,9 +2015,9 @@ test_extend_cases(hid_t file, hid_t _dcpl, const char *dset_name, const hsize_t return 0; error: - HDfree(init_val_c.a); - HDfree(init_val_c.b); - HDfree(buf); + free(init_val_c.a); + free(init_val_c.b); + free(buf); H5E_BEGIN_TRY { @@ -2160,16 +2159,16 @@ test_extend(hid_t fapl, const char *base_name, H5D_layout_t layout) if (H5Fclose(file) < 0) TEST_ERROR; - HDfree(fillval_c.a); - HDfree(fillval_c.b); + free(fillval_c.a); + free(fillval_c.b); PASSED(); return 0; error: - HDfree(fillval_c.a); - HDfree(fillval_c.b); + free(fillval_c.a); + free(fillval_c.b); H5E_BEGIN_TRY { @@ -2181,8 +2180,8 @@ error: return 1; skip: - HDfree(fillval_c.a); - HDfree(fillval_c.b); + free(fillval_c.a); + free(fillval_c.b); H5E_BEGIN_TRY { @@ -2222,9 +2221,9 @@ test_compatible(void) TESTING("contiguous dataset compatibility with v. 1.4"); if ((file = H5Fopen(testfile, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0) { - HDprintf(" Could not open file %s. Try set $srcdir to point at the " - "source directory of test\n", - testfile); + printf(" Could not open file %s. Try set $srcdir to point at the " + "source directory of test\n", + testfile); goto error; } @@ -2236,8 +2235,8 @@ test_compatible(void) goto error; if (status != H5D_FILL_VALUE_UNDEFINED) { H5_FAILED(); - HDprintf(" %d: Got a different fill value than what was set.", __LINE__); - HDprintf(" Got status=%ld, suppose to be H5D_FILL_VALUE_UNDEFINED\n", (long)status); + printf(" %d: Got a different fill value than what was set.", __LINE__); + printf(" Got status=%ld, suppose to be H5D_FILL_VALUE_UNDEFINED\n", (long)status); goto error; } if ((fspace = H5Dget_space(dset1)) < 0) @@ -2247,7 +2246,7 @@ test_compatible(void) if (dims[0] != 8 || dims[1] != 8) { H5_FAILED(); HDputs(" Got a different dimension size than what was set."); - HDprintf(" Got dims[0]=%ld, dims[1]=%ld, set 8x8\n", (long)dims[0], (long)dims[1]); + printf(" Got dims[0]=%ld, dims[1]=%ld, set 8x8\n", (long)dims[0], (long)dims[1]); goto error; } if ((mspace = H5Screate_simple(2, one, NULL)) < 0) @@ -2259,7 +2258,7 @@ test_compatible(void) if (val_rd != 0) { H5_FAILED(); HDputs(" Got a different value than what was set."); - HDprintf(" Got %ld, set 0\n", (long)val_rd); + printf(" Got %ld, set 0\n", (long)val_rd); goto error; } if (H5Pclose(dcpl1) < 0) @@ -2279,16 +2278,16 @@ test_compatible(void) goto error; if (status != H5D_FILL_VALUE_USER_DEFINED) { H5_FAILED(); - HDprintf(" %d: Got a different fill value than what was set.", __LINE__); - HDprintf(" Got status=%ld, suppose to be H5D_FILL_VALUE_USER_DEFINED\n", (long)status); + printf(" %d: Got a different fill value than what was set.", __LINE__); + printf(" Got status=%ld, suppose to be H5D_FILL_VALUE_USER_DEFINED\n", (long)status); goto error; } if (H5Pget_fill_value(dcpl2, H5T_NATIVE_INT, &rd_fill) < 0) goto error; if (rd_fill != fill_val) { H5_FAILED(); - HDprintf(" %d: Got a different fill value than what was set.", __LINE__); - HDprintf(" Got %ld, set %ld\n", (long)rd_fill, (long)fill_val); + printf(" %d: Got a different fill value than what was set.", __LINE__); + printf(" Got %ld, set %ld\n", (long)rd_fill, (long)fill_val); goto error; } fspace = -1; @@ -2300,7 +2299,7 @@ test_compatible(void) if (dims[0] != 8 || dims[1] != 8) { H5_FAILED(); HDputs(" Got a different dimension size than what was set."); - HDprintf(" Got dims[0]=%ld, dims[1]=%ld, set 8x8\n", (long)dims[0], (long)dims[1]); + printf(" Got dims[0]=%ld, dims[1]=%ld, set 8x8\n", (long)dims[0], (long)dims[1]); goto error; } if ((mspace = H5Screate_simple(2, one, NULL)) < 0) @@ -2312,7 +2311,7 @@ test_compatible(void) if (val_rd != fill_val) { H5_FAILED(); HDputs(" Got a different value than what was set."); - HDprintf(" Got %ld, set %ld\n", (long)val_rd, (long)fill_val); + printf(" Got %ld, set %ld\n", (long)val_rd, (long)fill_val); goto error; } if (H5Pclose(dcpl2) < 0) @@ -2430,20 +2429,20 @@ test_partalloc_cases(hid_t file, hid_t dcpl, const char *dname, H5D_fill_time_t if ((r_values[0] != w_values[0]) || (r_values[1] != fillval) || (r_values[2] != fillval) || (r_values[3] != fillval)) { H5_FAILED(); - HDfprintf(stdout, "%u: Allocated chunk value read was not correct.\n", (unsigned)__LINE__); - HDprintf(" {%ld,%ld,%ld,%ld} should be {%ld,%ld,%ld,%ld}\n", (long)r_values[0], - (long)r_values[1], (long)r_values[2], (long)r_values[3], (long)w_values[0], - (long)fillval, (long)fillval, (long)fillval); + fprintf(stdout, "%u: Allocated chunk value read was not correct.\n", (unsigned)__LINE__); + printf(" {%ld,%ld,%ld,%ld} should be {%ld,%ld,%ld,%ld}\n", (long)r_values[0], + (long)r_values[1], (long)r_values[2], (long)r_values[3], (long)w_values[0], (long)fillval, + (long)fillval, (long)fillval); goto error; } /* check unallocated chunk */ if ((f_values[0] != fillval) || (f_values[1] != fillval) || (f_values[2] != fillval) || (f_values[3] != fillval)) { H5_FAILED(); - HDfprintf(stdout, "%u: Unallocated chunk value read was not correct.\n", (unsigned)__LINE__); - HDprintf(" {%ld,%ld,%ld,%ld} should be {%ld,%ld,%ld,%ld}\n", (long)f_values[0], - (long)f_values[1], (long)f_values[2], (long)f_values[3], (long)fillval, (long)fillval, - (long)fillval, (long)fillval); + fprintf(stdout, "%u: Unallocated chunk value read was not correct.\n", (unsigned)__LINE__); + printf(" {%ld,%ld,%ld,%ld} should be {%ld,%ld,%ld,%ld}\n", (long)f_values[0], + (long)f_values[1], (long)f_values[2], (long)f_values[3], (long)fillval, (long)fillval, + (long)fillval, (long)fillval); goto error; } /* for the "never fill" case expect to get trash values, so skip */ @@ -2509,14 +2508,14 @@ test_partalloc(hid_t fapl, const char *base_name) if (H5Pset_alloc_time(dcpl, H5D_ALLOC_TIME_LATE) < 0) goto error; #ifdef DEBUG - HDfprintf(stdout, "\nALLOC_TIME_LATE\n"); + fprintf(stdout, "\nALLOC_TIME_LATE\n"); #endif /* case for H5D_FILL_TIME_ALLOC as fill write time and fill value to be default */ if (H5Pset_fill_time(dcpl, H5D_FILL_TIME_ALLOC) < 0) goto error; #ifdef DEBUG - HDfprintf(stdout, " FILL_TIME_ALLOC\n"); + fprintf(stdout, " FILL_TIME_ALLOC\n"); #endif nerrors += test_partalloc_cases(file, dcpl, "dset1", H5D_FILL_TIME_ALLOC); @@ -2524,7 +2523,7 @@ test_partalloc(hid_t fapl, const char *base_name) if (H5Pset_fill_time(dcpl, H5D_FILL_TIME_NEVER) < 0) goto error; #ifdef DEBUG - HDfprintf(stdout, " FILL_TIME_NEVER\n"); + fprintf(stdout, " FILL_TIME_NEVER\n"); #endif nerrors += test_partalloc_cases(file, dcpl, "dset2", H5D_FILL_TIME_NEVER); @@ -2532,7 +2531,7 @@ test_partalloc(hid_t fapl, const char *base_name) if (H5Pset_fill_time(dcpl, H5D_FILL_TIME_IFSET) < 0) goto error; #ifdef DEBUG - HDfprintf(stdout, " FILL_TIME_IFSET\n"); + fprintf(stdout, " FILL_TIME_IFSET\n"); #endif nerrors += test_partalloc_cases(file, dcpl, "dset3", H5D_FILL_TIME_IFSET); @@ -2540,14 +2539,14 @@ test_partalloc(hid_t fapl, const char *base_name) if (H5Pset_alloc_time(dcpl, H5D_ALLOC_TIME_INCR) < 0) goto error; #ifdef DEBUG - HDfprintf(stdout, "\nALLOC_TIME_INCR\n"); + fprintf(stdout, "\nALLOC_TIME_INCR\n"); #endif /* case for H5D_FILL_TIME_ALLOC as fill write time and fill value to be default */ if (H5Pset_fill_time(dcpl, H5D_FILL_TIME_ALLOC) < 0) goto error; #ifdef DEBUG - HDfprintf(stdout, " FILL_TIME_ALLOC\n"); + fprintf(stdout, " FILL_TIME_ALLOC\n"); #endif nerrors += test_partalloc_cases(file, dcpl, "dset4", H5D_FILL_TIME_ALLOC); @@ -2555,7 +2554,7 @@ test_partalloc(hid_t fapl, const char *base_name) if (H5Pset_fill_time(dcpl, H5D_FILL_TIME_NEVER) < 0) goto error; #ifdef DEBUG - HDfprintf(stdout, " FILL_TIME_NEVER\n"); + fprintf(stdout, " FILL_TIME_NEVER\n"); #endif nerrors += test_partalloc_cases(file, dcpl, "dset5", H5D_FILL_TIME_NEVER); @@ -2563,7 +2562,7 @@ test_partalloc(hid_t fapl, const char *base_name) if (H5Pset_fill_time(dcpl, H5D_FILL_TIME_IFSET) < 0) goto error; #ifdef DEBUG - HDfprintf(stdout, " FILL_TIME_IFSET\n"); + fprintf(stdout, " FILL_TIME_IFSET\n"); #endif nerrors += test_partalloc_cases(file, dcpl, "dset6", H5D_FILL_TIME_IFSET); @@ -2571,14 +2570,14 @@ test_partalloc(hid_t fapl, const char *base_name) if (H5Pset_alloc_time(dcpl, H5D_ALLOC_TIME_EARLY) < 0) goto error; #ifdef DEBUG - HDfprintf(stdout, "\nALLOC_TIME_EARLY\n"); + fprintf(stdout, "\nALLOC_TIME_EARLY\n"); #endif /* case for H5D_FILL_TIME_ALLOC as fill write time and fill value to be default */ if (H5Pset_fill_time(dcpl, H5D_FILL_TIME_ALLOC) < 0) goto error; #ifdef DEBUG - HDfprintf(stdout, " FILL_TIME_ALLOC\n"); + fprintf(stdout, " FILL_TIME_ALLOC\n"); #endif nerrors += test_partalloc_cases(file, dcpl, "dset7", H5D_FILL_TIME_ALLOC); @@ -2586,7 +2585,7 @@ test_partalloc(hid_t fapl, const char *base_name) if (H5Pset_fill_time(dcpl, H5D_FILL_TIME_NEVER) < 0) goto error; #ifdef DEBUG - HDfprintf(stdout, " FILL_TIME_NEVER\n"); + fprintf(stdout, " FILL_TIME_NEVER\n"); #endif nerrors += test_partalloc_cases(file, dcpl, "dset8", H5D_FILL_TIME_NEVER); @@ -2594,7 +2593,7 @@ test_partalloc(hid_t fapl, const char *base_name) if (H5Pset_fill_time(dcpl, H5D_FILL_TIME_IFSET) < 0) goto error; #ifdef DEBUG - HDfprintf(stdout, " FILL_TIME_IFSET\n"); + fprintf(stdout, " FILL_TIME_IFSET\n"); #endif nerrors += test_partalloc_cases(file, dcpl, "dset9", H5D_FILL_TIME_IFSET); @@ -2649,8 +2648,8 @@ main(int argc, char *argv[]) else if (!HDstrcmp(argv[argno], "compact")) test_compact = 1; else { - HDfprintf(stderr, "usage: %s [contiguous] [chunked] [compact]\n", argv[0]); - HDexit(EXIT_FAILURE); + fprintf(stderr, "usage: %s [contiguous] [chunked] [compact]\n", argv[0]); + exit(EXIT_FAILURE); } } /* end for */ } /* end if */ @@ -2726,9 +2725,9 @@ main(int argc, char *argv[]) if (h5_cleanup(FILENAME, fapl)) HDremove(FILE_NAME_RAW); - HDexit(EXIT_SUCCESS); + exit(EXIT_SUCCESS); error: HDputs("***** FILL VALUE TESTS FAILED *****"); - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); } diff --git a/test/filter_fail.c b/test/filter_fail.c index 172027c..e5d3144 100644 --- a/test/filter_fail.c +++ b/test/filter_fail.c @@ -269,7 +269,7 @@ test_filter_read(char *file_name, hid_t my_fapl) TEST_ERROR; /* Read the chunks */ - HDmemset(rbuf, 0, DIM * sizeof(int)); + memset(rbuf, 0, DIM * sizeof(int)); if (H5Dread(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf) < 0) TEST_ERROR; @@ -278,16 +278,16 @@ test_filter_read(char *file_name, hid_t my_fapl) for (i = 0; i < DIM; i++) { if (i < DIM - 2 && rbuf[i] != i) { H5_FAILED(); - HDprintf(" Read different values than written.\n"); - HDprintf(" At index %d\n", i); - HDprintf(" rbuf[%d]=%d\n", i, rbuf[i]); + printf(" Read different values than written.\n"); + printf(" At index %d\n", i); + printf(" rbuf[%d]=%d\n", i, rbuf[i]); TEST_ERROR; } else if (i >= DIM - 2 && rbuf[i] != 0) { H5_FAILED(); - HDprintf(" No value should be read.\n"); - HDprintf(" At index %d\n", i); - HDprintf(" rbuf[%d]=%d\n", i, rbuf[i]); + printf(" No value should be read.\n"); + printf(" At index %d\n", i); + printf(" rbuf[%d]=%d\n", i, rbuf[i]); TEST_ERROR; } } @@ -296,8 +296,8 @@ test_filter_read(char *file_name, hid_t my_fapl) if ((sid = H5Dget_space(dataset)) < 0) TEST_ERROR; - HDmemset(hs_offset, 0, sizeof(hs_offset)); - HDmemset(hs_size, 0, sizeof(hs_size)); + memset(hs_offset, 0, sizeof(hs_offset)); + memset(hs_size, 0, sizeof(hs_size)); hs_size[0] = DIM / 2; if (H5Sselect_hyperslab(sid, H5S_SELECT_SET, hs_offset, stride, hs_size, NULL) < 0) @@ -307,12 +307,12 @@ test_filter_read(char *file_name, hid_t my_fapl) if ((mspace = H5Screate_simple(1, dims, NULL)) < 0) TEST_ERROR; - HDmemset(zero, 0, sizeof zero); + memset(zero, 0, sizeof zero); if (H5Sselect_hyperslab(mspace, H5S_SELECT_SET, zero, stride, &nelmts, NULL) < 0) TEST_ERROR; - HDmemset(rbuf, 0, DIM * sizeof(int)); + memset(rbuf, 0, DIM * sizeof(int)); if (H5Dread(dataset, H5T_NATIVE_INT, H5S_ALL, sid, H5P_DEFAULT, rbuf) < 0) TEST_ERROR; @@ -321,16 +321,16 @@ test_filter_read(char *file_name, hid_t my_fapl) for (i = 0; i < DIM; i += 2) { if (i < DIM - 2 && rbuf[i] != i) { H5_FAILED(); - HDprintf(" Read different values than written.\n"); - HDprintf(" At index %d\n", i); - HDprintf(" rbuf[%d]=%d\n", i, rbuf[i]); + printf(" Read different values than written.\n"); + printf(" At index %d\n", i); + printf(" rbuf[%d]=%d\n", i, rbuf[i]); TEST_ERROR; } else if (i >= DIM - 2 && rbuf[i] != 0) { H5_FAILED(); - HDprintf(" No value should be read.\n"); - HDprintf(" At index %d\n", i); - HDprintf(" rbuf[%d]=%d\n", i, rbuf[i]); + printf(" No value should be read.\n"); + printf(" At index %d\n", i); + printf(" rbuf[%d]=%d\n", i, rbuf[i]); TEST_ERROR; } } @@ -416,11 +416,11 @@ main(void) if (nerrors) TEST_ERROR; - HDexit(EXIT_SUCCESS); + exit(EXIT_SUCCESS); error: if (nerrors) { - HDprintf("***** %u FAILURE%s! *****\n", nerrors, 1 == nerrors ? "" : "S"); - HDexit(EXIT_FAILURE); + printf("***** %u FAILURE%s! *****\n", nerrors, 1 == nerrors ? "" : "S"); + exit(EXIT_FAILURE); } } /* end main() */ diff --git a/test/filter_plugin.c b/test/filter_plugin.c index 96e114a..3bedc57 100644 --- a/test/filter_plugin.c +++ b/test/filter_plugin.c @@ -84,9 +84,9 @@ free_2D_array(int ***arr) { if (arr && *arr && (*arr)[0]) - HDfree((*arr)[0]); + free((*arr)[0]); if (arr && *arr) - HDfree(*arr); + free(*arr); *arr = NULL; return SUCCEED; @@ -114,9 +114,9 @@ allocate_and_init_2D_array(int ***arr, const hsize_t *sizes, int **initial_value c = (size_t)sizes[1]; /* Allocate and set up pseudo-2D array */ - if (NULL == (*arr = (int **)HDcalloc(r, sizeof(int *)))) + if (NULL == (*arr = (int **)calloc(r, sizeof(int *)))) TEST_ERROR; - if (NULL == ((*arr)[0] = (int *)HDcalloc(r * c, sizeof(int)))) + if (NULL == ((*arr)[0] = (int *)calloc(r * c, sizeof(int)))) TEST_ERROR; for (i = 0; i < r; i++) (*arr)[i] = (**arr + c * i); @@ -124,7 +124,7 @@ allocate_and_init_2D_array(int ***arr, const hsize_t *sizes, int **initial_value /* Copy over the data elements */ if (initial_values) { n_bytes = r * c * sizeof(int); - HDmemcpy((*arr)[0], initial_values[0], n_bytes); + memcpy((*arr)[0], initial_values[0], n_bytes); } return SUCCEED; @@ -212,7 +212,7 @@ ensure_filter_works(hid_t fid, const char *name, hid_t dcpl_id) */ if ((dxpl_id = H5Pcreate(H5P_DATASET_XFER)) < 0) TEST_ERROR; - if (NULL == (tconv_buf = HDcalloc((size_t)1000, sizeof(char)))) + if (NULL == (tconv_buf = calloc((size_t)1000, sizeof(char)))) TEST_ERROR; if (H5Pset_buffer(dxpl_id, (size_t)1000, tconv_buf, NULL) < 0) TEST_ERROR; @@ -400,7 +400,7 @@ ensure_filter_works(hid_t fid, const char *name, hid_t dcpl_id) free_2D_array(&orig); free_2D_array(&read); - HDfree(tconv_buf); + free(tconv_buf); return SUCCEED; @@ -420,7 +420,7 @@ error: free_2D_array(&read); if (tconv_buf) - HDfree(tconv_buf); + free(tconv_buf); return FAIL; } /* end ensure_filter_works() */ @@ -984,7 +984,7 @@ test_path_api_calls(void) /* Remove all existing paths */ for (u = n_paths; u > 0; u--) if (H5PLremove(u - 1) < 0) { - HDfprintf(stderr, " at %u: %s\n", u, path); + fprintf(stderr, " at %u: %s\n", u, path); TEST_ERROR; } @@ -1019,7 +1019,7 @@ test_path_api_calls(void) for (u = 0; u < n_starting_paths; u++) { HDsnprintf(path, sizeof(path), "a_path_%u", u); if (H5PLappend(path) < 0) { - HDfprintf(stderr, " at %u: %s\n", u, path); + fprintf(stderr, " at %u: %s\n", u, path); TEST_ERROR; } } @@ -1052,7 +1052,7 @@ test_path_api_calls(void) /* Get the path length by passing in NULL */ if ((path_len = H5PLget(0, NULL, 0)) <= 0) { - HDfprintf(stderr, " get path 0 length failed\n"); + fprintf(stderr, " get path 0 length failed\n"); TEST_ERROR; } if (path_len != 8) @@ -1060,11 +1060,11 @@ test_path_api_calls(void) /* Get the path */ if ((path_len = H5PLget(0, path, 256)) <= 0) { - HDfprintf(stderr, " get 0 len: %zd : %s\n", path_len, path); + fprintf(stderr, " get 0 len: %zd : %s\n", path_len, path); TEST_ERROR; } if (HDstrcmp(path, "a_path_0") != 0) { - HDfprintf(stderr, " get 0: %s\n", path); + fprintf(stderr, " get 0: %s\n", path); TEST_ERROR; } @@ -1076,7 +1076,7 @@ test_path_api_calls(void) if ((path_len = H5PLget(1, path, 256)) <= 0) TEST_ERROR; if (HDstrcmp(path, "a_path_1") != 0) { - HDfprintf(stderr, " get 1: %s\n", path); + fprintf(stderr, " get 1: %s\n", path); TEST_ERROR; } @@ -1085,7 +1085,7 @@ test_path_api_calls(void) TEST_ERROR; HDsnprintf(temp_name, sizeof(temp_name), "a_path_%u", n_starting_paths - 1); if (HDstrcmp(path, temp_name) != 0) { - HDfprintf(stderr, " get %u: %s\n", n_starting_paths - 1, path); + fprintf(stderr, " get %u: %s\n", n_starting_paths - 1, path); TEST_ERROR; } @@ -1122,7 +1122,7 @@ test_path_api_calls(void) if ((path_len = H5PLget(8, path, 256)) <= 0) TEST_ERROR; if (HDstrcmp(path, "a_path_9") != 0) { - HDfprintf(stderr, " get 8: %s\n", path); + fprintf(stderr, " get 8: %s\n", path); TEST_ERROR; } @@ -1139,7 +1139,7 @@ test_path_api_calls(void) /* Prepend one path */ HDsnprintf(path, sizeof(path), "a_path_%d", n_starting_paths + 1); if (H5PLprepend(path) < 0) { - HDfprintf(stderr, " prepend %u: %s\n", n_starting_paths + 1, path); + fprintf(stderr, " prepend %u: %s\n", n_starting_paths + 1, path); TEST_ERROR; } @@ -1153,7 +1153,7 @@ test_path_api_calls(void) if (H5PLget(8, path, 256) <= 0) TEST_ERROR; if (HDstrcmp(path, "a_path_7") != 0) { - HDfprintf(stderr, " get 8: %s\n", path); + fprintf(stderr, " get 8: %s\n", path); TEST_ERROR; } @@ -1162,7 +1162,7 @@ test_path_api_calls(void) TEST_ERROR; HDsnprintf(temp_name, sizeof(temp_name), "a_path_%d", n_starting_paths + 1); if (HDstrcmp(path, temp_name) != 0) { - HDfprintf(stderr, " get 0: %s\n", path); + fprintf(stderr, " get 0: %s\n", path); TEST_ERROR; } @@ -1177,7 +1177,7 @@ test_path_api_calls(void) /* Replace one path at index 1 */ HDsnprintf(path, sizeof(path), "a_path_%u", n_starting_paths + 4); if (H5PLreplace(path, 1) < 0) { - HDfprintf(stderr, " replace 1: %s\n", path); + fprintf(stderr, " replace 1: %s\n", path); TEST_ERROR; } @@ -1196,7 +1196,7 @@ test_path_api_calls(void) TEST_ERROR; HDsnprintf(temp_name, sizeof(temp_name), "a_path_%u", n_starting_paths + 1); if (HDstrcmp(path, temp_name) != 0) { - HDfprintf(stderr, " get 0: %s\n", path); + fprintf(stderr, " get 0: %s\n", path); TEST_ERROR; } @@ -1204,7 +1204,7 @@ test_path_api_calls(void) if (H5PLget(2, path, 256) <= 0) TEST_ERROR; if (HDstrcmp(path, "a_path_1") != 0) { - HDfprintf(stderr, " get 2: %s\n", path); + fprintf(stderr, " get 2: %s\n", path); TEST_ERROR; } @@ -1228,7 +1228,7 @@ test_path_api_calls(void) if (H5PLget(4, path, 256) <= 0) TEST_ERROR; if (HDstrcmp(path, "a_path_4") != 0) { - HDfprintf(stderr, " get 4: %s\n", path); + fprintf(stderr, " get 4: %s\n", path); TEST_ERROR; } @@ -1244,7 +1244,7 @@ test_path_api_calls(void) /* Insert one path at index 3*/ HDsnprintf(path, sizeof(path), "a_path_%d", n_starting_paths + 5); if (H5PLinsert(path, 3) < 0) { - HDfprintf(stderr, " insert 3: %s\n", path); + fprintf(stderr, " insert 3: %s\n", path); TEST_ERROR; } @@ -1252,7 +1252,7 @@ test_path_api_calls(void) if (H5PLget(4, path, 256) <= 0) TEST_ERROR; if (HDstrcmp(path, "a_path_2") != 0) { - HDfprintf(stderr, " get 4: %s\n", path); + fprintf(stderr, " get 4: %s\n", path); TEST_ERROR; } @@ -1278,7 +1278,7 @@ test_path_api_calls(void) /* Remove all existing paths */ for (u = n_paths; u > 0; u--) if (H5PLremove(u - 1) < 0) { - HDfprintf(stderr, " at %u: %s\n", u, path); + fprintf(stderr, " at %u: %s\n", u, path); TEST_ERROR; } @@ -1617,9 +1617,9 @@ main(void) if (nerrors) TEST_ERROR; - HDprintf("All plugin tests passed.\n"); + printf("All plugin tests passed.\n"); - HDexit(EXIT_SUCCESS); + exit(EXIT_SUCCESS); error: H5E_BEGIN_TRY @@ -1637,6 +1637,6 @@ error: free_2D_array(&orig_dynlib4_g); nerrors = MAX(1, nerrors); - HDprintf("***** %d PLUGIN TEST%s FAILED! *****\n", nerrors, 1 == nerrors ? "" : "S"); - HDexit(EXIT_FAILURE); + printf("***** %d PLUGIN TEST%s FAILED! *****\n", nerrors, 1 == nerrors ? "" : "S"); + exit(EXIT_FAILURE); } /* end main() */ diff --git a/test/flush1.c b/test/flush1.c index f0f1093..92f39ca 100644 --- a/test/flush1.c +++ b/test/flush1.c @@ -138,7 +138,7 @@ add_dset_to_file(hid_t fid, const char *dset_name) STACK_ERROR; /* Write some data */ - if (NULL == (data = (int *)HDcalloc((size_t)NELEMENTS, sizeof(int)))) + if (NULL == (data = (int *)calloc((size_t)NELEMENTS, sizeof(int)))) STACK_ERROR; for (i = 0; i < NELEMENTS; i++) data[i] = i; @@ -152,7 +152,7 @@ add_dset_to_file(hid_t fid, const char *dset_name) if (H5Dclose(did) < 0) STACK_ERROR; - HDfree(data); + free(data); return SUCCEED; @@ -165,7 +165,7 @@ error: } H5E_END_TRY; - HDfree(data); + free(data); return FAIL; } /* end add_dset_to_file() */ @@ -312,18 +312,18 @@ main(void) SKIPPED(); if (!vfd_supports_swmr) - HDprintf("NOTE: Some tests were skipped since the current VFD lacks SWMR support\n"); + printf("NOTE: Some tests were skipped since the current VFD lacks SWMR support\n"); /* Flush console output streams */ - HDfflush(stdout); - HDfflush(stderr); + fflush(stdout); + fflush(stderr); /* DO NOT CLOSE FILE ID! */ if (H5Pclose(fapl_id) < 0) STACK_ERROR; /* _exit() is necessary since we want a hard close of the library */ - HD_exit(EXIT_SUCCESS); + _exit(EXIT_SUCCESS); error: H5E_BEGIN_TRY @@ -332,5 +332,5 @@ error: } H5E_END_TRY; - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); } /* end main() */ diff --git a/test/flush2.c b/test/flush2.c index d5461d6..65662d5 100644 --- a/test/flush2.c +++ b/test/flush2.c @@ -77,7 +77,7 @@ dset_ok(hid_t fid, const char *dset_name) goto error; /* Read the data */ - if (NULL == (data = (int *)HDcalloc((size_t)NELEMENTS, sizeof(int)))) + if (NULL == (data = (int *)calloc((size_t)NELEMENTS, sizeof(int)))) goto error; if (H5Dread(did, H5T_NATIVE_INT, sid, sid, H5P_DEFAULT, data) < 0) goto error; @@ -90,7 +90,7 @@ dset_ok(hid_t fid, const char *dset_name) if (H5Dclose(did) < 0) goto error; - HDfree(data); + free(data); return TRUE; @@ -102,7 +102,7 @@ error: } H5E_END_TRY; - HDfree(data); + free(data); return FALSE; } /* end dset_ok() */ @@ -255,13 +255,13 @@ main(void) vfd_supports_swmr = H5FD__supports_swmr_test(driver); if (h5_driver_is_default_vfd_compatible(fapl_id, &driver_is_default_vfd_compatible) < 0) { - HDprintf("Can't check if VFD is compatible with default VFD\n"); - HDexit(EXIT_FAILURE); + printf("Can't check if VFD is compatible with default VFD\n"); + exit(EXIT_FAILURE); } if (!driver_is_default_vfd_compatible) { - HDprintf("Skipping SWMR tests for VFD incompatible with default VFD\n"); - HDexit(EXIT_SUCCESS); + printf("Skipping SWMR tests for VFD incompatible with default VFD\n"); + exit(EXIT_SUCCESS); } /* TEST 1 */ @@ -433,12 +433,12 @@ main(void) SKIPPED(); if (!vfd_supports_swmr) - HDprintf("NOTE: Some tests were skipped since the current VFD lacks SWMR support\n"); + printf("NOTE: Some tests were skipped since the current VFD lacks SWMR support\n"); h5_cleanup(FILENAME, fapl_id); - HDexit(EXIT_SUCCESS); + exit(EXIT_SUCCESS); error: - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); } /* end main() */ diff --git a/test/flushrefresh.c b/test/flushrefresh.c index 28d4638..9522414 100644 --- a/test/flushrefresh.c +++ b/test/flushrefresh.c @@ -70,9 +70,9 @@ FILE *errorfile; #define ERRFILE "flushrefresh_ERROR" #define PROCESS_ERROR \ { \ - errorfile = HDfopen(ERRFILE, "w+"); \ - HDfprintf(errorfile, "Error occurred in flushrefresh.\n"); \ - HDfflush(errorfile); \ + errorfile = fopen(ERRFILE, "w+"); \ + fprintf(errorfile, "Error occurred in flushrefresh.\n"); \ + fflush(errorfile); \ HDfclose(errorfile); \ TEST_ERROR; \ } @@ -161,8 +161,7 @@ main(int argc, char *argv[]) TEST_ERROR; } /* end if */ else { - HDfprintf(stdout, - "Skipping all flush/refresh tests (only run with SWMR-enabled file drivers).\n"); + fprintf(stdout, "Skipping all flush/refresh tests (only run with SWMR-enabled file drivers).\n"); /* Test script is expecting some signals, so send them out to end it. */ if (end_verification() < 0) @@ -183,7 +182,7 @@ main(int argc, char *argv[]) } else { /* Illegal number of arguments supplied. Error. */ - HDfprintf(stderr, "Error. %d is an Invalid number of arguments to main().\n", argc); + fprintf(stderr, "Error. %d is an Invalid number of arguments to main().\n", argc); PROCESS_ERROR } /* end if */ @@ -267,7 +266,7 @@ test_flush(void) hsize_t dims[2] = {3, 5}; /* Testing Message */ - HDfprintf(stdout, "Testing individual object flush behavior:\n"); + fprintf(stdout, "Testing individual object flush behavior:\n"); /* Cleanup any old error or signal files */ CLEANUP_FILES; @@ -739,7 +738,7 @@ test_refresh(void) int fillval = 2; /* Testing Message */ - HDfprintf(stdout, "Testing individual object refresh behavior:\n"); + fprintf(stdout, "Testing individual object refresh behavior:\n"); /* Cleanup any old error or signal files */ CLEANUP_FILES; @@ -1089,20 +1088,19 @@ flush_verification(const char *obj_pathname, const char *expected) /* Compare to expected result */ if (HDstrcmp(expected, FLUSHED) == 0) { if ((oid < 0) || (status < 0)) { - HDfprintf(stderr, "Error! %s should be on disk, but was NOT!\n", obj_pathname); + fprintf(stderr, "Error! %s should be on disk, but was NOT!\n", obj_pathname); PROCESS_ERROR; } /* end if */ } else if (HDstrcmp(expected, NOT_FLUSHED) == 0) { if ((oid > 0) || (status > 0)) { - HDfprintf(stderr, "Error! %s not expected to be flushed, but it was found on disk!\n", - obj_pathname); + fprintf(stderr, "Error! %s not expected to be flushed, but it was found on disk!\n", + obj_pathname); PROCESS_ERROR; } /* end if */ } else { - HDfprintf(stderr, "Error! Bad verification parameters. %s is an invalid expected outcome.\n", - expected); + fprintf(stderr, "Error! Bad verification parameters. %s is an invalid expected outcome.\n", expected); PROCESS_ERROR; } /* end if */ @@ -1312,7 +1310,7 @@ refresh_verification(const char *obj_pathname) PROCESS_ERROR; } /* end if */ else { - HDfprintf(stdout, "Error. %s is an unrecognized object.\n", obj_pathname); + fprintf(stdout, "Error. %s is an unrecognized object.\n", obj_pathname); PROCESS_ERROR; } /* end else */ @@ -1343,12 +1341,12 @@ refresh_verification(const char *obj_pathname) } while (--tries); if (!ok) { - HDprintf("FLUSHED: num_attrs=%d, nmesgs=%d, nchunks=%d, total=%d\n", (int)flushed_oinfo.num_attrs, - (int)flushed_ninfo.hdr.nmesgs, (int)flushed_ninfo.hdr.nchunks, - (int)flushed_ninfo.hdr.space.total); - HDprintf("REFRESHED: num_attrs=%d, nmesgs=%d, nchunks=%d, total=%d\n", (int)refreshed_oinfo.num_attrs, - (int)refreshed_ninfo.hdr.nmesgs, (int)refreshed_ninfo.hdr.nchunks, - (int)refreshed_ninfo.hdr.space.total); + printf("FLUSHED: num_attrs=%d, nmesgs=%d, nchunks=%d, total=%d\n", (int)flushed_oinfo.num_attrs, + (int)flushed_ninfo.hdr.nmesgs, (int)flushed_ninfo.hdr.nchunks, + (int)flushed_ninfo.hdr.space.total); + printf("REFRESHED: num_attrs=%d, nmesgs=%d, nchunks=%d, total=%d\n", (int)refreshed_oinfo.num_attrs, + (int)refreshed_ninfo.hdr.nmesgs, (int)refreshed_ninfo.hdr.nchunks, + (int)refreshed_ninfo.hdr.space.total); PROCESS_ERROR; } @@ -1387,7 +1385,7 @@ check_for_errors(void) { FILE *file; - if ((file = HDfopen(ERRFILE, "r"))) { + if ((file = fopen(ERRFILE, "r"))) { HDfclose(file); HDremove(ERRFILE); return FAIL; diff --git a/test/freespace.c b/test/freespace.c index bc41044..9c9a2f2 100644 --- a/test/freespace.c +++ b/test/freespace.c @@ -198,8 +198,8 @@ TEST_sect_init_cls(H5FS_section_class_t *cls, void *_udata) unsigned *init_flags; /* Check arguments. */ - HDassert(cls); - HDassert(_udata); + assert(cls); + assert(_udata); init_flags = (unsigned *)_udata; cls->flags |= *init_flags; @@ -220,10 +220,10 @@ TEST_sect_can_merge(const H5FS_section_info_t *_sect1, const H5FS_section_info_t htri_t ret_value; /* Return value */ /* Check arguments. */ - HDassert(sect1); - HDassert(sect2); - HDassert(sect1->sect_info.type == sect2->sect_info.type); /* Checks "MERGE_SYM" flag */ - HDassert(H5F_addr_lt(sect1->sect_info.addr, sect2->sect_info.addr)); + assert(sect1); + assert(sect2); + assert(sect1->sect_info.type == sect2->sect_info.type); /* Checks "MERGE_SYM" flag */ + assert(H5F_addr_lt(sect1->sect_info.addr, sect2->sect_info.addr)); /* Check if second section adjoins first section */ ret_value = H5F_addr_eq(sect1->sect_info.addr + sect1->sect_info.size, sect2->sect_info.addr); @@ -242,15 +242,15 @@ TEST_sect_merging(H5FS_section_info_t **_sect1, H5FS_section_info_t *_sect2, voi herr_t ret_value = SUCCEED; /* Return value */ /* Check arguments. */ - HDassert(sect1); - HDassert(((*sect1)->sect_info.type == TEST_FSPACE_SECT_TYPE) || - ((*sect1)->sect_info.type == TEST_FSPACE_SECT_TYPE_NEW) || - ((*sect1)->sect_info.type == TEST_FSPACE_SECT_TYPE_NONE)); - HDassert(sect2); - HDassert((sect2->sect_info.type == TEST_FSPACE_SECT_TYPE) || - (sect2->sect_info.type == TEST_FSPACE_SECT_TYPE_NEW) || - (sect2->sect_info.type == TEST_FSPACE_SECT_TYPE_NONE)); - HDassert(H5F_addr_eq((*sect1)->sect_info.addr + (*sect1)->sect_info.size, sect2->sect_info.addr)); + assert(sect1); + assert(((*sect1)->sect_info.type == TEST_FSPACE_SECT_TYPE) || + ((*sect1)->sect_info.type == TEST_FSPACE_SECT_TYPE_NEW) || + ((*sect1)->sect_info.type == TEST_FSPACE_SECT_TYPE_NONE)); + assert(sect2); + assert((sect2->sect_info.type == TEST_FSPACE_SECT_TYPE) || + (sect2->sect_info.type == TEST_FSPACE_SECT_TYPE_NEW) || + (sect2->sect_info.type == TEST_FSPACE_SECT_TYPE_NONE)); + assert(H5F_addr_eq((*sect1)->sect_info.addr + (*sect1)->sect_info.size, sect2->sect_info.addr)); /* Add second section's size to first section */ (*sect1)->sect_info.size += sect2->sect_info.size; @@ -269,7 +269,7 @@ static herr_t TEST_sect_free(H5FS_section_info_t *sect) { /* Release the section */ - HDfree(sect); + free(sect); return 0; } /* TEST_sect_free() */ @@ -334,8 +334,8 @@ TEST_sects_cb(H5FS_section_info_t *_sect, void *_udata) TEST_iter_ud_t *udata = (TEST_iter_ud_t *)_udata; herr_t ret_value = SUCCEED; /* Return value */ - HDassert(sect); - HDassert(udata); + assert(sect); + assert(udata); udata->tot_size += sect->sect_info.size; udata->tot_sect_count += 1; @@ -363,7 +363,7 @@ TEST_set_eoa(haddr_t val) static void init_cparam(H5FS_create_t *cparam) { - HDmemset(cparam, 0, sizeof(H5FS_create_t)); + memset(cparam, 0, sizeof(H5FS_create_t)); /* Set the free space creation parameters */ cparam->shrink_percent = TEST_FSPACE_SHRINK; @@ -399,28 +399,27 @@ check_stats(const H5F_t *f, const H5FS_t *frsp, frspace_state_t *state) FAIL_STACK_ERROR; if (frspace_stats.tot_space != state->tot_space) { - HDfprintf(stdout, "frspace_stats.tot_space = %" PRIuHSIZE ", state->tot_space = %" PRIuHSIZE "\n", - frspace_stats.tot_space, state->tot_space); + fprintf(stdout, "frspace_stats.tot_space = %" PRIuHSIZE ", state->tot_space = %" PRIuHSIZE "\n", + frspace_stats.tot_space, state->tot_space); TEST_ERROR; } /* end if */ if (frspace_stats.tot_sect_count != state->tot_sect_count) { - HDfprintf(stdout, - "frspace_stats.tot_sect_count = %" PRIuHSIZE ", state->tot_sect_count = %" PRIuHSIZE "\n", - frspace_stats.tot_sect_count, state->tot_sect_count); + fprintf(stdout, + "frspace_stats.tot_sect_count = %" PRIuHSIZE ", state->tot_sect_count = %" PRIuHSIZE "\n", + frspace_stats.tot_sect_count, state->tot_sect_count); TEST_ERROR; } /* end if */ if (frspace_stats.serial_sect_count != state->serial_sect_count) { - HDfprintf(stdout, - "frspace_stats.serial_sect_count = %" PRIuHSIZE ", state->serial_sect_count = %" PRIuHSIZE - "\n", - frspace_stats.serial_sect_count, state->serial_sect_count); + fprintf(stdout, + "frspace_stats.serial_sect_count = %" PRIuHSIZE ", state->serial_sect_count = %" PRIuHSIZE + "\n", + frspace_stats.serial_sect_count, state->serial_sect_count); TEST_ERROR; } /* end if */ if (frspace_stats.ghost_sect_count != state->ghost_sect_count) { - HDfprintf(stdout, - "frspace_stats.ghost_sect_count = %" PRIuHSIZE ", state->ghost_sect_count = %" PRIuHSIZE - "\n", - frspace_stats.ghost_sect_count, state->ghost_sect_count); + fprintf(stdout, + "frspace_stats.ghost_sect_count = %" PRIuHSIZE ", state->ghost_sect_count = %" PRIuHSIZE "\n", + frspace_stats.ghost_sect_count, state->ghost_sect_count); TEST_ERROR; } /* end if */ @@ -493,11 +492,11 @@ test_fs_create(hid_t fapl) if (frsp->nclasses != nclasses) TEST_ERROR; - HDmemset(&state, 0, sizeof(frspace_state_t)); + memset(&state, 0, sizeof(frspace_state_t)); if (check_stats(f, frsp, &state)) TEST_ERROR; - HDmemset(&test_cparam, 0, sizeof(H5FS_create_t)); + memset(&test_cparam, 0, sizeof(H5FS_create_t)); if (H5FS__get_cparam_test(frsp, &test_cparam) < 0) FAIL_STACK_ERROR; if (H5FS__cmp_cparam_test(&cparam, &test_cparam)) @@ -633,7 +632,7 @@ test_fs_sect_add(hid_t fapl) if (!H5F_addr_defined(fs_addr)) TEST_ERROR; - if (NULL == (sect_node = (TEST_free_section_t *)HDmalloc(sizeof(TEST_free_section_t)))) + if (NULL == (sect_node = (TEST_free_section_t *)malloc(sizeof(TEST_free_section_t)))) FAIL_STACK_ERROR; init_sect_node(sect_node, (haddr_t)TEST_SECT_ADDR80, (hsize_t)TEST_SECT_SIZE20, TEST_FSPACE_SECT_TYPE, @@ -642,7 +641,7 @@ test_fs_sect_add(hid_t fapl) if (H5FS_sect_add(f, frsp, (H5FS_section_info_t *)sect_node, H5FS_ADD_RETURNED_SPACE, NULL) < 0) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(frspace_state_t)); + memset(&state, 0, sizeof(frspace_state_t)); state.tot_space += sect_node->sect_info.size; state.tot_sect_count += 1; state.serial_sect_count += 1; @@ -699,7 +698,7 @@ test_fs_sect_add(hid_t fapl) TEST_ERROR; /* Create free list section node */ - if (NULL == (sect_node = (TEST_free_section_t *)HDmalloc(sizeof(TEST_free_section_t)))) + if (NULL == (sect_node = (TEST_free_section_t *)malloc(sizeof(TEST_free_section_t)))) FAIL_STACK_ERROR; init_sect_node(sect_node, (haddr_t)TEST_SECT_ADDR80, (hsize_t)TEST_SECT_SIZE20, TEST_FSPACE_SECT_TYPE, @@ -708,7 +707,7 @@ test_fs_sect_add(hid_t fapl) if (H5FS_sect_add(f, frsp, (H5FS_section_info_t *)sect_node, 0, NULL) < 0) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(frspace_state_t)); + memset(&state, 0, sizeof(frspace_state_t)); state.tot_space += sect_node->sect_info.size; state.tot_sect_count += 1; state.ghost_sect_count += 1; @@ -773,7 +772,7 @@ test_fs_sect_add(hid_t fapl) if (!H5F_addr_defined(fs_addr)) TEST_ERROR; - if (NULL == (sect_node = (TEST_free_section_t *)HDmalloc(sizeof(TEST_free_section_t)))) + if (NULL == (sect_node = (TEST_free_section_t *)malloc(sizeof(TEST_free_section_t)))) FAIL_STACK_ERROR; /* @@ -786,7 +785,7 @@ test_fs_sect_add(hid_t fapl) FAIL_STACK_ERROR; /* nothing in free-space */ - HDmemset(&state, 0, sizeof(frspace_state_t)); + memset(&state, 0, sizeof(frspace_state_t)); if (check_stats(f, frsp, &state)) TEST_ERROR; @@ -843,7 +842,7 @@ test_fs_sect_add(hid_t fapl) if (!H5F_addr_defined(fs_addr)) TEST_ERROR; - if (NULL == (sect_node = (TEST_free_section_t *)HDmalloc(sizeof(TEST_free_section_t)))) + if (NULL == (sect_node = (TEST_free_section_t *)malloc(sizeof(TEST_free_section_t)))) FAIL_STACK_ERROR; /* @@ -855,7 +854,7 @@ test_fs_sect_add(hid_t fapl) if (H5FS_sect_add(f, frsp, (H5FS_section_info_t *)sect_node, H5FS_ADD_DESERIALIZING, &can_shrink) < 0) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(frspace_state_t)); + memset(&state, 0, sizeof(frspace_state_t)); state.tot_space += sect_node->sect_info.size; state.tot_sect_count += 1; state.serial_sect_count += 1; @@ -966,7 +965,7 @@ test_fs_sect_find(hid_t fapl) if (!H5F_addr_defined(fs_addr)) TEST_ERROR; - HDmemset(&state, 0, sizeof(frspace_state_t)); + memset(&state, 0, sizeof(frspace_state_t)); if (check_stats(f, frsp, &state)) TEST_ERROR; @@ -1002,7 +1001,7 @@ test_fs_sect_find(hid_t fapl) /* * Add section A */ - if (NULL == (sect_node1 = (TEST_free_section_t *)HDmalloc(sizeof(TEST_free_section_t)))) + if (NULL == (sect_node1 = (TEST_free_section_t *)malloc(sizeof(TEST_free_section_t)))) FAIL_STACK_ERROR; init_sect_node(sect_node1, (haddr_t)TEST_SECT_ADDR60, (hsize_t)TEST_SECT_SIZE30, TEST_FSPACE_SECT_TYPE, @@ -1011,7 +1010,7 @@ test_fs_sect_find(hid_t fapl) if (H5FS_sect_add(f, frsp, (H5FS_section_info_t *)sect_node1, H5FS_ADD_RETURNED_SPACE, NULL) < 0) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(frspace_state_t)); + memset(&state, 0, sizeof(frspace_state_t)); state.tot_space += sect_node1->sect_info.size; state.tot_sect_count += 1; state.serial_sect_count += 1; @@ -1022,7 +1021,7 @@ test_fs_sect_find(hid_t fapl) /* * Add section C */ - if (NULL == (sect_node3 = (TEST_free_section_t *)HDmalloc(sizeof(TEST_free_section_t)))) + if (NULL == (sect_node3 = (TEST_free_section_t *)malloc(sizeof(TEST_free_section_t)))) FAIL_STACK_ERROR; init_sect_node(sect_node3, (haddr_t)(TEST_SECT_ADDR200), (hsize_t)TEST_SECT_SIZE50, TEST_FSPACE_SECT_TYPE, @@ -1041,7 +1040,7 @@ test_fs_sect_find(hid_t fapl) /* * Add section B */ - if (NULL == (sect_node2 = (TEST_free_section_t *)HDmalloc(sizeof(TEST_free_section_t)))) + if (NULL == (sect_node2 = (TEST_free_section_t *)malloc(sizeof(TEST_free_section_t)))) FAIL_STACK_ERROR; init_sect_node(sect_node2, (haddr_t)TEST_SECT_ADDR100, (hsize_t)TEST_SECT_SIZE50, TEST_FSPACE_SECT_TYPE, @@ -1060,7 +1059,7 @@ test_fs_sect_find(hid_t fapl) /* * Add section D */ - if (NULL == (sect_node4 = (TEST_free_section_t *)HDmalloc(sizeof(TEST_free_section_t)))) + if (NULL == (sect_node4 = (TEST_free_section_t *)malloc(sizeof(TEST_free_section_t)))) FAIL_STACK_ERROR; init_sect_node(sect_node4, (haddr_t)TEST_SECT_ADDR300, (hsize_t)TEST_SECT_SIZE80, TEST_FSPACE_SECT_TYPE, @@ -1129,7 +1128,7 @@ test_fs_sect_find(hid_t fapl) /* * Add section A */ - if (NULL == (sect_node1 = (TEST_free_section_t *)HDmalloc(sizeof(TEST_free_section_t)))) + if (NULL == (sect_node1 = (TEST_free_section_t *)malloc(sizeof(TEST_free_section_t)))) FAIL_STACK_ERROR; init_sect_node(sect_node1, (haddr_t)TEST_SECT_ADDR60, (hsize_t)TEST_SECT_SIZE30, TEST_FSPACE_SECT_TYPE, @@ -1138,7 +1137,7 @@ test_fs_sect_find(hid_t fapl) if (H5FS_sect_add(f, frsp, (H5FS_section_info_t *)sect_node1, H5FS_ADD_RETURNED_SPACE, NULL) < 0) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(frspace_state_t)); + memset(&state, 0, sizeof(frspace_state_t)); state.tot_space += sect_node1->sect_info.size; state.tot_sect_count += 1; state.serial_sect_count += 1; @@ -1149,7 +1148,7 @@ test_fs_sect_find(hid_t fapl) /* * Add section B */ - if (NULL == (sect_node2 = (TEST_free_section_t *)HDmalloc(sizeof(TEST_free_section_t)))) + if (NULL == (sect_node2 = (TEST_free_section_t *)malloc(sizeof(TEST_free_section_t)))) FAIL_STACK_ERROR; init_sect_node(sect_node2, (haddr_t)TEST_SECT_ADDR200, (hsize_t)TEST_SECT_SIZE80, TEST_FSPACE_SECT_TYPE, @@ -1208,7 +1207,7 @@ test_fs_sect_find(hid_t fapl) /* * Add section A */ - if (NULL == (sect_node1 = (TEST_free_section_t *)HDmalloc(sizeof(TEST_free_section_t)))) + if (NULL == (sect_node1 = (TEST_free_section_t *)malloc(sizeof(TEST_free_section_t)))) FAIL_STACK_ERROR; init_sect_node(sect_node1, (haddr_t)TEST_SECT_ADDR60, (hsize_t)TEST_SECT_SIZE30, TEST_FSPACE_SECT_TYPE, @@ -1217,7 +1216,7 @@ test_fs_sect_find(hid_t fapl) if (H5FS_sect_add(f, frsp, (H5FS_section_info_t *)sect_node1, H5FS_ADD_RETURNED_SPACE, NULL) < 0) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(frspace_state_t)); + memset(&state, 0, sizeof(frspace_state_t)); state.tot_space += sect_node1->sect_info.size; state.tot_sect_count += 1; state.serial_sect_count += 1; @@ -1356,7 +1355,7 @@ test_fs_sect_merge(hid_t fapl) /* * Add section C */ - if (NULL == (sect_node1 = (TEST_free_section_t *)HDmalloc(sizeof(TEST_free_section_t)))) + if (NULL == (sect_node1 = (TEST_free_section_t *)malloc(sizeof(TEST_free_section_t)))) FAIL_STACK_ERROR; init_sect_node(sect_node1, (haddr_t)TEST_SECT_ADDR100, (hsize_t)TEST_SECT_SIZE50, TEST_FSPACE_SECT_TYPE, @@ -1365,7 +1364,7 @@ test_fs_sect_merge(hid_t fapl) if (H5FS_sect_add(f, frsp, (H5FS_section_info_t *)sect_node1, H5FS_ADD_RETURNED_SPACE, NULL) < 0) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(frspace_state_t)); + memset(&state, 0, sizeof(frspace_state_t)); state.tot_space += TEST_SECT_SIZE50; state.tot_sect_count += 1; state.serial_sect_count += 1; @@ -1376,7 +1375,7 @@ test_fs_sect_merge(hid_t fapl) /* * Add section B */ - if (NULL == (sect_node2 = (TEST_free_section_t *)HDmalloc(sizeof(TEST_free_section_t)))) + if (NULL == (sect_node2 = (TEST_free_section_t *)malloc(sizeof(TEST_free_section_t)))) FAIL_STACK_ERROR; init_sect_node(sect_node2, (haddr_t)TEST_SECT_ADDR70, (hsize_t)TEST_SECT_SIZE30, TEST_FSPACE_SECT_TYPE, @@ -1394,7 +1393,7 @@ test_fs_sect_merge(hid_t fapl) /* * Add section A */ - if (NULL == (sect_node3 = (TEST_free_section_t *)HDmalloc(sizeof(TEST_free_section_t)))) + if (NULL == (sect_node3 = (TEST_free_section_t *)malloc(sizeof(TEST_free_section_t)))) FAIL_STACK_ERROR; init_sect_node(sect_node3, (haddr_t)TEST_SECT_ADDR60, (hsize_t)TEST_SECT_SIZE10, TEST_FSPACE_SECT_TYPE, @@ -1412,7 +1411,7 @@ test_fs_sect_merge(hid_t fapl) /* * Add section D */ - if (NULL == (sect_node4 = (TEST_free_section_t *)HDmalloc(sizeof(TEST_free_section_t)))) + if (NULL == (sect_node4 = (TEST_free_section_t *)malloc(sizeof(TEST_free_section_t)))) FAIL_STACK_ERROR; init_sect_node(sect_node4, (haddr_t)TEST_SECT_ADDR150, (hsize_t)TEST_SECT_SIZE80, TEST_FSPACE_SECT_TYPE, @@ -1485,7 +1484,7 @@ test_fs_sect_merge(hid_t fapl) /* * Add section A */ - if (NULL == (sect_node1 = (TEST_free_section_t *)HDmalloc(sizeof(TEST_free_section_t)))) + if (NULL == (sect_node1 = (TEST_free_section_t *)malloc(sizeof(TEST_free_section_t)))) FAIL_STACK_ERROR; init_sect_node(sect_node1, (haddr_t)TEST_SECT_ADDR70, (hsize_t)TEST_SECT_SIZE30, TEST_FSPACE_SECT_TYPE, @@ -1494,7 +1493,7 @@ test_fs_sect_merge(hid_t fapl) if (H5FS_sect_add(f, frsp, (H5FS_section_info_t *)sect_node1, H5FS_ADD_RETURNED_SPACE, NULL) < 0) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(frspace_state_t)); + memset(&state, 0, sizeof(frspace_state_t)); state.tot_space += TEST_SECT_SIZE30; state.tot_sect_count += 1; state.serial_sect_count += 1; @@ -1505,7 +1504,7 @@ test_fs_sect_merge(hid_t fapl) /* * Add section B */ - if (NULL == (sect_node2 = (TEST_free_section_t *)HDmalloc(sizeof(TEST_free_section_t)))) + if (NULL == (sect_node2 = (TEST_free_section_t *)malloc(sizeof(TEST_free_section_t)))) FAIL_STACK_ERROR; init_sect_node(sect_node2, (haddr_t)TEST_SECT_ADDR100, (hsize_t)TEST_SECT_SIZE50, TEST_FSPACE_SECT_TYPE, @@ -1588,7 +1587,7 @@ test_fs_sect_merge(hid_t fapl) /* * Add section A */ - if (NULL == (sect_node1 = (TEST_free_section_t *)HDmalloc(sizeof(TEST_free_section_t)))) + if (NULL == (sect_node1 = (TEST_free_section_t *)malloc(sizeof(TEST_free_section_t)))) FAIL_STACK_ERROR; init_sect_node(sect_node1, (haddr_t)TEST_SECT_ADDR60, (hsize_t)TEST_SECT_SIZE10, TEST_FSPACE_SECT_TYPE, @@ -1597,7 +1596,7 @@ test_fs_sect_merge(hid_t fapl) if (H5FS_sect_add(f, frsp, (H5FS_section_info_t *)sect_node1, H5FS_ADD_RETURNED_SPACE, NULL) < 0) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(frspace_state_t)); + memset(&state, 0, sizeof(frspace_state_t)); state.tot_space += TEST_SECT_SIZE10; state.tot_sect_count += 1; state.serial_sect_count += 1; @@ -1608,7 +1607,7 @@ test_fs_sect_merge(hid_t fapl) /* * Add section B */ - if (NULL == (sect_node2 = (TEST_free_section_t *)HDmalloc(sizeof(TEST_free_section_t)))) + if (NULL == (sect_node2 = (TEST_free_section_t *)malloc(sizeof(TEST_free_section_t)))) FAIL_STACK_ERROR; init_sect_node(sect_node2, (haddr_t)TEST_SECT_ADDR70, (hsize_t)TEST_SECT_SIZE30, @@ -1628,7 +1627,7 @@ test_fs_sect_merge(hid_t fapl) /* * Add section C */ - if (NULL == (sect_node3 = (TEST_free_section_t *)HDmalloc(sizeof(TEST_free_section_t)))) + if (NULL == (sect_node3 = (TEST_free_section_t *)malloc(sizeof(TEST_free_section_t)))) FAIL_STACK_ERROR; init_sect_node(sect_node3, (haddr_t)TEST_SECT_ADDR100, (hsize_t)TEST_SECT_SIZE50, @@ -1646,7 +1645,7 @@ test_fs_sect_merge(hid_t fapl) /* * Add section D */ - if (NULL == (sect_node4 = (TEST_free_section_t *)HDmalloc(sizeof(TEST_free_section_t)))) + if (NULL == (sect_node4 = (TEST_free_section_t *)malloc(sizeof(TEST_free_section_t)))) FAIL_STACK_ERROR; init_sect_node(sect_node4, (haddr_t)TEST_SECT_ADDR150, (hsize_t)TEST_SECT_SIZE80, TEST_FSPACE_SECT_TYPE, @@ -1834,7 +1833,7 @@ test_fs_sect_shrink(hid_t fapl) /* * Add section A that allow shrinking but its section class type does not define "can_shrink" */ - if (NULL == (sect_node1 = (TEST_free_section_t *)HDmalloc(sizeof(TEST_free_section_t)))) + if (NULL == (sect_node1 = (TEST_free_section_t *)malloc(sizeof(TEST_free_section_t)))) FAIL_STACK_ERROR; init_sect_node(sect_node1, (haddr_t)TEST_SECT_ADDR100, (hsize_t)TEST_SECT_SIZE50, @@ -1844,7 +1843,7 @@ test_fs_sect_shrink(hid_t fapl) if (H5FS_sect_add(f, frsp, (H5FS_section_info_t *)sect_node1, H5FS_ADD_RETURNED_SPACE, &can_shrink) < 0) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(frspace_state_t)); + memset(&state, 0, sizeof(frspace_state_t)); state.tot_space += sect_node1->sect_info.size; state.tot_sect_count += 1; state.serial_sect_count += 1; @@ -1869,7 +1868,7 @@ test_fs_sect_shrink(hid_t fapl) /* * Re-add section A that allow shrinking and its section class type defines "can_shrink" */ - if (NULL == (sect_node1 = (TEST_free_section_t *)HDmalloc(sizeof(TEST_free_section_t)))) + if (NULL == (sect_node1 = (TEST_free_section_t *)malloc(sizeof(TEST_free_section_t)))) FAIL_STACK_ERROR; init_sect_node(sect_node1, (haddr_t)TEST_SECT_ADDR100, (hsize_t)TEST_SECT_SIZE50, TEST_FSPACE_SECT_TYPE, @@ -1880,7 +1879,7 @@ test_fs_sect_shrink(hid_t fapl) FAIL_STACK_ERROR; /* should have nothing in free-space */ - HDmemset(&state, 0, sizeof(frspace_state_t)); + memset(&state, 0, sizeof(frspace_state_t)); if (check_stats(f, frsp, &state)) TEST_ERROR; @@ -1936,7 +1935,7 @@ test_fs_sect_shrink(hid_t fapl) /* * Add section A */ - if (NULL == (sect_node1 = (TEST_free_section_t *)HDmalloc(sizeof(TEST_free_section_t)))) + if (NULL == (sect_node1 = (TEST_free_section_t *)malloc(sizeof(TEST_free_section_t)))) FAIL_STACK_ERROR; init_sect_node(sect_node1, (haddr_t)TEST_SECT_ADDR80, (hsize_t)TEST_SECT_SIZE20, TEST_FSPACE_SECT_TYPE, @@ -1945,7 +1944,7 @@ test_fs_sect_shrink(hid_t fapl) if (H5FS_sect_add(f, frsp, (H5FS_section_info_t *)sect_node1, H5FS_ADD_RETURNED_SPACE, &can_shrink) < 0) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(frspace_state_t)); + memset(&state, 0, sizeof(frspace_state_t)); state.tot_space += sect_node1->sect_info.size; state.tot_sect_count += 1; state.serial_sect_count += 1; @@ -1956,7 +1955,7 @@ test_fs_sect_shrink(hid_t fapl) /* * Add section B */ - if (NULL == (sect_node2 = (TEST_free_section_t *)HDmalloc(sizeof(TEST_free_section_t)))) + if (NULL == (sect_node2 = (TEST_free_section_t *)malloc(sizeof(TEST_free_section_t)))) FAIL_STACK_ERROR; init_sect_node(sect_node2, (haddr_t)TEST_SECT_ADDR100, (hsize_t)TEST_SECT_SIZE50, TEST_FSPACE_SECT_TYPE, @@ -2036,7 +2035,7 @@ test_fs_sect_shrink(hid_t fapl) /* * Add section A */ - if (NULL == (sect_node1 = (TEST_free_section_t *)HDmalloc(sizeof(TEST_free_section_t)))) + if (NULL == (sect_node1 = (TEST_free_section_t *)malloc(sizeof(TEST_free_section_t)))) FAIL_STACK_ERROR; init_sect_node(sect_node1, (haddr_t)TEST_SECT_ADDR70, (hsize_t)TEST_SECT_SIZE30, TEST_FSPACE_SECT_TYPE, @@ -2045,7 +2044,7 @@ test_fs_sect_shrink(hid_t fapl) if (H5FS_sect_add(f, frsp, (H5FS_section_info_t *)sect_node1, H5FS_ADD_RETURNED_SPACE, &can_shrink) < 0) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(frspace_state_t)); + memset(&state, 0, sizeof(frspace_state_t)); state.tot_space += sect_node1->sect_info.size; state.tot_sect_count += 1; state.serial_sect_count += 1; @@ -2056,7 +2055,7 @@ test_fs_sect_shrink(hid_t fapl) /* * Add section B */ - if (NULL == (sect_node2 = (TEST_free_section_t *)HDmalloc(sizeof(TEST_free_section_t)))) + if (NULL == (sect_node2 = (TEST_free_section_t *)malloc(sizeof(TEST_free_section_t)))) FAIL_STACK_ERROR; init_sect_node(sect_node2, (haddr_t)TEST_SECT_ADDR100, (hsize_t)TEST_SECT_SIZE50, TEST_FSPACE_SECT_TYPE, @@ -2066,7 +2065,7 @@ test_fs_sect_shrink(hid_t fapl) FAIL_STACK_ERROR; /* section A & B are merged and then strunk, so there is nothing in free-space */ - HDmemset(&state, 0, sizeof(frspace_state_t)); + memset(&state, 0, sizeof(frspace_state_t)); if (check_stats(f, frsp, &state)) TEST_ERROR; @@ -2178,7 +2177,7 @@ test_fs_sect_change_class(hid_t fapl) /* * Add section A */ - if (NULL == (sect_node1 = (TEST_free_section_t *)HDmalloc(sizeof(TEST_free_section_t)))) + if (NULL == (sect_node1 = (TEST_free_section_t *)malloc(sizeof(TEST_free_section_t)))) FAIL_STACK_ERROR; init_sect_node(sect_node1, (haddr_t)TEST_SECT_ADDR60, (hsize_t)TEST_SECT_SIZE30, TEST_FSPACE_SECT_TYPE, @@ -2187,7 +2186,7 @@ test_fs_sect_change_class(hid_t fapl) if (H5FS_sect_add(f, frsp, (H5FS_section_info_t *)sect_node1, H5FS_ADD_RETURNED_SPACE, NULL) < 0) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(frspace_state_t)); + memset(&state, 0, sizeof(frspace_state_t)); state.tot_space += TEST_SECT_SIZE30; state.tot_sect_count += 1; state.ghost_sect_count += 1; @@ -2198,7 +2197,7 @@ test_fs_sect_change_class(hid_t fapl) /* * Add section B */ - if (NULL == (sect_node2 = (TEST_free_section_t *)HDmalloc(sizeof(TEST_free_section_t)))) + if (NULL == (sect_node2 = (TEST_free_section_t *)malloc(sizeof(TEST_free_section_t)))) FAIL_STACK_ERROR; init_sect_node(sect_node2, (haddr_t)TEST_SECT_ADDR100, (hsize_t)TEST_SECT_SIZE50, @@ -2282,7 +2281,7 @@ test_fs_sect_change_class(hid_t fapl) /* * Add section A */ - if (NULL == (sect_node1 = (TEST_free_section_t *)HDmalloc(sizeof(TEST_free_section_t)))) + if (NULL == (sect_node1 = (TEST_free_section_t *)malloc(sizeof(TEST_free_section_t)))) FAIL_STACK_ERROR; init_sect_node(sect_node1, (haddr_t)TEST_SECT_ADDR70, (hsize_t)TEST_SECT_SIZE30, TEST_FSPACE_SECT_TYPE, @@ -2294,7 +2293,7 @@ test_fs_sect_change_class(hid_t fapl) /* * Add section B */ - if (NULL == (sect_node2 = (TEST_free_section_t *)HDmalloc(sizeof(TEST_free_section_t)))) + if (NULL == (sect_node2 = (TEST_free_section_t *)malloc(sizeof(TEST_free_section_t)))) FAIL_STACK_ERROR; init_sect_node(sect_node2, (haddr_t)TEST_SECT_ADDR100, (hsize_t)TEST_SECT_SIZE50, @@ -2306,7 +2305,7 @@ test_fs_sect_change_class(hid_t fapl) /* * Add section C */ - if (NULL == (sect_node3 = (TEST_free_section_t *)HDmalloc(sizeof(TEST_free_section_t)))) + if (NULL == (sect_node3 = (TEST_free_section_t *)malloc(sizeof(TEST_free_section_t)))) FAIL_STACK_ERROR; init_sect_node(sect_node3, (haddr_t)TEST_SECT_ADDR200, (hsize_t)TEST_SECT_SIZE80, @@ -2466,7 +2465,7 @@ test_fs_sect_extend(hid_t fapl) /* * Add section A */ - if (NULL == (sect_node1 = (TEST_free_section_t *)HDmalloc(sizeof(TEST_free_section_t)))) + if (NULL == (sect_node1 = (TEST_free_section_t *)malloc(sizeof(TEST_free_section_t)))) FAIL_STACK_ERROR; init_sect_node(sect_node1, (haddr_t)TEST_SECT_ADDR70, (hsize_t)TEST_SECT_SIZE5, TEST_FSPACE_SECT_TYPE, @@ -2475,7 +2474,7 @@ test_fs_sect_extend(hid_t fapl) if (H5FS_sect_add(f, frsp, (H5FS_section_info_t *)sect_node1, H5FS_ADD_RETURNED_SPACE, NULL) < 0) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(frspace_state_t)); + memset(&state, 0, sizeof(frspace_state_t)); state.tot_space += sect_node1->sect_info.size; state.tot_sect_count += 1; state.serial_sect_count += 1; @@ -2486,7 +2485,7 @@ test_fs_sect_extend(hid_t fapl) /* * Add section B */ - if (NULL == (sect_node2 = (TEST_free_section_t *)HDmalloc(sizeof(TEST_free_section_t)))) + if (NULL == (sect_node2 = (TEST_free_section_t *)malloc(sizeof(TEST_free_section_t)))) FAIL_STACK_ERROR; init_sect_node(sect_node2, (haddr_t)TEST_SECT_ADDR100, (hsize_t)TEST_SECT_SIZE40, TEST_FSPACE_SECT_TYPE, @@ -2543,7 +2542,7 @@ test_fs_sect_extend(hid_t fapl) /* * Add section A */ - if (NULL == (sect_node1 = (TEST_free_section_t *)HDmalloc(sizeof(TEST_free_section_t)))) + if (NULL == (sect_node1 = (TEST_free_section_t *)malloc(sizeof(TEST_free_section_t)))) FAIL_STACK_ERROR; init_sect_node(sect_node1, (haddr_t)TEST_SECT_ADDR70, (hsize_t)TEST_SECT_SIZE5, TEST_FSPACE_SECT_TYPE, @@ -2552,7 +2551,7 @@ test_fs_sect_extend(hid_t fapl) if (H5FS_sect_add(f, frsp, (H5FS_section_info_t *)sect_node1, H5FS_ADD_RETURNED_SPACE, NULL) < 0) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(frspace_state_t)); + memset(&state, 0, sizeof(frspace_state_t)); state.tot_space += sect_node1->sect_info.size; state.tot_sect_count += 1; state.serial_sect_count += 1; @@ -2563,7 +2562,7 @@ test_fs_sect_extend(hid_t fapl) /* * Add section B */ - if (NULL == (sect_node2 = (TEST_free_section_t *)HDmalloc(sizeof(TEST_free_section_t)))) + if (NULL == (sect_node2 = (TEST_free_section_t *)malloc(sizeof(TEST_free_section_t)))) FAIL_STACK_ERROR; init_sect_node(sect_node2, (haddr_t)TEST_SECT_ADDR100, (hsize_t)TEST_SECT_SIZE40, TEST_FSPACE_SECT_TYPE, @@ -2617,7 +2616,7 @@ test_fs_sect_extend(hid_t fapl) /* * Add section A */ - if (NULL == (sect_node1 = (TEST_free_section_t *)HDmalloc(sizeof(TEST_free_section_t)))) + if (NULL == (sect_node1 = (TEST_free_section_t *)malloc(sizeof(TEST_free_section_t)))) FAIL_STACK_ERROR; init_sect_node(sect_node1, (haddr_t)TEST_SECT_ADDR70, (hsize_t)TEST_SECT_SIZE5, TEST_FSPACE_SECT_TYPE, @@ -2626,7 +2625,7 @@ test_fs_sect_extend(hid_t fapl) if (H5FS_sect_add(f, frsp, (H5FS_section_info_t *)sect_node1, H5FS_ADD_RETURNED_SPACE, NULL) < 0) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(frspace_state_t)); + memset(&state, 0, sizeof(frspace_state_t)); state.tot_space += sect_node1->sect_info.size; state.tot_sect_count += 1; state.serial_sect_count += 1; @@ -2637,7 +2636,7 @@ test_fs_sect_extend(hid_t fapl) /* * Add section B */ - if (NULL == (sect_node2 = (TEST_free_section_t *)HDmalloc(sizeof(TEST_free_section_t)))) + if (NULL == (sect_node2 = (TEST_free_section_t *)malloc(sizeof(TEST_free_section_t)))) FAIL_STACK_ERROR; init_sect_node(sect_node2, (haddr_t)TEST_SECT_ADDR100, (hsize_t)TEST_SECT_SIZE40, TEST_FSPACE_SECT_TYPE, @@ -2692,7 +2691,7 @@ test_fs_sect_extend(hid_t fapl) /* * Add section A */ - if (NULL == (sect_node1 = (TEST_free_section_t *)HDmalloc(sizeof(TEST_free_section_t)))) + if (NULL == (sect_node1 = (TEST_free_section_t *)malloc(sizeof(TEST_free_section_t)))) FAIL_STACK_ERROR; init_sect_node(sect_node1, (haddr_t)TEST_SECT_ADDR70, (hsize_t)TEST_SECT_SIZE5, TEST_FSPACE_SECT_TYPE, @@ -2701,7 +2700,7 @@ test_fs_sect_extend(hid_t fapl) if (H5FS_sect_add(f, frsp, (H5FS_section_info_t *)sect_node1, H5FS_ADD_RETURNED_SPACE, NULL) < 0) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(frspace_state_t)); + memset(&state, 0, sizeof(frspace_state_t)); state.tot_space += sect_node1->sect_info.size; state.tot_sect_count += 1; state.serial_sect_count += 1; @@ -2712,7 +2711,7 @@ test_fs_sect_extend(hid_t fapl) /* * Add section B */ - if (NULL == (sect_node2 = (TEST_free_section_t *)HDmalloc(sizeof(TEST_free_section_t)))) + if (NULL == (sect_node2 = (TEST_free_section_t *)malloc(sizeof(TEST_free_section_t)))) FAIL_STACK_ERROR; init_sect_node(sect_node2, (haddr_t)TEST_SECT_ADDR100, (hsize_t)TEST_SECT_SIZE40, TEST_FSPACE_SECT_TYPE, @@ -2823,7 +2822,7 @@ test_fs_sect_iterate(hid_t fapl) TEST_ERROR; for (i = 1; i <= NUM_SECTIONS; i++) { - if (NULL == (sect_node = (TEST_free_section_t *)HDmalloc(sizeof(TEST_free_section_t)))) + if (NULL == (sect_node = (TEST_free_section_t *)malloc(sizeof(TEST_free_section_t)))) FAIL_STACK_ERROR; sect_size = (unsigned)((i - 1) % 9) + 1; @@ -2919,7 +2918,7 @@ main(void) api_ctx_pushed = FALSE; h5_cleanup(FILENAME, fapl); - HDexit(EXIT_SUCCESS); + exit(EXIT_SUCCESS); error: HDputs("*** TESTS FAILED ***"); @@ -2932,5 +2931,5 @@ error: if (api_ctx_pushed) H5CX_pop(FALSE); - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); } /* main() */ diff --git a/test/gen_bounds.c b/test/gen_bounds.c index fb765f7..57b8026 100644 --- a/test/gen_bounds.c +++ b/test/gen_bounds.c @@ -148,7 +148,7 @@ gen_earliest_latest(void) /* * Add a chunked dataset with layout version 3 (default) */ - buf = (float *)HDmalloc((size_t)DIM1 * (size_t)DIM2 * sizeof(float)); + buf = (float *)malloc((size_t)DIM1 * (size_t)DIM2 * sizeof(float)); if (buf == NULL) TEST_ERROR; @@ -210,7 +210,7 @@ gen_earliest_latest(void) TEST_ERROR; /* Release allocated buffer */ - HDfree(buf); + free(buf); bufp = buf = NULL; /* Close everything */ @@ -234,7 +234,7 @@ error: H5Pclose(fcpl); H5Pclose(fapl); H5Fclose(fid); - HDfree(buf); + free(buf); } H5E_END_TRY; return FAIL; @@ -293,7 +293,7 @@ gen_earliest_v18(void) * Add a chunked dataset with layout version 3 (default) */ - buf = (float *)HDmalloc((size_t)DIM1 * (size_t)DIM2 * sizeof(float)); + buf = (float *)malloc((size_t)DIM1 * (size_t)DIM2 * sizeof(float)); if (buf == NULL) TEST_ERROR; @@ -325,7 +325,7 @@ gen_earliest_v18(void) TEST_ERROR; /* Release allocated buffer */ - HDfree(buf); + free(buf); bufp = buf = NULL; /* Close everything */ @@ -349,7 +349,7 @@ error: H5Pclose(fcpl); H5Pclose(fapl); H5Fclose(fid); - HDfree(buf); + free(buf); } H5E_END_TRY; return FAIL; @@ -402,7 +402,7 @@ gen_latest_latest(void) * Add a chunked dataset with layout version 4 (H5Pset_chunk_opts) */ - buf = (float *)HDmalloc((size_t)DIM1 * (size_t)DIM2 * sizeof(float)); + buf = (float *)malloc((size_t)DIM1 * (size_t)DIM2 * sizeof(float)); if (buf == NULL) TEST_ERROR; @@ -437,7 +437,7 @@ gen_latest_latest(void) TEST_ERROR; /* Release allocated buffer */ - HDfree(buf); + free(buf); bufp = buf = NULL; /* Close everything */ @@ -459,7 +459,7 @@ error: H5Sclose(space); H5Pclose(dcpl); H5Fclose(fid); - HDfree(buf); + free(buf); } H5E_END_TRY; return FAIL; @@ -520,7 +520,7 @@ gen_v18_latest(void) * Add a chunked dataset with layout version 3 (default) */ - buf = (float *)HDmalloc((size_t)DIM1 * (size_t)DIM2 * sizeof(float)); + buf = (float *)malloc((size_t)DIM1 * (size_t)DIM2 * sizeof(float)); if (buf == NULL) TEST_ERROR; @@ -551,7 +551,7 @@ gen_v18_latest(void) TEST_ERROR; /* Release allocated buffer */ - HDfree(buf); + free(buf); bufp = buf = NULL; /* Close property list and dataset, will reuse dataspace */ @@ -575,7 +575,7 @@ error: H5Pclose(fcpl); H5Pclose(fapl); H5Fclose(fid); - HDfree(buf); + free(buf); } H5E_END_TRY; return FAIL; @@ -635,7 +635,7 @@ gen_v18_v18(void) * Add a chunked dataset with layout version 3 (default) */ - buf = (float *)HDmalloc((size_t)DIM1 * (size_t)DIM2 * sizeof(float)); + buf = (float *)malloc((size_t)DIM1 * (size_t)DIM2 * sizeof(float)); if (buf == NULL) TEST_ERROR; @@ -712,7 +712,7 @@ gen_v18_v18(void) TEST_ERROR; /* Release allocated buffer */ - HDfree(buf); + free(buf); bufp = buf = NULL; /* Close everything */ @@ -737,7 +737,7 @@ error: H5Pclose(fcpl); H5Pclose(fapl); H5Fclose(fid); - HDfree(buf); + free(buf); } H5E_END_TRY; return FAIL; @@ -1018,7 +1018,7 @@ gen_ref_files(const char *filename, H5F_libver_t low_bound, H5F_libver_t high_bo * Create test file, attribute, group and dataset */ - if ((dwbuf = HDcalloc(sizeof(unsigned), 100)) == NULL) + if ((dwbuf = calloc(sizeof(unsigned), 100)) == NULL) TEST_ERROR; /* Create the test file */ @@ -1068,7 +1068,7 @@ gen_ref_files(const char *filename, H5F_libver_t low_bound, H5F_libver_t high_bo TEST_ERROR; if (dwbuf) { - HDfree(dwbuf); + free(dwbuf); dwbuf = NULL; } @@ -1201,7 +1201,7 @@ error: H5Sclose(sid); H5Pclose(fapl); H5Fclose(fid); - HDfree(dwbuf); + free(dwbuf); } H5E_END_TRY; diff --git a/test/gen_cross.c b/test/gen_cross.c index c468039..d72f4cb 100644 --- a/test/gen_cross.c +++ b/test/gen_cross.c @@ -1258,8 +1258,8 @@ main(void) /* Create memory space. This does not include the extra row for fill * values. */ - HDassert(dimsf[0] == NX); - HDassert(dimsf[1] == NY); + assert(dimsf[0] == NX); + assert(dimsf[1] == NY); if ((memspace = H5Screate_simple(RANK, dimsf, NULL)) < 0) TEST_ERROR; @@ -1325,8 +1325,8 @@ main(void) if (H5Fclose(file) < 0) TEST_ERROR; - HDexit(EXIT_SUCCESS); + exit(EXIT_SUCCESS); error: - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); } /* end main() */ diff --git a/test/gen_deflate.c b/test/gen_deflate.c index b103559..da5cc75 100644 --- a/test/gen_deflate.c +++ b/test/gen_deflate.c @@ -54,7 +54,7 @@ main(void) /* Initialize the data */ /* (Try for something easily compressible) */ - if (NULL == (data = (int *)HDmalloc(SPACE_DIM1 * SPACE_DIM2 * sizeof(int)))) + if (NULL == (data = (int *)malloc(SPACE_DIM1 * SPACE_DIM2 * sizeof(int)))) TEST_ERROR; for (i = 0; i < SPACE_DIM1; i++) @@ -97,13 +97,13 @@ main(void) if (H5Fclose(fid) < 0) FAIL_STACK_ERROR; - HDfree(data); + free(data); return EXIT_SUCCESS; error: if (data) - HDfree(data); + free(data); H5E_BEGIN_TRY { H5Pclose(dcpl_id); diff --git a/test/gen_file_image.c b/test/gen_file_image.c index 03065c6..978810a 100644 --- a/test/gen_file_image.c +++ b/test/gen_file_image.c @@ -45,7 +45,7 @@ main(void) int *data = NULL; /* Dataset data */ /* Initialize the data */ - if (NULL == (data = (int *)HDmalloc(SPACE_DIM1 * SPACE_DIM2 * sizeof(int)))) + if (NULL == (data = (int *)malloc(SPACE_DIM1 * SPACE_DIM2 * sizeof(int)))) TEST_ERROR; for (i = 0; i < SPACE_DIM1; i++) @@ -80,7 +80,7 @@ main(void) error: if (data) - HDfree(data); + free(data); H5E_BEGIN_TRY { H5Dclose(did); diff --git a/test/gen_filters.c b/test/gen_filters.c index c171538..d2d7713 100644 --- a/test/gen_filters.c +++ b/test/gen_filters.c @@ -240,12 +240,12 @@ main(void) if (nerrors) goto error; - HDprintf("All tests passed.\n"); + printf("All tests passed.\n"); return 0; error: nerrors = MAX(1, nerrors); - HDprintf("***** %d GEN_FILTERS FAILURES *****\n", nerrors); + printf("***** %d GEN_FILTERS FAILURES *****\n", nerrors); return 1; } diff --git a/test/gen_new_super.c b/test/gen_new_super.c index 47d6d47..46855e7 100644 --- a/test/gen_new_super.c +++ b/test/gen_new_super.c @@ -48,10 +48,10 @@ main(void) /* Create a file creation property list */ fcpl = H5Pcreate(H5P_FILE_CREATE); - HDassert(fcpl >= 0); + assert(fcpl >= 0); ret = H5Pset_istore_k(fcpl, ISTORE_IK); - HDassert(ret >= 0); + assert(ret >= 0); /* Creating a file with the non-default file creation property list should * create a version 1 superblock @@ -59,15 +59,15 @@ main(void) /* Create file with custom file creation property list */ file = H5Fcreate(TESTFILE, H5F_ACC_TRUNC, fcpl, H5P_DEFAULT); - HDassert(file >= 0); + assert(file >= 0); /* Close FCPL */ ret = H5Pclose(fcpl); - HDassert(ret >= 0); + assert(ret >= 0); /* Close file */ ret = H5Fclose(file); - HDassert(ret >= 0); + assert(ret >= 0); return EXIT_SUCCESS; } diff --git a/test/gen_nullspace.c b/test/gen_nullspace.c index 12e00d4..84e7398 100644 --- a/test/gen_nullspace.c +++ b/test/gen_nullspace.c @@ -41,42 +41,42 @@ main(void) /* Create the file */ fid = H5Fcreate(NULLFILE, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT); - HDassert(fid > 0); + assert(fid > 0); sid = H5Screate(H5S_NULL); - HDassert(sid > 0); + assert(sid > 0); /* Create dataset */ did = H5Dcreate2(fid, NULLDATASET, H5T_NATIVE_UINT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); - HDassert(did > 0); + assert(did > 0); /* Close the dataset */ ret = H5Dclose(did); - HDassert(ret >= 0); + assert(ret >= 0); /* Open the root group */ gid = H5Gopen2(fid, "/", H5P_DEFAULT); - HDassert(gid > 0); + assert(gid > 0); /* Create an attribute for the group */ attr = H5Acreate2(gid, NULLATTR, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT); - HDassert(attr > 0); + assert(attr > 0); /* Close attribute */ ret = H5Aclose(attr); - HDassert(ret >= 0); + assert(ret >= 0); /* Close the group */ ret = H5Gclose(gid); - HDassert(ret >= 0); + assert(ret >= 0); /* Close the dataspace */ ret = H5Sclose(sid); - HDassert(ret >= 0); + assert(ret >= 0); /* Close the file */ ret = H5Fclose(fid); - HDassert(ret >= 0); + assert(ret >= 0); return EXIT_SUCCESS; } diff --git a/test/gen_plist.c b/test/gen_plist.c index 5302dc7..bd94e9c 100644 --- a/test/gen_plist.c +++ b/test/gen_plist.c @@ -457,27 +457,27 @@ encode_plist(hid_t plist_id, int little_endian, int word_length, const char *fil /* Generate filename */ if ((ret = HDsnprintf(filename, sizeof(filename), "%s%d%s", filename_prefix, word_length, little_endian ? "le" : "be")) < 0) - HDassert(ret > 0); + assert(ret > 0); /* first call to encode returns only the size of the buffer needed */ if ((ret = H5Pencode2(plist_id, NULL, &temp_size, H5P_DEFAULT)) < 0) - HDassert(ret > 0); + assert(ret > 0); - temp_buf = (void *)HDmalloc(temp_size); - HDassert(temp_buf); + temp_buf = (void *)malloc(temp_size); + assert(temp_buf); if ((ret = H5Pencode2(plist_id, temp_buf, &temp_size, H5P_DEFAULT)) < 0) - HDassert(ret > 0); + assert(ret > 0); fd = HDopen(filename, O_RDWR | O_CREAT | O_TRUNC, H5_POSIX_CREATE_MODE_RW); - HDassert(fd >= 0); + assert(fd >= 0); write_size = HDwrite(fd, temp_buf, temp_size); - HDassert(write_size == (ssize_t)temp_size); + assert(write_size == (ssize_t)temp_size); HDclose(fd); - HDfree(temp_buf); + free(temp_buf); return 1; } diff --git a/test/genall5.c b/test/genall5.c index ea96d32..e8b7228 100644 --- a/test/genall5.c +++ b/test/genall5.c @@ -59,7 +59,7 @@ ns_grp_0(hid_t fid, const char *group_name) pass = FALSE; failure_mssg = "ns_grp_0: H5Pcreate() failed"; } - HDassert(gcpl > 0); + assert(gcpl > 0); } if (pass) { @@ -69,7 +69,7 @@ ns_grp_0(hid_t fid, const char *group_name) pass = FALSE; failure_mssg = "ns_grp_0: H5Pset_link_creation_order() failed"; } - HDassert(ret >= 0); + assert(ret >= 0); } if (pass) { @@ -79,7 +79,7 @@ ns_grp_0(hid_t fid, const char *group_name) pass = FALSE; failure_mssg = "ns_grp_0: H5Gcreate2() failed"; } - HDassert(gid > 0); + assert(gid > 0); } if (pass) { @@ -89,7 +89,7 @@ ns_grp_0(hid_t fid, const char *group_name) pass = FALSE; failure_mssg = "ns_grp_0: H5Pclose(gcpl) failed"; } - HDassert(ret >= 0); + assert(ret >= 0); } if (pass) { @@ -99,7 +99,7 @@ ns_grp_0(hid_t fid, const char *group_name) pass = FALSE; failure_mssg = "ns_grp_0: H5Gclose(gid) failed"; } - HDassert(ret >= 0); + assert(ret >= 0); } } /* ns_grp_0 */ @@ -139,7 +139,7 @@ vrfy_ns_grp_0(hid_t fid, const char *group_name) pass = FALSE; failure_mssg = "vrfy_ns_grp_0: H5Gopen2() failed"; } - HDassert(gid > 0); + assert(gid > 0); } if (pass) { @@ -149,7 +149,7 @@ vrfy_ns_grp_0(hid_t fid, const char *group_name) pass = FALSE; failure_mssg = "vrfy_ns_grp_0: H5Gget_create_plist() failed"; } - HDassert(gcpl > 0); + assert(gcpl > 0); } if (pass) { @@ -163,8 +163,8 @@ vrfy_ns_grp_0(hid_t fid, const char *group_name) pass = FALSE; failure_mssg = "vrfy_ns_grp_0: H5P_CRT_ORDER_TRACKED != crt_order_flags"; } - HDassert(ret >= 0); - HDassert(H5P_CRT_ORDER_TRACKED == crt_order_flags); + assert(ret >= 0); + assert(H5P_CRT_ORDER_TRACKED == crt_order_flags); } if (pass) { @@ -174,11 +174,11 @@ vrfy_ns_grp_0(hid_t fid, const char *group_name) pass = FALSE; failure_mssg = "vrfy_ns_grp_0: H5Pclose() failed"; } - HDassert(ret >= 0); + assert(ret >= 0); } if (pass) { - HDmemset(&grp_info, 0, sizeof(grp_info)); + memset(&grp_info, 0, sizeof(grp_info)); ret = H5Gget_info(gid, &grp_info); if (ret < 0) { @@ -202,11 +202,11 @@ vrfy_ns_grp_0(hid_t fid, const char *group_name) failure_mssg = "vrfy_ns_grp_0: FALSE != grp_info.mounted"; } - HDassert(ret >= 0); - HDassert(H5G_STORAGE_TYPE_COMPACT == grp_info.storage_type); - HDassert(0 == grp_info.nlinks); - HDassert(0 == grp_info.max_corder); - HDassert(FALSE == grp_info.mounted); + assert(ret >= 0); + assert(H5G_STORAGE_TYPE_COMPACT == grp_info.storage_type); + assert(0 == grp_info.nlinks); + assert(0 == grp_info.max_corder); + assert(FALSE == grp_info.mounted); } if (pass) { @@ -216,7 +216,7 @@ vrfy_ns_grp_0(hid_t fid, const char *group_name) pass = FALSE; failure_mssg = "vrfy_ns_grp_0: H5Gclose() failed"; } - HDassert(ret >= 0); + assert(ret >= 0); } } /* vrfy_ns_grp_0() */ @@ -256,7 +256,7 @@ ns_grp_c(hid_t fid, const char *group_name, unsigned nlinks) pass = FALSE; failure_mssg = "ns_grp_c: H5Pcreate(H5P_GROUP_CREATE) failed"; } - HDassert(gcpl > 0); + assert(gcpl > 0); } if (pass) { @@ -266,7 +266,7 @@ ns_grp_c(hid_t fid, const char *group_name, unsigned nlinks) pass = FALSE; failure_mssg = "ns_grp_c: H5Pset_link_creation_order() failed"; } - HDassert(ret >= 0); + assert(ret >= 0); } if (pass) { @@ -276,7 +276,7 @@ ns_grp_c(hid_t fid, const char *group_name, unsigned nlinks) pass = FALSE; failure_mssg = "ns_grp_c: H5Gcreate2() failed"; } - HDassert(gid > 0); + assert(gid > 0); } if (pass) { @@ -296,9 +296,9 @@ ns_grp_c(hid_t fid, const char *group_name, unsigned nlinks) failure_mssg = "ns_grp_c: nlinks >= max_compact"; } - HDassert(ret >= 0); - HDassert(nlinks > 0); - HDassert(nlinks < max_compact); + assert(ret >= 0); + assert(nlinks > 0); + assert(nlinks < max_compact); } u = 0; @@ -314,7 +314,7 @@ ns_grp_c(hid_t fid, const char *group_name, unsigned nlinks) pass = FALSE; failure_mssg = "ns_grp_c: H5Lcreate_soft() failed"; } - HDassert(ret >= 0); + assert(ret >= 0); } /* end if */ else if (1 == (u % 3)) { ret = H5Lcreate_hard(fid, "/", gid, linkname, H5P_DEFAULT, H5P_DEFAULT); @@ -323,17 +323,17 @@ ns_grp_c(hid_t fid, const char *group_name, unsigned nlinks) pass = FALSE; failure_mssg = "ns_grp_c: H5Lcreate_hard() failed"; } - HDassert(ret >= 0); + assert(ret >= 0); } /* end else-if */ else { - HDassert(2 == (u % 3)); + assert(2 == (u % 3)); ret = H5Lcreate_external("external.h5", "/ext", gid, linkname, H5P_DEFAULT, H5P_DEFAULT); if (ret < 0) { pass = FALSE; failure_mssg = "ns_grp_c: H5Lcreate_external() failed"; } - HDassert(ret >= 0); + assert(ret >= 0); } /* end else */ u++; @@ -346,7 +346,7 @@ ns_grp_c(hid_t fid, const char *group_name, unsigned nlinks) pass = FALSE; failure_mssg = "ns_grp_c: H5Pclose(gcpl) failed"; } - HDassert(ret >= 0); + assert(ret >= 0); } if (pass) { @@ -356,7 +356,7 @@ ns_grp_c(hid_t fid, const char *group_name, unsigned nlinks) pass = FALSE; failure_mssg = "ns_grp_c: H5Gclose(gid) failed"; } - HDassert(ret >= 0); + assert(ret >= 0); } } /* ns_grp_c() */ @@ -397,7 +397,7 @@ vrfy_ns_grp_c(hid_t fid, const char *group_name, unsigned nlinks) pass = FALSE; failure_mssg = "vrfy_ns_grp_c: H5Gopen2() failed"; } - HDassert(gid > 0); + assert(gid > 0); } if (pass) { @@ -407,7 +407,7 @@ vrfy_ns_grp_c(hid_t fid, const char *group_name, unsigned nlinks) pass = FALSE; failure_mssg = "vrfy_ns_grp_c: H5Gget_create_plist(gid) failed"; } - HDassert(gcpl > 0); + assert(gcpl > 0); } if (pass) { @@ -421,8 +421,8 @@ vrfy_ns_grp_c(hid_t fid, const char *group_name, unsigned nlinks) pass = FALSE; failure_mssg = "vrfy_ns_grp_c: H5P_CRT_ORDER_TRACKED != crt_order_flags"; } - HDassert(ret >= 0); - HDassert(H5P_CRT_ORDER_TRACKED == crt_order_flags); + assert(ret >= 0); + assert(H5P_CRT_ORDER_TRACKED == crt_order_flags); } if (pass) { @@ -432,11 +432,11 @@ vrfy_ns_grp_c(hid_t fid, const char *group_name, unsigned nlinks) pass = FALSE; failure_mssg = "vrfy_ns_grp_c: H5Pclose() failed"; } - HDassert(ret >= 0); + assert(ret >= 0); } if (pass) { - HDmemset(&grp_info, 0, sizeof(grp_info)); + memset(&grp_info, 0, sizeof(grp_info)); ret = H5Gget_info(gid, &grp_info); if (ret < 0) { @@ -460,11 +460,11 @@ vrfy_ns_grp_c(hid_t fid, const char *group_name, unsigned nlinks) failure_mssg = "vrfy_ns_grp_c: FALSE != grp_info.mounted"; } - HDassert(ret >= 0); - HDassert(H5G_STORAGE_TYPE_COMPACT == grp_info.storage_type); - HDassert(nlinks == grp_info.nlinks); - HDassert(nlinks == grp_info.max_corder); - HDassert(FALSE == grp_info.mounted); + assert(ret >= 0); + assert(H5G_STORAGE_TYPE_COMPACT == grp_info.storage_type); + assert(nlinks == grp_info.nlinks); + assert(nlinks == grp_info.max_corder); + assert(FALSE == grp_info.mounted); } u = 0; @@ -480,9 +480,9 @@ vrfy_ns_grp_c(hid_t fid, const char *group_name, unsigned nlinks) pass = FALSE; failure_mssg = "vrfy_ns_grp_c: H5Lexists() failed"; } - HDassert(link_exists >= 0); + assert(link_exists >= 0); - HDmemset(&lnk_info, 0, sizeof(grp_info)); + memset(&lnk_info, 0, sizeof(grp_info)); ret = H5Lget_info2(gid, linkname, &lnk_info, H5P_DEFAULT); if (ret < 0) { @@ -501,10 +501,10 @@ vrfy_ns_grp_c(hid_t fid, const char *group_name, unsigned nlinks) pass = FALSE; failure_mssg = "vrfy_ns_grp_c: H5T_CSET_ASCII != lnk_info.cset"; } - HDassert(ret >= 0); - HDassert(TRUE == lnk_info.corder_valid); - HDassert(u == lnk_info.corder); - HDassert(H5T_CSET_ASCII == lnk_info.cset); + assert(ret >= 0); + assert(TRUE == lnk_info.corder_valid); + assert(u == lnk_info.corder); + assert(H5T_CSET_ASCII == lnk_info.cset); if (0 == (u % 3)) { char *slinkval; @@ -517,16 +517,16 @@ vrfy_ns_grp_c(hid_t fid, const char *group_name, unsigned nlinks) pass = FALSE; failure_mssg = "vrfy_ns_grp_c: (HDstrlen(group_name) + 1) != lnk_info.u.val_size"; } - HDassert(H5L_TYPE_SOFT == lnk_info.type); - HDassert((HDstrlen(group_name) + 1) == lnk_info.u.val_size); + assert(H5L_TYPE_SOFT == lnk_info.type); + assert((HDstrlen(group_name) + 1) == lnk_info.u.val_size); - slinkval = (char *)HDmalloc(lnk_info.u.val_size); + slinkval = (char *)malloc(lnk_info.u.val_size); if (!slinkval) { pass = FALSE; - failure_mssg = "vrfy_ns_grp_c: HDmalloc of slinkval failed"; + failure_mssg = "vrfy_ns_grp_c: malloc of slinkval failed"; } - HDassert(slinkval); + assert(slinkval); ret = H5Lget_val(gid, linkname, slinkval, lnk_info.u.val_size, H5P_DEFAULT); if (ret < 0) { @@ -537,10 +537,10 @@ vrfy_ns_grp_c(hid_t fid, const char *group_name, unsigned nlinks) pass = FALSE; failure_mssg = "vrfy_ns_grp_c: 0 != HDstrcmp(slinkval, group_name)"; } - HDassert(ret >= 0); - HDassert(0 == HDstrcmp(slinkval, group_name)); + assert(ret >= 0); + assert(0 == HDstrcmp(slinkval, group_name)); - HDfree(slinkval); + free(slinkval); } /* end if */ else if (1 == (u % 3)) { H5O_info2_t root_oinfo; @@ -550,9 +550,9 @@ vrfy_ns_grp_c(hid_t fid, const char *group_name, unsigned nlinks) pass = FALSE; failure_mssg = "vrfy_ns_grp_c: H5L_TYPE_HARD != lnk_info.type"; } - HDassert(H5L_TYPE_HARD == lnk_info.type); + assert(H5L_TYPE_HARD == lnk_info.type); - HDmemset(&root_oinfo, 0, sizeof(root_oinfo)); + memset(&root_oinfo, 0, sizeof(root_oinfo)); ret = H5Oget_info3(fid, &root_oinfo, H5O_INFO_BASIC); if (ret < 0) { @@ -570,36 +570,36 @@ vrfy_ns_grp_c(hid_t fid, const char *group_name, unsigned nlinks) failure_mssg = "vrfy_ns_grp_c: root_oinfo.token != lnk_info.u.token"; } } - HDassert(ret >= 0); - HDassert(!token_cmp); + assert(ret >= 0); + assert(!token_cmp); } /* end else-if */ else { void *elinkval; const char *file = NULL; const char *path = NULL; - HDassert(2 == (u % 3)); + assert(2 == (u % 3)); if (H5L_TYPE_EXTERNAL != lnk_info.type) { pass = FALSE; failure_mssg = "vrfy_ns_grp_c: H5L_TYPE_EXTERNAL != lnk_info.type"; } - HDassert(H5L_TYPE_EXTERNAL == lnk_info.type); + assert(H5L_TYPE_EXTERNAL == lnk_info.type); - elinkval = HDmalloc(lnk_info.u.val_size); + elinkval = malloc(lnk_info.u.val_size); if (!elinkval) { pass = FALSE; - failure_mssg = "vrfy_ns_grp_c: HDmalloc of elinkval failed."; + failure_mssg = "vrfy_ns_grp_c: malloc of elinkval failed."; } - HDassert(elinkval); + assert(elinkval); ret = H5Lget_val(gid, linkname, elinkval, lnk_info.u.val_size, H5P_DEFAULT); if (ret < 0) { pass = FALSE; failure_mssg = "vrfy_ns_grp_c: H5Lget_val() failed."; } - HDassert(ret >= 0); + assert(ret >= 0); ret = H5Lunpack_elink_val(elinkval, lnk_info.u.val_size, NULL, &file, &path); if (ret < 0) { @@ -614,11 +614,11 @@ vrfy_ns_grp_c(hid_t fid, const char *group_name, unsigned nlinks) pass = FALSE; failure_mssg = "vrfy_ns_grp_c: 0 != HDstrcmp(path, \"/ext\")"; } - HDassert(ret >= 0); - HDassert(0 == HDstrcmp(file, "external.h5")); - HDassert(0 == HDstrcmp(path, "/ext")); + assert(ret >= 0); + assert(0 == HDstrcmp(file, "external.h5")); + assert(0 == HDstrcmp(path, "/ext")); - HDfree(elinkval); + free(elinkval); } /* end else */ u++; @@ -631,7 +631,7 @@ vrfy_ns_grp_c(hid_t fid, const char *group_name, unsigned nlinks) pass = FALSE; failure_mssg = "vrfy_ns_grp_c: H5Gclose() failed."; } - HDassert(ret >= 0); + assert(ret >= 0); } } /* vrfy_ns_grp_c() */ @@ -671,7 +671,7 @@ ns_grp_d(hid_t fid, const char *group_name, unsigned nlinks) pass = FALSE; failure_mssg = "ns_grp_d: H5Pcreate() failed."; } - HDassert(gcpl > 0); + assert(gcpl > 0); } if (pass) { @@ -681,7 +681,7 @@ ns_grp_d(hid_t fid, const char *group_name, unsigned nlinks) pass = FALSE; failure_mssg = "ns_grp_d: H5Pset_link_creation_order() failed."; } - HDassert(ret >= 0); + assert(ret >= 0); } if (pass) { @@ -691,7 +691,7 @@ ns_grp_d(hid_t fid, const char *group_name, unsigned nlinks) pass = FALSE; failure_mssg = "ns_grp_d: H5Gcreate2() failed."; } - HDassert(gid > 0); + assert(gid > 0); } if (pass) { @@ -706,8 +706,8 @@ ns_grp_d(hid_t fid, const char *group_name, unsigned nlinks) pass = FALSE; failure_mssg = "ns_grp_d: nlinks <= max_compact"; } - HDassert(ret >= 0); - HDassert(nlinks > max_compact); + assert(ret >= 0); + assert(nlinks > max_compact); } u = 0; @@ -723,7 +723,7 @@ ns_grp_d(hid_t fid, const char *group_name, unsigned nlinks) pass = FALSE; failure_mssg = "ns_grp_d: H5Lcreate_soft() failed."; } - HDassert(ret >= 0); + assert(ret >= 0); } /* end if */ else if (1 == (u % 3)) { ret = H5Lcreate_hard(fid, "/", gid, linkname, H5P_DEFAULT, H5P_DEFAULT); @@ -732,10 +732,10 @@ ns_grp_d(hid_t fid, const char *group_name, unsigned nlinks) pass = FALSE; failure_mssg = "ns_grp_d: H5Lcreate_hard() failed."; } - HDassert(ret >= 0); + assert(ret >= 0); } /* end else-if */ else { - HDassert(2 == (u % 3)); + assert(2 == (u % 3)); ret = H5Lcreate_external("external.h5", "/ext", gid, linkname, H5P_DEFAULT, H5P_DEFAULT); @@ -743,7 +743,7 @@ ns_grp_d(hid_t fid, const char *group_name, unsigned nlinks) pass = FALSE; failure_mssg = "ns_grp_d: H5Lcreate_external() failed."; } - HDassert(ret >= 0); + assert(ret >= 0); } /* end else */ u++; @@ -756,7 +756,7 @@ ns_grp_d(hid_t fid, const char *group_name, unsigned nlinks) pass = FALSE; failure_mssg = "ns_grp_d: H5Pclose() failed."; } - HDassert(ret >= 0); + assert(ret >= 0); } if (pass) { @@ -766,7 +766,7 @@ ns_grp_d(hid_t fid, const char *group_name, unsigned nlinks) pass = FALSE; failure_mssg = "ns_grp_d: H5Gclose() failed."; } - HDassert(ret >= 0); + assert(ret >= 0); } } /* ns_grp_d() */ @@ -807,7 +807,7 @@ vrfy_ns_grp_d(hid_t fid, const char *group_name, unsigned nlinks) pass = FALSE; failure_mssg = "vrfy_ns_grp_d: H5Gopen2() failed."; } - HDassert(gid > 0); + assert(gid > 0); } if (pass) { @@ -817,7 +817,7 @@ vrfy_ns_grp_d(hid_t fid, const char *group_name, unsigned nlinks) pass = FALSE; failure_mssg = "vrfy_ns_grp_d: H5Gget_create_plist() failed."; } - HDassert(gcpl > 0); + assert(gcpl > 0); } if (pass) { @@ -831,8 +831,8 @@ vrfy_ns_grp_d(hid_t fid, const char *group_name, unsigned nlinks) pass = FALSE; failure_mssg = "vrfy_ns_grp_d: H5P_CRT_ORDER_TRACKED != crt_order_flags"; } - HDassert(ret >= 0); - HDassert(H5P_CRT_ORDER_TRACKED == crt_order_flags); + assert(ret >= 0); + assert(H5P_CRT_ORDER_TRACKED == crt_order_flags); } if (pass) { @@ -842,11 +842,11 @@ vrfy_ns_grp_d(hid_t fid, const char *group_name, unsigned nlinks) pass = FALSE; failure_mssg = "vrfy_ns_grp_d: H5Pclose() failed."; } - HDassert(ret >= 0); + assert(ret >= 0); } if (pass) { - HDmemset(&grp_info, 0, sizeof(grp_info)); + memset(&grp_info, 0, sizeof(grp_info)); ret = H5Gget_info(gid, &grp_info); if (ret < 0) { @@ -869,11 +869,11 @@ vrfy_ns_grp_d(hid_t fid, const char *group_name, unsigned nlinks) pass = FALSE; failure_mssg = "vrfy_ns_grp_d: FALSE != grp_info.mounted"; } - HDassert(ret >= 0); - HDassert(H5G_STORAGE_TYPE_DENSE == grp_info.storage_type); - HDassert(nlinks == grp_info.nlinks); - HDassert(nlinks == grp_info.max_corder); - HDassert(FALSE == grp_info.mounted); + assert(ret >= 0); + assert(H5G_STORAGE_TYPE_DENSE == grp_info.storage_type); + assert(nlinks == grp_info.nlinks); + assert(nlinks == grp_info.max_corder); + assert(FALSE == grp_info.mounted); } u = 0; @@ -889,9 +889,9 @@ vrfy_ns_grp_d(hid_t fid, const char *group_name, unsigned nlinks) pass = FALSE; failure_mssg = "vrfy_ns_grp_d: H5Lexists() failed."; } - HDassert(link_exists >= 0); + assert(link_exists >= 0); - HDmemset(&lnk_info, 0, sizeof(grp_info)); + memset(&lnk_info, 0, sizeof(grp_info)); ret = H5Lget_info2(gid, linkname, &lnk_info, H5P_DEFAULT); if (ret < 0) { @@ -910,10 +910,10 @@ vrfy_ns_grp_d(hid_t fid, const char *group_name, unsigned nlinks) pass = FALSE; failure_mssg = "vrfy_ns_grp_d: H5T_CSET_ASCII != lnk_info.cset"; } - HDassert(ret >= 0); - HDassert(TRUE == lnk_info.corder_valid); - HDassert(u == lnk_info.corder); - HDassert(H5T_CSET_ASCII == lnk_info.cset); + assert(ret >= 0); + assert(TRUE == lnk_info.corder_valid); + assert(u == lnk_info.corder); + assert(H5T_CSET_ASCII == lnk_info.cset); if (0 == (u % 3)) { char *slinkval; @@ -926,16 +926,16 @@ vrfy_ns_grp_d(hid_t fid, const char *group_name, unsigned nlinks) pass = FALSE; failure_mssg = "vrfy_ns_grp_d: H5L_TYPE_SOFT != lnk_info.type"; } - HDassert(H5L_TYPE_SOFT == lnk_info.type); - HDassert((HDstrlen(group_name) + 1) == lnk_info.u.val_size); + assert(H5L_TYPE_SOFT == lnk_info.type); + assert((HDstrlen(group_name) + 1) == lnk_info.u.val_size); - slinkval = (char *)HDmalloc(lnk_info.u.val_size); + slinkval = (char *)malloc(lnk_info.u.val_size); if (!slinkval) { pass = FALSE; - failure_mssg = "vrfy_ns_grp_d: HDmalloc of slinkval failed"; + failure_mssg = "vrfy_ns_grp_d: malloc of slinkval failed"; } - HDassert(slinkval); + assert(slinkval); ret = H5Lget_val(gid, linkname, slinkval, lnk_info.u.val_size, H5P_DEFAULT); if (ret < 0) { @@ -946,10 +946,10 @@ vrfy_ns_grp_d(hid_t fid, const char *group_name, unsigned nlinks) pass = FALSE; failure_mssg = "vrfy_ns_grp_d: 0 != HDstrcmp(slinkval, group_name)"; } - HDassert(ret >= 0); - HDassert(0 == HDstrcmp(slinkval, group_name)); + assert(ret >= 0); + assert(0 == HDstrcmp(slinkval, group_name)); - HDfree(slinkval); + free(slinkval); } /* end if */ else if (1 == (u % 3)) { H5O_info2_t root_oinfo; @@ -959,9 +959,9 @@ vrfy_ns_grp_d(hid_t fid, const char *group_name, unsigned nlinks) pass = FALSE; failure_mssg = "vrfy_ns_grp_d: H5L_TYPE_HARD != lnk_info.type"; } - HDassert(H5L_TYPE_HARD == lnk_info.type); + assert(H5L_TYPE_HARD == lnk_info.type); - HDmemset(&root_oinfo, 0, sizeof(root_oinfo)); + memset(&root_oinfo, 0, sizeof(root_oinfo)); ret = H5Oget_info3(fid, &root_oinfo, H5O_INFO_BASIC); if (ret < 0) { pass = FALSE; @@ -978,36 +978,36 @@ vrfy_ns_grp_d(hid_t fid, const char *group_name, unsigned nlinks) failure_mssg = "vrfy_ns_grp_d: root_oinfo.token != lnk_info.u.token"; } } - HDassert(ret >= 0); - HDassert(!token_cmp); + assert(ret >= 0); + assert(!token_cmp); } /* end else-if */ else { void *elinkval; const char *file = NULL; const char *path = NULL; - HDassert(2 == (u % 3)); + assert(2 == (u % 3)); if (H5L_TYPE_EXTERNAL != lnk_info.type) { pass = FALSE; failure_mssg = "vrfy_ns_grp_d: H5L_TYPE_EXTERNAL != lnk_info.type"; } - HDassert(H5L_TYPE_EXTERNAL == lnk_info.type); + assert(H5L_TYPE_EXTERNAL == lnk_info.type); - elinkval = HDmalloc(lnk_info.u.val_size); + elinkval = malloc(lnk_info.u.val_size); if (!elinkval) { pass = FALSE; - failure_mssg = "vrfy_ns_grp_d: HDmalloc of elinkval failed."; + failure_mssg = "vrfy_ns_grp_d: malloc of elinkval failed."; } - HDassert(elinkval); + assert(elinkval); ret = H5Lget_val(gid, linkname, elinkval, lnk_info.u.val_size, H5P_DEFAULT); if (ret < 0) { pass = FALSE; failure_mssg = "vrfy_ns_grp_d: H5Lget_val failed."; } - HDassert(ret >= 0); + assert(ret >= 0); ret = H5Lunpack_elink_val(elinkval, lnk_info.u.val_size, NULL, &file, &path); if (ret < 0) { @@ -1022,11 +1022,11 @@ vrfy_ns_grp_d(hid_t fid, const char *group_name, unsigned nlinks) pass = FALSE; failure_mssg = "vrfy_ns_grp_d: 0 != HDstrcmp(path, \"/ext\")"; } - HDassert(ret >= 0); - HDassert(0 == HDstrcmp(file, "external.h5")); - HDassert(0 == HDstrcmp(path, "/ext")); + assert(ret >= 0); + assert(0 == HDstrcmp(file, "external.h5")); + assert(0 == HDstrcmp(path, "/ext")); - HDfree(elinkval); + free(elinkval); } /* end else */ u++; @@ -1039,7 +1039,7 @@ vrfy_ns_grp_d(hid_t fid, const char *group_name, unsigned nlinks) pass = FALSE; failure_mssg = "vrfy_ns_grp_d: H5Gclose() failed."; } - HDassert(ret >= 0); + assert(ret >= 0); } } /* vrfy_ns_grp_d() */ @@ -1077,7 +1077,7 @@ os_grp_0(hid_t fid, const char *group_name) pass = FALSE; failure_mssg = "os_grp_0: H5Fget_access_plist() failed."; } - HDassert(fapl > 0); + assert(fapl > 0); } if (pass) { /* get low and high bounds from fapl */ @@ -1086,7 +1086,7 @@ os_grp_0(hid_t fid, const char *group_name) pass = FALSE; failure_mssg = "os_grp_0: H5Pget_libver_bounds() failed(1)."; } - HDassert(ret >= 0); + assert(ret >= 0); } if (pass) { /* turn file format latest off */ @@ -1096,7 +1096,7 @@ os_grp_0(hid_t fid, const char *group_name) pass = FALSE; failure_mssg = "os_grp_0: H5Fset_libver_bounds() failed(1)."; } - HDassert(ret >= 0); + assert(ret >= 0); } } @@ -1106,7 +1106,7 @@ os_grp_0(hid_t fid, const char *group_name) pass = FALSE; failure_mssg = "os_grp_0: H5Gcreate2() failed."; } - HDassert(gid > 0); + assert(gid > 0); } if (pass) { @@ -1116,7 +1116,7 @@ os_grp_0(hid_t fid, const char *group_name) pass = FALSE; failure_mssg = "os_grp_0: H5Gclose() failed."; } - HDassert(ret >= 0); + assert(ret >= 0); } if (pass) { /* restore low and high bounds */ @@ -1126,7 +1126,7 @@ os_grp_0(hid_t fid, const char *group_name) pass = FALSE; failure_mssg = "os_grp_0: H5Fset_libver_bounds() failed(1)."; } - HDassert(ret >= 0); + assert(ret >= 0); } } @@ -1166,7 +1166,7 @@ vrfy_os_grp_0(hid_t fid, const char *group_name) pass = FALSE; failure_mssg = "vrfy_os_grp_0: H5Gopen2() failed."; } - HDassert(gid > 0); + assert(gid > 0); } if (pass) { @@ -1176,7 +1176,7 @@ vrfy_os_grp_0(hid_t fid, const char *group_name) pass = FALSE; failure_mssg = "vrfy_os_grp_0: H5Gget_create_plist() failed."; } - HDassert(gcpl > 0); + assert(gcpl > 0); } if (pass) { @@ -1191,8 +1191,8 @@ vrfy_os_grp_0(hid_t fid, const char *group_name) pass = FALSE; failure_mssg = "vrfy_os_grp_0: 0 != crt_order_flags"; } - HDassert(ret >= 0); - HDassert(0 == crt_order_flags); + assert(ret >= 0); + assert(0 == crt_order_flags); } if (pass) { @@ -1202,11 +1202,11 @@ vrfy_os_grp_0(hid_t fid, const char *group_name) pass = FALSE; failure_mssg = "vrfy_os_grp_0: H5Pclose() failed."; } - HDassert(ret >= 0); + assert(ret >= 0); } if (pass) { - HDmemset(&grp_info, 0, sizeof(grp_info)); + memset(&grp_info, 0, sizeof(grp_info)); ret = H5Gget_info(gid, &grp_info); if (ret < 0) { @@ -1229,11 +1229,11 @@ vrfy_os_grp_0(hid_t fid, const char *group_name) pass = FALSE; failure_mssg = "vrfy_os_grp_0: FALSE != grp_info.mounted"; } - HDassert(ret >= 0); - HDassert(H5G_STORAGE_TYPE_SYMBOL_TABLE == grp_info.storage_type); - HDassert(0 == grp_info.nlinks); - HDassert(0 == grp_info.max_corder); - HDassert(FALSE == grp_info.mounted); + assert(ret >= 0); + assert(H5G_STORAGE_TYPE_SYMBOL_TABLE == grp_info.storage_type); + assert(0 == grp_info.nlinks); + assert(0 == grp_info.max_corder); + assert(FALSE == grp_info.mounted); } if (pass) { @@ -1243,7 +1243,7 @@ vrfy_os_grp_0(hid_t fid, const char *group_name) pass = FALSE; failure_mssg = "vrfy_os_grp_0: H5Gclose() failed."; } - HDassert(ret >= 0); + assert(ret >= 0); } } /* vrfy_os_grp_0() */ @@ -1282,7 +1282,7 @@ os_grp_n(hid_t fid, const char *group_name, int proc_num, unsigned nlinks) pass = FALSE; failure_mssg = "os_grp_n: H5Fget_access_plist() failed."; } - HDassert(fapl > 0); + assert(fapl > 0); } if (pass) { /* get low and high bounds from fapl */ @@ -1291,7 +1291,7 @@ os_grp_n(hid_t fid, const char *group_name, int proc_num, unsigned nlinks) pass = FALSE; failure_mssg = "os_grp_0: H5Pget_libver_bounds() failed(1)."; } - HDassert(ret >= 0); + assert(ret >= 0); } if (pass) { /* turn file format latest off */ @@ -1301,7 +1301,7 @@ os_grp_n(hid_t fid, const char *group_name, int proc_num, unsigned nlinks) pass = FALSE; failure_mssg = "os_grp_0: H5Fset_libver_bounds() failed(1)."; } - HDassert(ret >= 0); + assert(ret >= 0); } } @@ -1311,10 +1311,10 @@ os_grp_n(hid_t fid, const char *group_name, int proc_num, unsigned nlinks) pass = FALSE; failure_mssg = "os_grp_n: H5Gcreate2() failed."; } - HDassert(gid > 0); + assert(gid > 0); } - HDassert(nlinks > 0); + assert(nlinks > 0); u = 0; while ((pass) && (u < nlinks)) { @@ -1328,17 +1328,17 @@ os_grp_n(hid_t fid, const char *group_name, int proc_num, unsigned nlinks) pass = FALSE; failure_mssg = "os_grp_n: H5Lcreate_soft() failed."; } - HDassert(ret >= 0); + assert(ret >= 0); } /* end if */ else { - HDassert(1 == (u % 2)); + assert(1 == (u % 2)); ret = H5Lcreate_hard(fid, "/", gid, linkname, H5P_DEFAULT, H5P_DEFAULT); if (ret < 0) { pass = FALSE; failure_mssg = "os_grp_n: H5Lcreate_hard() failed."; } - HDassert(ret >= 0); + assert(ret >= 0); } /* end else */ u++; @@ -1351,7 +1351,7 @@ os_grp_n(hid_t fid, const char *group_name, int proc_num, unsigned nlinks) pass = FALSE; failure_mssg = "os_grp_n: H5Gclose() failed."; } - HDassert(ret >= 0); + assert(ret >= 0); } if (pass) { /* restore low and high bounds */ @@ -1361,7 +1361,7 @@ os_grp_n(hid_t fid, const char *group_name, int proc_num, unsigned nlinks) pass = FALSE; failure_mssg = "os_grp_n: H5Fset_libver_bounds() failed(2)."; } - HDassert(ret >= 0); + assert(ret >= 0); } } @@ -1402,7 +1402,7 @@ vrfy_os_grp_n(hid_t fid, const char *group_name, int proc_num, unsigned nlinks) pass = FALSE; failure_mssg = "vrfy_os_grp_n: H5Gopen2() failed"; } - HDassert(gid > 0); + assert(gid > 0); } if (pass) { @@ -1412,7 +1412,7 @@ vrfy_os_grp_n(hid_t fid, const char *group_name, int proc_num, unsigned nlinks) pass = FALSE; failure_mssg = "vrfy_os_grp_n: H5Gget_create_plist() failed"; } - HDassert(gcpl > 0); + assert(gcpl > 0); } if (pass) { @@ -1426,8 +1426,8 @@ vrfy_os_grp_n(hid_t fid, const char *group_name, int proc_num, unsigned nlinks) pass = FALSE; failure_mssg = "vrfy_os_grp_n: 0 != crt_order_flags"; } - HDassert(ret >= 0); - HDassert(0 == crt_order_flags); + assert(ret >= 0); + assert(0 == crt_order_flags); } if (pass) { @@ -1437,11 +1437,11 @@ vrfy_os_grp_n(hid_t fid, const char *group_name, int proc_num, unsigned nlinks) pass = FALSE; failure_mssg = "vrfy_os_grp_n: H5Pclose() failed"; } - HDassert(ret >= 0); + assert(ret >= 0); } if (pass) { - HDmemset(&grp_info, 0, sizeof(grp_info)); + memset(&grp_info, 0, sizeof(grp_info)); ret = H5Gget_info(gid, &grp_info); @@ -1465,11 +1465,11 @@ vrfy_os_grp_n(hid_t fid, const char *group_name, int proc_num, unsigned nlinks) pass = FALSE; failure_mssg = "vrfy_os_grp_n: FALSE != grp_info.mounted"; } - HDassert(ret >= 0); - HDassert(H5G_STORAGE_TYPE_SYMBOL_TABLE == grp_info.storage_type); - HDassert(nlinks == grp_info.nlinks); - HDassert(0 == grp_info.max_corder); - HDassert(FALSE == grp_info.mounted); + assert(ret >= 0); + assert(H5G_STORAGE_TYPE_SYMBOL_TABLE == grp_info.storage_type); + assert(nlinks == grp_info.nlinks); + assert(0 == grp_info.max_corder); + assert(FALSE == grp_info.mounted); } u = 0; @@ -1485,9 +1485,9 @@ vrfy_os_grp_n(hid_t fid, const char *group_name, int proc_num, unsigned nlinks) pass = FALSE; failure_mssg = "vrfy_os_grp_n: H5Lexists() failed"; } - HDassert(link_exists >= 0); + assert(link_exists >= 0); - HDmemset(&lnk_info, 0, sizeof(grp_info)); + memset(&lnk_info, 0, sizeof(grp_info)); ret = H5Lget_info2(gid, linkname, &lnk_info, H5P_DEFAULT); if (ret < 0) { @@ -1502,9 +1502,9 @@ vrfy_os_grp_n(hid_t fid, const char *group_name, int proc_num, unsigned nlinks) pass = FALSE; failure_mssg = "vrfy_os_grp_n: H5T_CSET_ASCII != lnk_info.cset"; } - HDassert(ret >= 0); - HDassert(FALSE == lnk_info.corder_valid); - HDassert(H5T_CSET_ASCII == lnk_info.cset); + assert(ret >= 0); + assert(FALSE == lnk_info.corder_valid); + assert(H5T_CSET_ASCII == lnk_info.cset); if (0 == (u % 2)) { char *slinkval; @@ -1517,16 +1517,16 @@ vrfy_os_grp_n(hid_t fid, const char *group_name, int proc_num, unsigned nlinks) pass = FALSE; failure_mssg = "vrfy_os_grp_n: (HDstrlen(group_name) + 1) != lnk_info.u.val_size"; } - HDassert(H5L_TYPE_SOFT == lnk_info.type); - HDassert((HDstrlen(group_name) + 1) == lnk_info.u.val_size); + assert(H5L_TYPE_SOFT == lnk_info.type); + assert((HDstrlen(group_name) + 1) == lnk_info.u.val_size); - slinkval = (char *)HDmalloc(lnk_info.u.val_size); + slinkval = (char *)malloc(lnk_info.u.val_size); if (!slinkval) { pass = FALSE; - failure_mssg = "vrfy_os_grp_n: HDmalloc of slinkval failed"; + failure_mssg = "vrfy_os_grp_n: malloc of slinkval failed"; } - HDassert(slinkval); + assert(slinkval); ret = H5Lget_val(gid, linkname, slinkval, lnk_info.u.val_size, H5P_DEFAULT); @@ -1538,24 +1538,24 @@ vrfy_os_grp_n(hid_t fid, const char *group_name, int proc_num, unsigned nlinks) pass = FALSE; failure_mssg = "vrfy_os_grp_n: 0 != HDstrcmp(slinkval, group_name)"; } - HDassert(ret >= 0); - HDassert(0 == HDstrcmp(slinkval, group_name)); + assert(ret >= 0); + assert(0 == HDstrcmp(slinkval, group_name)); - HDfree(slinkval); + free(slinkval); } /* end if */ else { H5O_info2_t root_oinfo; int token_cmp = 0; - HDassert(1 == (u % 2)); + assert(1 == (u % 2)); if (H5L_TYPE_HARD != lnk_info.type) { pass = FALSE; failure_mssg = "vrfy_os_grp_n: H5L_TYPE_HARD != lnk_info.type"; } - HDassert(H5L_TYPE_HARD == lnk_info.type); + assert(H5L_TYPE_HARD == lnk_info.type); - HDmemset(&root_oinfo, 0, sizeof(root_oinfo)); + memset(&root_oinfo, 0, sizeof(root_oinfo)); ret = H5Oget_info3(fid, &root_oinfo, H5O_INFO_BASIC); if (ret < 0) { @@ -1573,8 +1573,8 @@ vrfy_os_grp_n(hid_t fid, const char *group_name, int proc_num, unsigned nlinks) failure_mssg = "vrfy_os_grp_n: root_oinfo.token != lnk_info.u.token"; } } - HDassert(ret >= 0); - HDassert(!token_cmp); + assert(ret >= 0); + assert(!token_cmp); } /* end else */ u++; @@ -1587,7 +1587,7 @@ vrfy_os_grp_n(hid_t fid, const char *group_name, int proc_num, unsigned nlinks) pass = FALSE; failure_mssg = "vrfy_os_grp_n: H5Gclose() failed."; } - HDassert(ret >= 0); + assert(ret >= 0); } } /* vrfy_os_grp_n() */ @@ -1628,7 +1628,7 @@ ds_ctg_i(hid_t fid, const char *dset_name, hbool_t write_data) pass = FALSE; failure_mssg = "ds_ctg_i: H5Screate_simple() failed"; } - HDassert(sid > 0); + assert(sid > 0); } if (pass) { @@ -1638,7 +1638,7 @@ ds_ctg_i(hid_t fid, const char *dset_name, hbool_t write_data) pass = FALSE; failure_mssg = "ds_ctg_i: H5Dcreate2() failed"; } - HDassert(dsid > 0); + assert(dsid > 0); } if (pass) { @@ -1648,17 +1648,17 @@ ds_ctg_i(hid_t fid, const char *dset_name, hbool_t write_data) pass = FALSE; failure_mssg = "ds_ctg_i: H5Sclose() failed"; } - HDassert(ret >= 0); + assert(ret >= 0); } if ((pass) && (write_data)) { - wdata = (int *)HDmalloc(sizeof(int) * DSET_DIMS); + wdata = (int *)malloc(sizeof(int) * DSET_DIMS); if (!wdata) { pass = FALSE; - failure_mssg = "ds_ctg_i: HDmalloc of wdata failed."; + failure_mssg = "ds_ctg_i: malloc of wdata failed."; } - HDassert(wdata); + assert(wdata); } if ((pass) && (write_data)) { @@ -1671,10 +1671,10 @@ ds_ctg_i(hid_t fid, const char *dset_name, hbool_t write_data) pass = FALSE; failure_mssg = "ds_ctg_i: H5Dwrite() failed."; } - HDassert(ret >= 0); + assert(ret >= 0); } - HDfree(wdata); + free(wdata); if (pass) { ret = H5Dclose(dsid); @@ -1683,7 +1683,7 @@ ds_ctg_i(hid_t fid, const char *dset_name, hbool_t write_data) pass = FALSE; failure_mssg = "ds_ctg_i: H5Dclose() failed"; } - HDassert(ret >= 0); + assert(ret >= 0); } } /* ds_ctg_i */ @@ -1729,7 +1729,7 @@ vrfy_ds_ctg_i(hid_t fid, const char *dset_name, hbool_t write_data) pass = FALSE; failure_mssg = "vrfy_ds_ctg_i: H5Dopen2() failed."; } - HDassert(dsid > 0); + assert(dsid > 0); } if (pass) { @@ -1739,7 +1739,7 @@ vrfy_ds_ctg_i(hid_t fid, const char *dset_name, hbool_t write_data) pass = FALSE; failure_mssg = "vrfy_ds_ctg_i: H5Dget_space() failed."; } - HDassert(sid > 0); + assert(sid > 0); } if (pass) { @@ -1749,7 +1749,7 @@ vrfy_ds_ctg_i(hid_t fid, const char *dset_name, hbool_t write_data) pass = FALSE; failure_mssg = "vrfy_ds_ctg_i: 1 != ndims"; } - HDassert(1 == ndims); + assert(1 == ndims); } if (pass) { @@ -1767,9 +1767,9 @@ vrfy_ds_ctg_i(hid_t fid, const char *dset_name, hbool_t write_data) pass = FALSE; failure_mssg = "vrfy_ds_ctg_i: DSET_DIMS != max_dims[0]"; } - HDassert(ret >= 0); - HDassert(DSET_DIMS == dims[0]); - HDassert(DSET_DIMS == max_dims[0]); + assert(ret >= 0); + assert(DSET_DIMS == dims[0]); + assert(DSET_DIMS == max_dims[0]); } if (pass) { @@ -1779,7 +1779,7 @@ vrfy_ds_ctg_i(hid_t fid, const char *dset_name, hbool_t write_data) pass = FALSE; failure_mssg = "vrfy_ds_ctg_i: H5Sclose() failed."; } - HDassert(ret >= 0); + assert(ret >= 0); } if (pass) { @@ -1789,7 +1789,7 @@ vrfy_ds_ctg_i(hid_t fid, const char *dset_name, hbool_t write_data) pass = FALSE; failure_mssg = "vrfy_ds_ctg_i: H5Dget_type() failed."; } - HDassert(tid > 0); + assert(tid > 0); } if (pass) { @@ -1799,7 +1799,7 @@ vrfy_ds_ctg_i(hid_t fid, const char *dset_name, hbool_t write_data) pass = FALSE; failure_mssg = "vrfy_ds_ctg_i: type not H5T_NATIVE_INT"; } - HDassert(1 == type_equal); + assert(1 == type_equal); } if (pass) { @@ -1809,7 +1809,7 @@ vrfy_ds_ctg_i(hid_t fid, const char *dset_name, hbool_t write_data) pass = FALSE; failure_mssg = "vrfy_ds_ctg_i: H5Tclose() failed."; } - HDassert(ret >= 0); + assert(ret >= 0); } if (pass) { @@ -1827,9 +1827,9 @@ vrfy_ds_ctg_i(hid_t fid, const char *dset_name, hbool_t write_data) pass = FALSE; failure_mssg = "vrfy_ds_ctg_i: !write_data && allocation != H5D_SPACE_STATUS_NOT_ALLOCATED"; } - HDassert(ret >= 0); - HDassert((write_data && allocation == H5D_SPACE_STATUS_ALLOCATED) || - (!write_data && allocation == H5D_SPACE_STATUS_NOT_ALLOCATED)); + assert(ret >= 0); + assert((write_data && allocation == H5D_SPACE_STATUS_ALLOCATED) || + (!write_data && allocation == H5D_SPACE_STATUS_NOT_ALLOCATED)); } if (pass) { @@ -1839,7 +1839,7 @@ vrfy_ds_ctg_i(hid_t fid, const char *dset_name, hbool_t write_data) pass = FALSE; failure_mssg = "vrfy_ds_ctg_i: H5Dget_create_plist() failed."; } - HDassert(dcpl > 0); + assert(dcpl > 0); } if (pass) { @@ -1849,7 +1849,7 @@ vrfy_ds_ctg_i(hid_t fid, const char *dset_name, hbool_t write_data) pass = FALSE; failure_mssg = "vrfy_ds_ctg_i: H5D_CONTIGUOUS != layout"; } - HDassert(H5D_CONTIGUOUS == layout); + assert(H5D_CONTIGUOUS == layout); } if (pass) { @@ -1859,17 +1859,17 @@ vrfy_ds_ctg_i(hid_t fid, const char *dset_name, hbool_t write_data) pass = FALSE; failure_mssg = "vrfy_ds_ctg_i: H5Pclose() failed."; } - HDassert(ret >= 0); + assert(ret >= 0); } if ((pass) && (write_data)) { - rdata = (int *)HDmalloc(sizeof(int) * DSET_DIMS); + rdata = (int *)malloc(sizeof(int) * DSET_DIMS); if (!rdata) { pass = FALSE; - failure_mssg = "vrfy_ds_ctg_i: HDmalloc of rdata failed."; + failure_mssg = "vrfy_ds_ctg_i: malloc of rdata failed."; } - HDassert(rdata); + assert(rdata); } if ((pass) && (write_data)) { @@ -1878,7 +1878,7 @@ vrfy_ds_ctg_i(hid_t fid, const char *dset_name, hbool_t write_data) pass = FALSE; failure_mssg = "vrfy_ds_ctg_i: H5Dread() failed."; } - HDassert(ret >= 0); + assert(ret >= 0); } if ((pass) && (write_data)) { @@ -1888,11 +1888,11 @@ vrfy_ds_ctg_i(hid_t fid, const char *dset_name, hbool_t write_data) failure_mssg = "vrfy_ds_ctg_i: u != rdata[u]."; break; } - HDassert((int)u == rdata[u]); + assert((int)u == rdata[u]); } } /* end if */ - HDfree(rdata); + free(rdata); if (pass) { ret = H5Dclose(dsid); @@ -1901,7 +1901,7 @@ vrfy_ds_ctg_i(hid_t fid, const char *dset_name, hbool_t write_data) pass = FALSE; failure_mssg = "vrfy_ds_ctg_i: H5Dclose() failed"; } - HDassert(ret >= 0); + assert(ret >= 0); } } /* vrfy_ds_ctg_i() */ @@ -1944,7 +1944,7 @@ ds_chk_i(hid_t fid, const char *dset_name, hbool_t write_data) pass = FALSE; failure_mssg = "ds_chk_i: H5Screate_simple() failed."; } - HDassert(sid > 0); + assert(sid > 0); } if (pass) { @@ -1954,7 +1954,7 @@ ds_chk_i(hid_t fid, const char *dset_name, hbool_t write_data) pass = FALSE; failure_mssg = "ds_chk_i: H5Pcreate() failed."; } - HDassert(dcpl > 0); + assert(dcpl > 0); } if (pass) { @@ -1964,7 +1964,7 @@ ds_chk_i(hid_t fid, const char *dset_name, hbool_t write_data) pass = FALSE; failure_mssg = "ds_chk_i: H5Pset_chunk() failed."; } - HDassert(ret >= 0); + assert(ret >= 0); } if (pass) { @@ -1974,7 +1974,7 @@ ds_chk_i(hid_t fid, const char *dset_name, hbool_t write_data) pass = FALSE; failure_mssg = "ds_chk_i: H5Dcreate2() failed"; } - HDassert(dsid > 0); + assert(dsid > 0); } if (pass) { @@ -1984,7 +1984,7 @@ ds_chk_i(hid_t fid, const char *dset_name, hbool_t write_data) pass = FALSE; failure_mssg = "ds_chk_i: H5Pclose() failed."; } - HDassert(ret >= 0); + assert(ret >= 0); } if (pass) { @@ -1994,17 +1994,17 @@ ds_chk_i(hid_t fid, const char *dset_name, hbool_t write_data) pass = FALSE; failure_mssg = "ds_chk_i: H5Sclose() failed."; } - HDassert(ret >= 0); + assert(ret >= 0); } if ((pass) && (write_data)) { - wdata = (int *)HDmalloc(sizeof(int) * DSET_DIMS); + wdata = (int *)malloc(sizeof(int) * DSET_DIMS); if (!wdata) { pass = FALSE; - failure_mssg = "ds_chk_i: HDmalloc of wdata failed."; + failure_mssg = "ds_chk_i: malloc of wdata failed."; } - HDassert(wdata); + assert(wdata); } if ((pass) && (write_data)) { @@ -2016,8 +2016,8 @@ ds_chk_i(hid_t fid, const char *dset_name, hbool_t write_data) pass = FALSE; failure_mssg = "ds_chk_i: H5Dwrite() failed."; } - HDassert(ret >= 0); - HDfree(wdata); + assert(ret >= 0); + free(wdata); } /* end if */ if (pass) { @@ -2027,7 +2027,7 @@ ds_chk_i(hid_t fid, const char *dset_name, hbool_t write_data) pass = FALSE; failure_mssg = "ds_chk_i: H5Dclose() failed."; } - HDassert(ret >= 0); + assert(ret >= 0); } } /* ds_chk_i */ @@ -2073,7 +2073,7 @@ vrfy_ds_chk_i(hid_t fid, const char *dset_name, hbool_t write_data) pass = FALSE; failure_mssg = "vrfy_ds_chk_i: H5Dopen2() failed."; } - HDassert(dsid > 0); + assert(dsid > 0); } if (pass) { @@ -2083,7 +2083,7 @@ vrfy_ds_chk_i(hid_t fid, const char *dset_name, hbool_t write_data) pass = FALSE; failure_mssg = "vrfy_ds_chk_i: H5Dget_space() failed."; } - HDassert(sid > 0); + assert(sid > 0); } if (pass) { @@ -2093,7 +2093,7 @@ vrfy_ds_chk_i(hid_t fid, const char *dset_name, hbool_t write_data) pass = FALSE; failure_mssg = "vrfy_ds_chk_i: 1 != ndims"; } - HDassert(1 == ndims); + assert(1 == ndims); } if (pass) { @@ -2111,9 +2111,9 @@ vrfy_ds_chk_i(hid_t fid, const char *dset_name, hbool_t write_data) pass = FALSE; failure_mssg = "vrfy_ds_chk_i: DSET_DIMS != max_dims[0]"; } - HDassert(ret >= 0); - HDassert(DSET_DIMS == dims[0]); - HDassert(DSET_DIMS == max_dims[0]); + assert(ret >= 0); + assert(DSET_DIMS == dims[0]); + assert(DSET_DIMS == max_dims[0]); } if (pass) { @@ -2123,7 +2123,7 @@ vrfy_ds_chk_i(hid_t fid, const char *dset_name, hbool_t write_data) pass = FALSE; failure_mssg = "vrfy_ds_chk_i: H5Sclose() failed."; } - HDassert(ret >= 0); + assert(ret >= 0); } if (pass) { @@ -2133,7 +2133,7 @@ vrfy_ds_chk_i(hid_t fid, const char *dset_name, hbool_t write_data) pass = FALSE; failure_mssg = "vrfy_ds_chk_i: H5Dget_type() failed."; } - HDassert(tid > 0); + assert(tid > 0); } if (pass) { @@ -2143,7 +2143,7 @@ vrfy_ds_chk_i(hid_t fid, const char *dset_name, hbool_t write_data) pass = FALSE; failure_mssg = "vrfy_ds_chk_i: tid != H5T_NATIVE_INT"; } - HDassert(1 == type_equal); + assert(1 == type_equal); } if (pass) { @@ -2153,7 +2153,7 @@ vrfy_ds_chk_i(hid_t fid, const char *dset_name, hbool_t write_data) pass = FALSE; failure_mssg = "vrfy_ds_chk_i: H5Tclose() failed."; } - HDassert(ret >= 0); + assert(ret >= 0); } if (pass) { @@ -2171,9 +2171,9 @@ vrfy_ds_chk_i(hid_t fid, const char *dset_name, hbool_t write_data) pass = FALSE; failure_mssg = "vrfy_ds_chk_i: !write_data && allocation != H5D_SPACE_STATUS_NOT_ALLOCATED"; } - HDassert(ret >= 0); - HDassert((write_data && allocation == H5D_SPACE_STATUS_ALLOCATED) || - (!write_data && allocation == H5D_SPACE_STATUS_NOT_ALLOCATED)); + assert(ret >= 0); + assert((write_data && allocation == H5D_SPACE_STATUS_ALLOCATED) || + (!write_data && allocation == H5D_SPACE_STATUS_NOT_ALLOCATED)); } if (pass) { @@ -2183,7 +2183,7 @@ vrfy_ds_chk_i(hid_t fid, const char *dset_name, hbool_t write_data) pass = FALSE; failure_mssg = "vrfy_ds_chk_i: H5Dget_create_plist() failed."; } - HDassert(dcpl > 0); + assert(dcpl > 0); } if (pass) { @@ -2193,7 +2193,7 @@ vrfy_ds_chk_i(hid_t fid, const char *dset_name, hbool_t write_data) pass = FALSE; failure_mssg = "vrfy_ds_chk_i: H5D_CHUNKED != layout"; } - HDassert(H5D_CHUNKED == layout); + assert(H5D_CHUNKED == layout); } if (pass) { @@ -2207,8 +2207,8 @@ vrfy_ds_chk_i(hid_t fid, const char *dset_name, hbool_t write_data) pass = FALSE; failure_mssg = "vrfy_ds_chk_i: "; } - HDassert(ret >= 0); - HDassert(DSET_CHUNK_DIMS == chunk_dims[0]); + assert(ret >= 0); + assert(DSET_CHUNK_DIMS == chunk_dims[0]); } if (pass) { @@ -2218,17 +2218,17 @@ vrfy_ds_chk_i(hid_t fid, const char *dset_name, hbool_t write_data) pass = FALSE; failure_mssg = "vrfy_ds_chk_i: H5Pclose() failed."; } - HDassert(ret >= 0); + assert(ret >= 0); } if ((pass) && (write_data)) { - rdata = (int *)HDmalloc(sizeof(int) * DSET_DIMS); + rdata = (int *)malloc(sizeof(int) * DSET_DIMS); if (!rdata) { pass = FALSE; - failure_mssg = "vrfy_ds_chk_i: HDmalloc of rdata failed."; + failure_mssg = "vrfy_ds_chk_i: malloc of rdata failed."; } - HDassert(rdata); + assert(rdata); } if ((pass) && (write_data)) { @@ -2237,7 +2237,7 @@ vrfy_ds_chk_i(hid_t fid, const char *dset_name, hbool_t write_data) pass = FALSE; failure_mssg = "vrfy_ds_chk_i: H5Dread() failed."; } - HDassert(ret >= 0); + assert(ret >= 0); } if ((pass) && (write_data)) { @@ -2247,11 +2247,11 @@ vrfy_ds_chk_i(hid_t fid, const char *dset_name, hbool_t write_data) failure_mssg = "vrfy_ds_chk_i: u != rdata[u]"; break; } - HDassert((int)u == rdata[u]); + assert((int)u == rdata[u]); } } /* end if */ - HDfree(rdata); + free(rdata); if (pass) { ret = H5Dclose(dsid); @@ -2260,7 +2260,7 @@ vrfy_ds_chk_i(hid_t fid, const char *dset_name, hbool_t write_data) pass = FALSE; failure_mssg = "vrfy_ds_chk_i: H5Dclose() failed."; } - HDassert(ret >= 0); + assert(ret >= 0); } } /* vrfy_ds_chk_i() */ @@ -2302,7 +2302,7 @@ ds_cpt_i(hid_t fid, const char *dset_name, hbool_t write_data) pass = FALSE; failure_mssg = "ds_cpt_i: H5Screate_simple() failed."; } - HDassert(sid > 0); + assert(sid > 0); } if (pass) { @@ -2312,7 +2312,7 @@ ds_cpt_i(hid_t fid, const char *dset_name, hbool_t write_data) pass = FALSE; failure_mssg = "ds_cpt_i: H5Pcreate() failed."; } - HDassert(dcpl > 0); + assert(dcpl > 0); } if (pass) { @@ -2322,7 +2322,7 @@ ds_cpt_i(hid_t fid, const char *dset_name, hbool_t write_data) pass = FALSE; failure_mssg = "ds_cpt_i: H5Pset_layout() failed."; } - HDassert(ret >= 0); + assert(ret >= 0); } if (pass) { @@ -2332,7 +2332,7 @@ ds_cpt_i(hid_t fid, const char *dset_name, hbool_t write_data) pass = FALSE; failure_mssg = "ds_cpt_i: H5Dcreate2() failed."; } - HDassert(dsid > 0); + assert(dsid > 0); } if (pass) { @@ -2342,7 +2342,7 @@ ds_cpt_i(hid_t fid, const char *dset_name, hbool_t write_data) pass = FALSE; failure_mssg = "ds_cpt_i: H5Pclose() failed."; } - HDassert(ret >= 0); + assert(ret >= 0); } if (pass) { @@ -2352,17 +2352,17 @@ ds_cpt_i(hid_t fid, const char *dset_name, hbool_t write_data) pass = FALSE; failure_mssg = "ds_cpt_i: H5Sclose() failed."; } - HDassert(ret >= 0); + assert(ret >= 0); } if ((pass) && (write_data)) { - wdata = (int *)HDmalloc(sizeof(int) * DSET_COMPACT_DIMS); + wdata = (int *)malloc(sizeof(int) * DSET_COMPACT_DIMS); if (!wdata) { pass = FALSE; - failure_mssg = "ds_cpt_i: HDmalloc of wdata failed."; + failure_mssg = "ds_cpt_i: malloc of wdata failed."; } - HDassert(wdata); + assert(wdata); } if ((pass) && (write_data)) { @@ -2375,9 +2375,9 @@ ds_cpt_i(hid_t fid, const char *dset_name, hbool_t write_data) pass = FALSE; failure_mssg = "ds_cpt_i: H5Dwrite() failed."; } - HDassert(ret >= 0); + assert(ret >= 0); - HDfree(wdata); + free(wdata); } /* end if */ if (pass) { @@ -2387,7 +2387,7 @@ ds_cpt_i(hid_t fid, const char *dset_name, hbool_t write_data) pass = FALSE; failure_mssg = "ds_cpt_i: H5Dclose() failed."; } - HDassert(ret >= 0); + assert(ret >= 0); } } /* ds_cpt_i() */ @@ -2433,7 +2433,7 @@ vrfy_ds_cpt_i(hid_t fid, const char *dset_name, hbool_t write_data) pass = FALSE; failure_mssg = "vrfy_ds_cpt_i: H5Dopen2() failed."; } - HDassert(dsid > 0); + assert(dsid > 0); } if (pass) { @@ -2443,7 +2443,7 @@ vrfy_ds_cpt_i(hid_t fid, const char *dset_name, hbool_t write_data) pass = FALSE; failure_mssg = "vrfy_ds_cpt_i: H5Dget_space() failed."; } - HDassert(sid > 0); + assert(sid > 0); } if (pass) { @@ -2453,7 +2453,7 @@ vrfy_ds_cpt_i(hid_t fid, const char *dset_name, hbool_t write_data) pass = FALSE; failure_mssg = "vrfy_ds_cpt_i: 1 != ndims"; } - HDassert(1 == ndims); + assert(1 == ndims); } if (pass) { @@ -2471,9 +2471,9 @@ vrfy_ds_cpt_i(hid_t fid, const char *dset_name, hbool_t write_data) pass = FALSE; failure_mssg = "vrfy_ds_cpt_i: DSET_COMPACT_DIMS != max_dims[0]"; } - HDassert(ret >= 0); - HDassert(DSET_COMPACT_DIMS == dims[0]); - HDassert(DSET_COMPACT_DIMS == max_dims[0]); + assert(ret >= 0); + assert(DSET_COMPACT_DIMS == dims[0]); + assert(DSET_COMPACT_DIMS == max_dims[0]); } if (pass) { @@ -2483,7 +2483,7 @@ vrfy_ds_cpt_i(hid_t fid, const char *dset_name, hbool_t write_data) pass = FALSE; failure_mssg = "vrfy_ds_cpt_i: H5Sclose() failed."; } - HDassert(ret >= 0); + assert(ret >= 0); } if (pass) { @@ -2493,7 +2493,7 @@ vrfy_ds_cpt_i(hid_t fid, const char *dset_name, hbool_t write_data) pass = FALSE; failure_mssg = "vrfy_ds_cpt_i: H5Dget_type() failed."; } - HDassert(tid > 0); + assert(tid > 0); } if (pass) { @@ -2503,7 +2503,7 @@ vrfy_ds_cpt_i(hid_t fid, const char *dset_name, hbool_t write_data) pass = FALSE; failure_mssg = "vrfy_ds_cpt_i: type != H5T_NATIVE_INT"; } - HDassert(1 == type_equal); + assert(1 == type_equal); } if (pass) { @@ -2513,7 +2513,7 @@ vrfy_ds_cpt_i(hid_t fid, const char *dset_name, hbool_t write_data) pass = FALSE; failure_mssg = "vrfy_ds_cpt_i: H5Tclose() failed."; } - HDassert(ret >= 0); + assert(ret >= 0); } if (pass) { @@ -2527,8 +2527,8 @@ vrfy_ds_cpt_i(hid_t fid, const char *dset_name, hbool_t write_data) pass = FALSE; failure_mssg = "vrfy_ds_cpt_i: H5D_SPACE_STATUS_ALLOCATED != allocation"; } - HDassert(ret >= 0); - HDassert(H5D_SPACE_STATUS_ALLOCATED == allocation); + assert(ret >= 0); + assert(H5D_SPACE_STATUS_ALLOCATED == allocation); } if (pass) { @@ -2538,7 +2538,7 @@ vrfy_ds_cpt_i(hid_t fid, const char *dset_name, hbool_t write_data) pass = FALSE; failure_mssg = "vrfy_ds_cpt_i: H5Dget_create_plist() failed."; } - HDassert(dcpl > 0); + assert(dcpl > 0); } if (pass) { @@ -2548,7 +2548,7 @@ vrfy_ds_cpt_i(hid_t fid, const char *dset_name, hbool_t write_data) pass = FALSE; failure_mssg = "vrfy_ds_cpt_i: H5D_COMPACT != layout"; } - HDassert(H5D_COMPACT == layout); + assert(H5D_COMPACT == layout); } if (pass) { @@ -2558,17 +2558,17 @@ vrfy_ds_cpt_i(hid_t fid, const char *dset_name, hbool_t write_data) pass = FALSE; failure_mssg = "vrfy_ds_cpt_i: H5Pclose() failed."; } - HDassert(ret >= 0); + assert(ret >= 0); } if ((pass) && (write_data)) { - rdata = (int *)HDmalloc(sizeof(int) * DSET_COMPACT_DIMS); + rdata = (int *)malloc(sizeof(int) * DSET_COMPACT_DIMS); if (!rdata) { pass = FALSE; - failure_mssg = "vrfy_ds_cpt_i: HDmalloc of rdata failed."; + failure_mssg = "vrfy_ds_cpt_i: malloc of rdata failed."; } - HDassert(rdata); + assert(rdata); } if ((pass) && (write_data)) { @@ -2577,7 +2577,7 @@ vrfy_ds_cpt_i(hid_t fid, const char *dset_name, hbool_t write_data) pass = FALSE; failure_mssg = "vrfy_ds_cpt_i: H5Dread() failed."; } - HDassert(ret >= 0); + assert(ret >= 0); } if ((pass) && (write_data)) { @@ -2587,11 +2587,11 @@ vrfy_ds_cpt_i(hid_t fid, const char *dset_name, hbool_t write_data) failure_mssg = "vrfy_ds_cpt_i: (int)u != rdata[u]"; break; } - HDassert((int)u == rdata[u]); + assert((int)u == rdata[u]); } } /* end if */ - HDfree(rdata); + free(rdata); if (pass) { ret = H5Dclose(dsid); @@ -2600,7 +2600,7 @@ vrfy_ds_cpt_i(hid_t fid, const char *dset_name, hbool_t write_data) pass = FALSE; failure_mssg = "vrfy_ds_cpt_i: H5Dclose() failed."; } - HDassert(ret >= 0); + assert(ret >= 0); } } /* vrfy_ds_cpt_i() */ @@ -2642,7 +2642,7 @@ ds_ctg_v(hid_t fid, const char *dset_name, hbool_t write_data) pass = FALSE; failure_mssg = "ds_ctg_v: H5Screate_simple"; } - HDassert(sid > 0); + assert(sid > 0); } if (pass) { @@ -2652,7 +2652,7 @@ ds_ctg_v(hid_t fid, const char *dset_name, hbool_t write_data) pass = FALSE; failure_mssg = "ds_ctg_v: H5Tvlen_create() failed."; } - HDassert(tid > 0); + assert(tid > 0); } if (pass) { @@ -2662,17 +2662,17 @@ ds_ctg_v(hid_t fid, const char *dset_name, hbool_t write_data) pass = FALSE; failure_mssg = "ds_ctg_v: H5Dcreate2() failed."; } - HDassert(dsid > 0); + assert(dsid > 0); } if ((pass) && (write_data)) { - wdata = (hvl_t *)HDmalloc(sizeof(hvl_t) * DSET_SMALL_DIMS); + wdata = (hvl_t *)malloc(sizeof(hvl_t) * DSET_SMALL_DIMS); if (!wdata) { pass = FALSE; - failure_mssg = "ds_ctg_v: HDmalloc of wdata failed."; + failure_mssg = "ds_ctg_v: malloc of wdata failed."; } - HDassert(wdata); + assert(wdata); } if ((pass) && (write_data)) { @@ -2682,14 +2682,14 @@ ds_ctg_v(hid_t fid, const char *dset_name, hbool_t write_data) unsigned v; len = (u % 10) + 1; - tdata = (int *)HDmalloc(sizeof(int) * len); + tdata = (int *)malloc(sizeof(int) * len); if (!tdata) { pass = FALSE; - failure_mssg = "ds_ctg_v: HDmalloc of tdata failed."; + failure_mssg = "ds_ctg_v: malloc of tdata failed."; break; } - HDassert(tdata); + assert(tdata); for (v = 0; v < len; v++) tdata[v] = (int)(u + v); @@ -2706,7 +2706,7 @@ ds_ctg_v(hid_t fid, const char *dset_name, hbool_t write_data) pass = FALSE; failure_mssg = "ds_ctg_v: H5Dwrite() failed."; } - HDassert(ret >= 0); + assert(ret >= 0); } if ((pass) && (write_data)) { @@ -2716,9 +2716,9 @@ ds_ctg_v(hid_t fid, const char *dset_name, hbool_t write_data) pass = FALSE; failure_mssg = "ds_ctg_v: H5Treclaim() failed."; } - HDassert(ret >= 0); + assert(ret >= 0); - HDfree(wdata); + free(wdata); } /* end if */ if (pass) { @@ -2728,7 +2728,7 @@ ds_ctg_v(hid_t fid, const char *dset_name, hbool_t write_data) pass = FALSE; failure_mssg = "ds_ctg_v: H5Sclose() failed."; } - HDassert(ret >= 0); + assert(ret >= 0); } if (pass) { @@ -2738,7 +2738,7 @@ ds_ctg_v(hid_t fid, const char *dset_name, hbool_t write_data) pass = FALSE; failure_mssg = "ds_ctg_v: H5Tclose() failed."; } - HDassert(ret >= 0); + assert(ret >= 0); } if (pass) { @@ -2748,7 +2748,7 @@ ds_ctg_v(hid_t fid, const char *dset_name, hbool_t write_data) pass = FALSE; failure_mssg = "ds_ctg_v: H5Dclose() failed."; } - HDassert(ret >= 0); + assert(ret >= 0); } } /* ds_ctg_v() */ @@ -2795,7 +2795,7 @@ vrfy_ds_ctg_v(hid_t fid, const char *dset_name, hbool_t write_data) pass = FALSE; failure_mssg = "vrfy_ds_ctg_v: H5Dopen2() failed."; } - HDassert(dsid > 0); + assert(dsid > 0); } if (pass) { @@ -2805,7 +2805,7 @@ vrfy_ds_ctg_v(hid_t fid, const char *dset_name, hbool_t write_data) pass = FALSE; failure_mssg = "vrfy_ds_ctg_v: H5Dget_space() failed"; } - HDassert(sid > 0); + assert(sid > 0); } if (pass) { @@ -2815,7 +2815,7 @@ vrfy_ds_ctg_v(hid_t fid, const char *dset_name, hbool_t write_data) pass = FALSE; failure_mssg = "vrfy_ds_ctg_v: 1 != ndims"; } - HDassert(1 == ndims); + assert(1 == ndims); } if (pass) { @@ -2833,9 +2833,9 @@ vrfy_ds_ctg_v(hid_t fid, const char *dset_name, hbool_t write_data) pass = FALSE; failure_mssg = "vrfy_ds_ctg_v: DSET_SMALL_DIMS != max_dims[0]"; } - HDassert(ret >= 0); - HDassert(DSET_SMALL_DIMS == dims[0]); - HDassert(DSET_SMALL_DIMS == max_dims[0]); + assert(ret >= 0); + assert(DSET_SMALL_DIMS == dims[0]); + assert(DSET_SMALL_DIMS == max_dims[0]); } if (pass) { @@ -2845,7 +2845,7 @@ vrfy_ds_ctg_v(hid_t fid, const char *dset_name, hbool_t write_data) pass = FALSE; failure_mssg = "vrfy_ds_ctg_v: H5Dget_type() failed."; } - HDassert(tid > 0); + assert(tid > 0); } if (pass) { @@ -2855,7 +2855,7 @@ vrfy_ds_ctg_v(hid_t fid, const char *dset_name, hbool_t write_data) pass = FALSE; failure_mssg = "vrfy_ds_ctg_v: H5Tvlen_create() failed."; } - HDassert(tmp_tid > 0); + assert(tmp_tid > 0); } if (pass) { @@ -2865,7 +2865,7 @@ vrfy_ds_ctg_v(hid_t fid, const char *dset_name, hbool_t write_data) pass = FALSE; failure_mssg = "vrfy_ds_ctg_v: type != vlen H5T_NATIVE_INT"; } - HDassert(1 == type_equal); + assert(1 == type_equal); } if (pass) { @@ -2875,7 +2875,7 @@ vrfy_ds_ctg_v(hid_t fid, const char *dset_name, hbool_t write_data) pass = FALSE; failure_mssg = "vrfy_ds_ctg_v: H5Tclose() failed."; } - HDassert(ret >= 0); + assert(ret >= 0); } if (pass) { @@ -2893,9 +2893,9 @@ vrfy_ds_ctg_v(hid_t fid, const char *dset_name, hbool_t write_data) pass = FALSE; failure_mssg = "vrfy_ds_ctg_v: !write_data && allocation != H5D_SPACE_STATUS_NOT_ALLOCATED"; } - HDassert(ret >= 0); - HDassert((write_data && allocation == H5D_SPACE_STATUS_ALLOCATED) || - (!write_data && allocation == H5D_SPACE_STATUS_NOT_ALLOCATED)); + assert(ret >= 0); + assert((write_data && allocation == H5D_SPACE_STATUS_ALLOCATED) || + (!write_data && allocation == H5D_SPACE_STATUS_NOT_ALLOCATED)); } if (pass) { @@ -2905,7 +2905,7 @@ vrfy_ds_ctg_v(hid_t fid, const char *dset_name, hbool_t write_data) pass = FALSE; failure_mssg = "vrfy_ds_ctg_v: H5Dget_create_plist() failed."; } - HDassert(dcpl > 0); + assert(dcpl > 0); } if (pass) { @@ -2915,7 +2915,7 @@ vrfy_ds_ctg_v(hid_t fid, const char *dset_name, hbool_t write_data) pass = FALSE; failure_mssg = "vrfy_ds_ctg_v: H5D_CONTIGUOUS != layout"; } - HDassert(H5D_CONTIGUOUS == layout); + assert(H5D_CONTIGUOUS == layout); } if (pass) { @@ -2925,17 +2925,17 @@ vrfy_ds_ctg_v(hid_t fid, const char *dset_name, hbool_t write_data) pass = FALSE; failure_mssg = "vrfy_ds_ctg_v: H5Pclose() failed."; } - HDassert(ret >= 0); + assert(ret >= 0); } if ((pass) && (write_data)) { - rdata = (hvl_t *)HDmalloc(sizeof(hvl_t) * DSET_SMALL_DIMS); + rdata = (hvl_t *)malloc(sizeof(hvl_t) * DSET_SMALL_DIMS); if (!rdata) { pass = FALSE; - failure_mssg = "vrfy_ds_ctg_v: HDmalloc of rdata failed."; + failure_mssg = "vrfy_ds_ctg_v: malloc of rdata failed."; } - HDassert(rdata); + assert(rdata); } if ((pass) && (write_data)) { @@ -2945,7 +2945,7 @@ vrfy_ds_ctg_v(hid_t fid, const char *dset_name, hbool_t write_data) pass = FALSE; failure_mssg = "vrfy_ds_ctg_v: H5Dread() failed."; } - HDassert(ret >= 0); + assert(ret >= 0); } if ((pass) && (write_data)) { @@ -2967,8 +2967,8 @@ vrfy_ds_ctg_v(hid_t fid, const char *dset_name, hbool_t write_data) failure_mssg = "vrfy_ds_ctg_v: (int)(u + v) != tdata[v]"; break; } - HDassert(tdata); - HDassert((int)(u + v) == tdata[v]); + assert(tdata); + assert((int)(u + v) == tdata[v]); } /* end for */ } /* end for */ } @@ -2980,10 +2980,10 @@ vrfy_ds_ctg_v(hid_t fid, const char *dset_name, hbool_t write_data) pass = FALSE; failure_mssg = "vrfy_ds_ctg_v: H5Treclaim() failed."; } - HDassert(ret >= 0); + assert(ret >= 0); } /* end if */ - HDfree(rdata); + free(rdata); if (pass) { ret = H5Sclose(sid); @@ -2992,7 +2992,7 @@ vrfy_ds_ctg_v(hid_t fid, const char *dset_name, hbool_t write_data) pass = FALSE; failure_mssg = "vrfy_ds_ctg_v: H5Sclose() failed."; } - HDassert(ret >= 0); + assert(ret >= 0); } if (pass) { @@ -3002,7 +3002,7 @@ vrfy_ds_ctg_v(hid_t fid, const char *dset_name, hbool_t write_data) pass = FALSE; failure_mssg = "vrfy_ds_ctg_v: H5Tclose() failed."; } - HDassert(ret >= 0); + assert(ret >= 0); } if (pass) { @@ -3012,7 +3012,7 @@ vrfy_ds_ctg_v(hid_t fid, const char *dset_name, hbool_t write_data) pass = FALSE; failure_mssg = "vrfy_ds_ctg_v: H5Dclose() failed."; } - HDassert(ret >= 0); + assert(ret >= 0); } } /* vrfy_ds_ctg_v() */ @@ -3051,31 +3051,31 @@ create_zoo(hid_t fid, const char *base_path, int proc_num) { char full_path[1024]; - HDassert(base_path); + assert(base_path); /* Add & verify an empty "new style" group */ if (pass) { HDsnprintf(full_path, sizeof(full_path), "%s/A", base_path); - HDassert(HDstrlen(full_path) < 1024); + assert(HDstrlen(full_path) < 1024); ns_grp_0(fid, full_path); } if (pass) { HDsnprintf(full_path, sizeof(full_path), "%s/A", base_path); - HDassert(HDstrlen(full_path) < 1024); + assert(HDstrlen(full_path) < 1024); vrfy_ns_grp_0(fid, full_path); } /* Add & verify a compact "new style" group (3 link messages) */ if (pass) { HDsnprintf(full_path, sizeof(full_path), "%s/B", base_path); - HDassert(HDstrlen(full_path) < 1024); + assert(HDstrlen(full_path) < 1024); ns_grp_c(fid, full_path, 3); } if (pass) { HDsnprintf(full_path, sizeof(full_path), "%s/B", base_path); - HDassert(HDstrlen(full_path) < 1024); + assert(HDstrlen(full_path) < 1024); vrfy_ns_grp_c(fid, full_path, 3); } @@ -3084,26 +3084,26 @@ create_zoo(hid_t fid, const char *base_path, int proc_num) */ if (pass) { HDsnprintf(full_path, sizeof(full_path), "%s/C", base_path); - HDassert(HDstrlen(full_path) < 1024); + assert(HDstrlen(full_path) < 1024); ns_grp_d(fid, full_path, 300); } if (pass) { HDsnprintf(full_path, sizeof(full_path), "%s/C", base_path); - HDassert(HDstrlen(full_path) < 1024); + assert(HDstrlen(full_path) < 1024); vrfy_ns_grp_d(fid, full_path, 300); } /* Add & verify an empty "old style" group to file */ if (pass) { HDsnprintf(full_path, sizeof(full_path), "%s/D", base_path); - HDassert(HDstrlen(full_path) < 1024); + assert(HDstrlen(full_path) < 1024); os_grp_0(fid, full_path); } if (pass) { HDsnprintf(full_path, sizeof(full_path), "%s/D", base_path); - HDassert(HDstrlen(full_path) < 1024); + assert(HDstrlen(full_path) < 1024); vrfy_os_grp_0(fid, full_path); } @@ -3112,13 +3112,13 @@ create_zoo(hid_t fid, const char *base_path, int proc_num) */ if (pass) { HDsnprintf(full_path, sizeof(full_path), "%s/E", base_path); - HDassert(HDstrlen(full_path) < 1024); + assert(HDstrlen(full_path) < 1024); os_grp_n(fid, full_path, proc_num, 300); } if (pass) { HDsnprintf(full_path, sizeof(full_path), "%s/E", base_path); - HDassert(HDstrlen(full_path) < 1024); + assert(HDstrlen(full_path) < 1024); vrfy_os_grp_n(fid, full_path, proc_num, 300); } @@ -3127,13 +3127,13 @@ create_zoo(hid_t fid, const char *base_path, int proc_num) */ if (pass) { HDsnprintf(full_path, sizeof(full_path), "%s/F", base_path); - HDassert(HDstrlen(full_path) < 1024); + assert(HDstrlen(full_path) < 1024); ds_ctg_i(fid, full_path, FALSE); } if (pass) { HDsnprintf(full_path, sizeof(full_path), "%s/F", base_path); - HDassert(HDstrlen(full_path) < 1024); + assert(HDstrlen(full_path) < 1024); vrfy_ds_ctg_i(fid, full_path, FALSE); } @@ -3142,13 +3142,13 @@ create_zoo(hid_t fid, const char *base_path, int proc_num) */ if (pass) { HDsnprintf(full_path, sizeof(full_path), "%s/G", base_path); - HDassert(HDstrlen(full_path) < 1024); + assert(HDstrlen(full_path) < 1024); ds_ctg_i(fid, full_path, TRUE); } if (pass) { HDsnprintf(full_path, sizeof(full_path), "%s/G", base_path); - HDassert(HDstrlen(full_path) < 1024); + assert(HDstrlen(full_path) < 1024); vrfy_ds_ctg_i(fid, full_path, TRUE); } @@ -3157,13 +3157,13 @@ create_zoo(hid_t fid, const char *base_path, int proc_num) */ if (pass) { HDsnprintf(full_path, sizeof(full_path), "%s/H", base_path); - HDassert(HDstrlen(full_path) < 1024); + assert(HDstrlen(full_path) < 1024); ds_chk_i(fid, full_path, FALSE); } if (pass) { HDsnprintf(full_path, sizeof(full_path), "%s/H", base_path); - HDassert(HDstrlen(full_path) < 1024); + assert(HDstrlen(full_path) < 1024); vrfy_ds_chk_i(fid, full_path, FALSE); } @@ -3172,13 +3172,13 @@ create_zoo(hid_t fid, const char *base_path, int proc_num) */ if (pass) { HDsnprintf(full_path, sizeof(full_path), "%s/I", base_path); - HDassert(HDstrlen(full_path) < 1024); + assert(HDstrlen(full_path) < 1024); ds_chk_i(fid, full_path, TRUE); } if (pass) { HDsnprintf(full_path, sizeof(full_path), "%s/I", base_path); - HDassert(HDstrlen(full_path) < 1024); + assert(HDstrlen(full_path) < 1024); vrfy_ds_chk_i(fid, full_path, TRUE); } @@ -3187,13 +3187,13 @@ create_zoo(hid_t fid, const char *base_path, int proc_num) */ if (pass) { HDsnprintf(full_path, sizeof(full_path), "%s/J", base_path); - HDassert(HDstrlen(full_path) < 1024); + assert(HDstrlen(full_path) < 1024); ds_cpt_i(fid, full_path, FALSE); } if (pass) { HDsnprintf(full_path, sizeof(full_path), "%s/J", base_path); - HDassert(HDstrlen(full_path) < 1024); + assert(HDstrlen(full_path) < 1024); vrfy_ds_cpt_i(fid, full_path, FALSE); } @@ -3202,13 +3202,13 @@ create_zoo(hid_t fid, const char *base_path, int proc_num) */ if (pass) { HDsnprintf(full_path, sizeof(full_path), "%s/K", base_path); - HDassert(HDstrlen(full_path) < 1024); + assert(HDstrlen(full_path) < 1024); ds_cpt_i(fid, full_path, TRUE); } if (pass) { HDsnprintf(full_path, sizeof(full_path), "%s/K", base_path); - HDassert(HDstrlen(full_path) < 1024); + assert(HDstrlen(full_path) < 1024); vrfy_ds_cpt_i(fid, full_path, TRUE); } @@ -3217,13 +3217,13 @@ create_zoo(hid_t fid, const char *base_path, int proc_num) */ if (pass) { HDsnprintf(full_path, sizeof(full_path), "%s/L", base_path); - HDassert(HDstrlen(full_path) < 1024); + assert(HDstrlen(full_path) < 1024); ds_ctg_v(fid, full_path, FALSE); } if (pass) { HDsnprintf(full_path, sizeof(full_path), "%s/L", base_path); - HDassert(HDstrlen(full_path) < 1024); + assert(HDstrlen(full_path) < 1024); vrfy_ds_ctg_v(fid, full_path, FALSE); } @@ -3232,13 +3232,13 @@ create_zoo(hid_t fid, const char *base_path, int proc_num) */ if (pass) { HDsnprintf(full_path, sizeof(full_path), "%s/M", base_path); - HDassert(HDstrlen(full_path) < 1024); + assert(HDstrlen(full_path) < 1024); ds_ctg_v(fid, full_path, TRUE); } if (pass) { HDsnprintf(full_path, sizeof(full_path), "%s/M", base_path); - HDassert(HDstrlen(full_path) < 1024); + assert(HDstrlen(full_path) < 1024); vrfy_ds_ctg_v(fid, full_path, TRUE); } @@ -3276,19 +3276,19 @@ validate_zoo(hid_t fid, const char *base_path, int proc_num) { char full_path[1024]; - HDassert(base_path); + assert(base_path); /* validate an empty "new style" group */ if (pass) { HDsnprintf(full_path, sizeof(full_path), "%s/A", base_path); - HDassert(HDstrlen(full_path) < 1024); + assert(HDstrlen(full_path) < 1024); vrfy_ns_grp_0(fid, full_path); } /* validate a compact "new style" group (3 link messages) */ if (pass) { HDsnprintf(full_path, sizeof(full_path), "%s/B", base_path); - HDassert(HDstrlen(full_path) < 1024); + assert(HDstrlen(full_path) < 1024); vrfy_ns_grp_c(fid, full_path, 3); } @@ -3297,14 +3297,14 @@ validate_zoo(hid_t fid, const char *base_path, int proc_num) */ if (pass) { HDsnprintf(full_path, sizeof(full_path), "%s/C", base_path); - HDassert(HDstrlen(full_path) < 1024); + assert(HDstrlen(full_path) < 1024); vrfy_ns_grp_d(fid, full_path, 300); } /* validate an empty "old style" group in file */ if (pass) { HDsnprintf(full_path, sizeof(full_path), "%s/D", base_path); - HDassert(HDstrlen(full_path) < 1024); + assert(HDstrlen(full_path) < 1024); vrfy_os_grp_0(fid, full_path); } @@ -3313,7 +3313,7 @@ validate_zoo(hid_t fid, const char *base_path, int proc_num) */ if (pass) { HDsnprintf(full_path, sizeof(full_path), "%s/E", base_path); - HDassert(HDstrlen(full_path) < 1024); + assert(HDstrlen(full_path) < 1024); vrfy_os_grp_n(fid, full_path, proc_num, 300); } @@ -3322,7 +3322,7 @@ validate_zoo(hid_t fid, const char *base_path, int proc_num) */ if (pass) { HDsnprintf(full_path, sizeof(full_path), "%s/F", base_path); - HDassert(HDstrlen(full_path) < 1024); + assert(HDstrlen(full_path) < 1024); vrfy_ds_ctg_i(fid, full_path, FALSE); } @@ -3331,7 +3331,7 @@ validate_zoo(hid_t fid, const char *base_path, int proc_num) */ if (pass) { HDsnprintf(full_path, sizeof(full_path), "%s/G", base_path); - HDassert(HDstrlen(full_path) < 1024); + assert(HDstrlen(full_path) < 1024); vrfy_ds_ctg_i(fid, full_path, TRUE); } @@ -3340,7 +3340,7 @@ validate_zoo(hid_t fid, const char *base_path, int proc_num) */ if (pass) { HDsnprintf(full_path, sizeof(full_path), "%s/H", base_path); - HDassert(HDstrlen(full_path) < 1024); + assert(HDstrlen(full_path) < 1024); vrfy_ds_chk_i(fid, full_path, FALSE); } @@ -3349,7 +3349,7 @@ validate_zoo(hid_t fid, const char *base_path, int proc_num) */ if (pass) { HDsnprintf(full_path, sizeof(full_path), "%s/I", base_path); - HDassert(HDstrlen(full_path) < 1024); + assert(HDstrlen(full_path) < 1024); vrfy_ds_chk_i(fid, full_path, TRUE); } @@ -3358,7 +3358,7 @@ validate_zoo(hid_t fid, const char *base_path, int proc_num) */ if (pass) { HDsnprintf(full_path, sizeof(full_path), "%s/J", base_path); - HDassert(HDstrlen(full_path) < 1024); + assert(HDstrlen(full_path) < 1024); vrfy_ds_cpt_i(fid, full_path, FALSE); } @@ -3367,7 +3367,7 @@ validate_zoo(hid_t fid, const char *base_path, int proc_num) */ if (pass) { HDsnprintf(full_path, sizeof(full_path), "%s/K", base_path); - HDassert(HDstrlen(full_path) < 1024); + assert(HDstrlen(full_path) < 1024); vrfy_ds_cpt_i(fid, full_path, TRUE); } @@ -3376,7 +3376,7 @@ validate_zoo(hid_t fid, const char *base_path, int proc_num) */ if (pass) { HDsnprintf(full_path, sizeof(full_path), "%s/L", base_path); - HDassert(HDstrlen(full_path) < 1024); + assert(HDstrlen(full_path) < 1024); vrfy_ds_ctg_v(fid, full_path, FALSE); } @@ -3385,7 +3385,7 @@ validate_zoo(hid_t fid, const char *base_path, int proc_num) */ if (pass) { HDsnprintf(full_path, sizeof(full_path), "%s/M", base_path); - HDassert(HDstrlen(full_path) < 1024); + assert(HDstrlen(full_path) < 1024); vrfy_ds_ctg_v(fid, full_path, TRUE); } diff --git a/test/getname.c b/test/getname.c index f1d43ea..ffca62f 100644 --- a/test/getname.c +++ b/test/getname.c @@ -1470,7 +1470,7 @@ test_main(hid_t file_id, hid_t fapl) char *name3; /* Include the extra null character */ - name3 = (char *)HDmalloc(name_len + 1); + name3 = (char *)malloc(name_len + 1); if (!name3) TEST_ERROR; @@ -1493,7 +1493,7 @@ test_main(hid_t file_id, hid_t fapl) if (HDstrcmp(name3, "/g") != 0) TEST_ERROR; - HDfree(name3); + free(name3); } /* Close */ @@ -3327,7 +3327,7 @@ test_obj_ref(hid_t fapl) TEST_ERROR; PASSED(); - HDmemset(buf, 0, sizeof(buf)); + memset(buf, 0, sizeof(buf)); TESTING("getting path to dataset in /Group1"); if ((dataset2 = H5Rdereference2(dataset, H5P_DEFAULT, H5R_OBJECT, &wbuf[1])) < 0) FAIL_STACK_ERROR; @@ -3343,7 +3343,7 @@ test_obj_ref(hid_t fapl) TEST_ERROR; PASSED(); - HDmemset(buf, 0, sizeof(buf)); + memset(buf, 0, sizeof(buf)); TESTING("getting path to /Group1"); if ((group = H5Rdereference2(dataset, H5P_DEFAULT, H5R_OBJECT, &wbuf[2])) < 0) FAIL_STACK_ERROR; @@ -3359,7 +3359,7 @@ test_obj_ref(hid_t fapl) TEST_ERROR; PASSED(); - HDmemset(buf, 0, sizeof(buf)); + memset(buf, 0, sizeof(buf)); TESTING("getting path to datatype in /Group1"); if ((tid1 = H5Rdereference2(dataset, H5P_DEFAULT, H5R_OBJECT, &wbuf[3])) < 0) FAIL_STACK_ERROR; @@ -3375,7 +3375,7 @@ test_obj_ref(hid_t fapl) TEST_ERROR; PASSED(); - HDmemset(buf, 0, sizeof(buf)); + memset(buf, 0, sizeof(buf)); TESTING("getting path to dataset in nested group"); if ((dataset2 = H5Rdereference2(dataset, H5P_DEFAULT, H5R_OBJECT, &wbuf[4])) < 0) FAIL_STACK_ERROR; @@ -3391,7 +3391,7 @@ test_obj_ref(hid_t fapl) TEST_ERROR; PASSED(); - HDmemset(buf, 0, sizeof(buf)); + memset(buf, 0, sizeof(buf)); TESTING("getting path to nested group"); if ((group = H5Rdereference2(dataset, H5P_DEFAULT, H5R_OBJECT, &wbuf[5])) < 0) FAIL_STACK_ERROR; @@ -3407,7 +3407,7 @@ test_obj_ref(hid_t fapl) TEST_ERROR; PASSED(); - HDmemset(buf, 0, sizeof(buf)); + memset(buf, 0, sizeof(buf)); TESTING("getting path to dataset created via hard link"); if ((dataset2 = H5Rdereference2(dataset, H5P_DEFAULT, H5R_OBJECT, &wbuf[6])) < 0) FAIL_STACK_ERROR; @@ -3423,7 +3423,7 @@ test_obj_ref(hid_t fapl) TEST_ERROR; PASSED(); - HDmemset(buf, 0, sizeof(buf)); + memset(buf, 0, sizeof(buf)); TESTING("getting path to root group"); if ((group = H5Rdereference2(dataset, H5P_DEFAULT, H5R_OBJECT, &wbuf[7])) < 0) FAIL_STACK_ERROR; diff --git a/test/gheap.c b/test/gheap.c index 4369b1b..28f05a6 100644 --- a/test/gheap.c +++ b/test/gheap.c @@ -81,7 +81,7 @@ test_1(hid_t fapl) TESTING("monotonically increasing lengths"); /* Allocate buffer for H5HG_t */ - if (NULL == (obj = (H5HG_t *)HDmalloc(sizeof(H5HG_t) * GHEAP_TEST_NOBJS))) + if (NULL == (obj = (H5HG_t *)malloc(sizeof(H5HG_t) * GHEAP_TEST_NOBJS))) goto error; /* Open a clean file */ @@ -101,7 +101,7 @@ test_1(hid_t fapl) */ for (u = 0; u < GHEAP_TEST_NOBJS; u++) { size = u + 1; - HDmemset(out, (int)('A' + u % 26), size); + memset(out, (int)('A' + u % 26), size); H5Eclear2(H5E_DEFAULT); status = H5HG_insert(f, size, out, obj + u); if (status < 0) { @@ -121,14 +121,14 @@ test_1(hid_t fapl) */ for (u = 0; u < GHEAP_TEST_NOBJS; u++) { size = u + 1; - HDmemset(out, (int)('A' + u % 26), size); + memset(out, (int)('A' + u % 26), size); H5Eclear2(H5E_DEFAULT); if (NULL == H5HG_read(f, obj + u, in, NULL)) { H5_FAILED(); HDputs(" Unable to read object"); nerrors++; } - else if (HDmemcmp(in, out, size) != 0) { + else if (memcmp(in, out, size) != 0) { H5_FAILED(); HDputs(" Value read doesn't match value written"); nerrors++; @@ -136,7 +136,7 @@ test_1(hid_t fapl) } /* Release buffer */ - HDfree(obj); + free(obj); obj = NULL; if (H5Fclose(file) < 0) @@ -154,7 +154,7 @@ error: } H5E_END_TRY; if (obj) - HDfree(obj); + free(obj); return MAX(1, nerrors); } @@ -189,7 +189,7 @@ test_2(hid_t fapl) TESTING("monotonically decreasing lengths"); /* Allocate buffer for H5HG_t */ - if (NULL == (obj = (H5HG_t *)HDmalloc(sizeof(H5HG_t) * GHEAP_TEST_NOBJS))) + if (NULL == (obj = (H5HG_t *)malloc(sizeof(H5HG_t) * GHEAP_TEST_NOBJS))) goto error; /* Open a clean file */ @@ -207,7 +207,7 @@ test_2(hid_t fapl) */ for (u = 0; u < GHEAP_TEST_NOBJS; u++) { size = GHEAP_TEST_NOBJS - u; - HDmemset(out, (int)('A' + u % 26), size); + memset(out, (int)('A' + u % 26), size); H5Eclear2(H5E_DEFAULT); if (H5HG_insert(f, size, out, obj + u) < 0) { H5_FAILED(); @@ -221,14 +221,14 @@ test_2(hid_t fapl) */ for (u = 0; u < GHEAP_TEST_NOBJS; u++) { size = GHEAP_TEST_NOBJS - u; - HDmemset(out, (int)('A' + u % 26), size); + memset(out, (int)('A' + u % 26), size); H5Eclear2(H5E_DEFAULT); if (NULL == H5HG_read(f, obj + u, in, NULL)) { H5_FAILED(); HDputs(" Unable to read object"); nerrors++; } - else if (HDmemcmp(in, out, size) != 0) { + else if (memcmp(in, out, size) != 0) { H5_FAILED(); HDputs(" Value read doesn't match value written"); nerrors++; @@ -236,7 +236,7 @@ test_2(hid_t fapl) } /* Release buffer */ - HDfree(obj); + free(obj); obj = NULL; if (H5Fclose(file) < 0) @@ -254,7 +254,7 @@ error: } H5E_END_TRY; if (obj) - HDfree(obj); + free(obj); return MAX(1, nerrors); } @@ -289,7 +289,7 @@ test_3(hid_t fapl) TESTING("complete object removal"); /* Allocate buffer for H5HG_t */ - if (NULL == (obj = (H5HG_t *)HDmalloc(sizeof(H5HG_t) * GHEAP_TEST_NOBJS))) + if (NULL == (obj = (H5HG_t *)malloc(sizeof(H5HG_t) * GHEAP_TEST_NOBJS))) goto error; /* Open a clean file */ @@ -305,7 +305,7 @@ test_3(hid_t fapl) /* Create some stuff */ for (u = 0; u < GHEAP_TEST_NOBJS; u++) { size = u % 30 + 100; - HDmemset(out, (int)('A' + u % 26), size); + memset(out, (int)('A' + u % 26), size); H5Eclear2(H5E_DEFAULT); status = H5HG_insert(f, size, out, obj + u); if (status < 0) { @@ -326,7 +326,7 @@ test_3(hid_t fapl) } /* Release buffer */ - HDfree(obj); + free(obj); obj = NULL; if (H5Fclose(file) < 0) @@ -344,7 +344,7 @@ error: } H5E_END_TRY; if (obj) - HDfree(obj); + free(obj); return MAX(1, nerrors); } @@ -380,7 +380,7 @@ test_4(hid_t fapl) TESTING("partial object removal"); /* Allocate buffer for H5HG_t */ - if (NULL == (obj = (H5HG_t *)HDmalloc(sizeof(H5HG_t) * GHEAP_TEST_NOBJS))) + if (NULL == (obj = (H5HG_t *)malloc(sizeof(H5HG_t) * GHEAP_TEST_NOBJS))) goto error; /* Open a clean file */ @@ -396,7 +396,7 @@ test_4(hid_t fapl) for (u = 0; u < GHEAP_TEST_NOBJS; u++) { /* Insert */ size = u % 30 + 100; - HDmemset(out, (int)('A' + u % 26), size); + memset(out, (int)('A' + u % 26), size); H5Eclear2(H5E_DEFAULT); status = H5HG_insert(f, size, out, obj + u); if (status < 0) { @@ -417,12 +417,12 @@ test_4(hid_t fapl) HDputs(" Unable to remove object"); nerrors++; } - HDmemset(obj + u - 1, 0, sizeof *obj); + memset(obj + u - 1, 0, sizeof *obj); } } /* Release buffer */ - HDfree(obj); + free(obj); obj = NULL; if (H5Fclose(file) < 0) @@ -440,7 +440,7 @@ error: } H5E_END_TRY; if (obj) - HDfree(obj); + free(obj); return MAX(1, nerrors); } @@ -474,7 +474,7 @@ test_ooo_indices(hid_t fapl) TESTING("out of order indices"); - if (NULL == (obj = (H5HG_t *)HDmalloc(2000 * sizeof(*obj)))) + if (NULL == (obj = (H5HG_t *)malloc(2000 * sizeof(*obj)))) goto error; /* Open a clean file */ @@ -517,8 +517,8 @@ test_ooo_indices(hid_t fapl) } /* The indices should have "wrapped around" on the last iteration */ - HDassert(obj[534].idx == 65535); - HDassert(obj[535].idx == 1); + assert(obj[534].idx == 65535); + assert(obj[535].idx == 1); /* Reopen the file */ if (H5Fclose(file) < 0) @@ -546,7 +546,7 @@ test_ooo_indices(hid_t fapl) goto error; if (nerrors) goto error; - HDfree(obj); + free(obj); obj = NULL; PASSED(); @@ -559,7 +559,7 @@ error: } H5E_END_TRY; if (obj) - HDfree(obj); + free(obj); return MAX(1, nerrors); } /* end test_ooo_indices */ @@ -608,7 +608,7 @@ main(void) api_ctx_pushed = FALSE; h5_cleanup(FILENAME, fapl_id); - HDexit(EXIT_SUCCESS); + exit(EXIT_SUCCESS); error: H5E_BEGIN_TRY @@ -621,5 +621,5 @@ error: H5CX_pop(FALSE); HDputs("*** TESTS FAILED ***"); - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); } /* end main() */ diff --git a/test/h5test.c b/test/h5test.c index e3a3fb0..c3ea52f 100644 --- a/test/h5test.c +++ b/test/h5test.c @@ -310,7 +310,7 @@ void h5_restore_err(void) { /* Restore the original error reporting routine */ - HDassert(err_func != NULL); + assert(err_func != NULL); H5Eset_auto2(H5E_DEFAULT, err_func, NULL); err_func = NULL; } @@ -330,12 +330,12 @@ h5_restore_err(void) void h5_reset(void) { - HDfflush(stdout); - HDfflush(stderr); + fflush(stdout); + fflush(stderr); H5close(); /* Save current error stack reporting routine and redirect to our local one */ - HDassert(err_func == NULL); + assert(err_func == NULL); H5Eget_auto2(H5E_DEFAULT, &err_func, NULL); H5Eset_auto2(H5E_DEFAULT, h5_errors, NULL); @@ -390,12 +390,12 @@ h5_reset(void) void h5_test_init(void) { - HDfflush(stdout); - HDfflush(stderr); + fflush(stdout); + fflush(stderr); H5close(); /* Save current error stack reporting routine and redirect to our local one */ - HDassert(err_func == NULL); + assert(err_func == NULL); H5Eget_auto2(H5E_DEFAULT, &err_func, NULL); H5Eset_auto2(H5E_DEFAULT, h5_errors, NULL); } /* end h5_test_init() */ @@ -534,7 +534,7 @@ h5_fixname_real(const char *base_name, hid_t fapl, const char *_suffix, char *fu if (!base_name || !fullname || size < 1) return NULL; - HDmemset(fullname, 0, size); + memset(fullname, 0, size); /* Determine if driver is set by environment variable. If it is, * only generate a suffix if fixing the filename for the superblock @@ -626,13 +626,13 @@ h5_fixname_real(const char *base_name, hid_t fapl, const char *_suffix, char *fu MPI_Comm_rank(MPI_COMM_WORLD, &mpi_rank); if (mpi_rank == 0) - HDprintf("*** Hint ***\n" - "You can use environment variable HDF5_PARAPREFIX to " - "run parallel test files in a\n" - "different directory or to add file type prefix. e.g.,\n" - " HDF5_PARAPREFIX=pfs:/PFS/user/me\n" - " export HDF5_PARAPREFIX\n" - "*** End of Hint ***\n"); + printf("*** Hint ***\n" + "You can use environment variable HDF5_PARAPREFIX to " + "run parallel test files in a\n" + "different directory or to add file type prefix. e.g.,\n" + " HDF5_PARAPREFIX=pfs:/PFS/user/me\n" + " export HDF5_PARAPREFIX\n" + "*** End of Hint ***\n"); explained = TRUE; #ifdef HDF5_PARAPREFIX @@ -958,13 +958,13 @@ h5_show_hostname(void) if (mpi_initialized && !mpi_finalized) { MPI_Comm_rank(MPI_COMM_WORLD, &mpi_rank); - HDprintf("MPI-process %d.", mpi_rank); + printf("MPI-process %d.", mpi_rank); } else - HDprintf("thread 0."); + printf("thread 0."); } #else - HDprintf("thread %" PRIu64 ".", H5TS_thread_id()); + printf("thread %" PRIu64 ".", H5TS_thread_id()); #endif #ifdef H5_HAVE_WIN32_API @@ -989,11 +989,11 @@ h5_show_hostname(void) #endif #ifdef H5_HAVE_GETHOSTNAME if (HDgethostname(hostname, (size_t)80) < 0) - HDprintf(" gethostname failed\n"); + printf(" gethostname failed\n"); else - HDprintf(" hostname=%s\n", hostname); + printf(" hostname=%s\n", hostname); #else - HDprintf(" gethostname not supported\n"); + printf(" gethostname not supported\n"); #endif #ifdef H5_HAVE_WIN32_API WSACleanup(); @@ -1037,7 +1037,7 @@ h5_set_info_object(void) /* copy key/value pair into temporary buffer */ len = HDstrcspn(valp, ";"); next = &valp[len]; - if (NULL == (key_val = (char *)HDcalloc(1, len + 1))) + if (NULL == (key_val = (char *)calloc(1, len + 1))) return -1; /* increment the next pointer past the terminating semicolon */ @@ -1080,16 +1080,16 @@ h5_set_info_object(void) /* actually set the darned thing */ if (MPI_SUCCESS != MPI_Info_set(h5_io_info_g, namep, valp)) { - HDprintf("MPI_Info_set failed\n"); + printf("MPI_Info_set failed\n"); ret_value = -1; } } valp = next; - HDfree(key_val); + free(key_val); } while (next && *next); - HDfree(envp); + free(envp); } return ret_value; @@ -1109,17 +1109,17 @@ h5_dump_info_object(MPI_Info info) int flag; int i, nkeys; - HDprintf("Dumping MPI Info Object (up to %d bytes per item):\n", MPI_MAX_INFO_VAL); + printf("Dumping MPI Info Object (up to %d bytes per item):\n", MPI_MAX_INFO_VAL); if (info == MPI_INFO_NULL) { - HDprintf("object is MPI_INFO_NULL\n"); + printf("object is MPI_INFO_NULL\n"); } else { MPI_Info_get_nkeys(info, &nkeys); - HDprintf("object has %d items\n", nkeys); + printf("object has %d items\n", nkeys); for (i = 0; i < nkeys; i++) { MPI_Info_get_nthkey(info, i, key); MPI_Info_get(info, key, MPI_MAX_INFO_VAL, value, &flag); - HDprintf("%s=%s\n", key, value); + printf("%s=%s\n", key, value); } } } @@ -1208,7 +1208,7 @@ h5_get_file_size(const char *filename, hid_t fapl) } /* end for */ } else { - HDassert(HDstrlen(multi_letters) == H5FD_MEM_NTYPES); + assert(HDstrlen(multi_letters) == H5FD_MEM_NTYPES); for (mt = H5FD_MEM_DEFAULT; mt < H5FD_MEM_NTYPES; mt++) { /* Create the filename to query */ HDsnprintf(temp, sizeof temp, "%s-%c.h5", filename, multi_letters[mt]); @@ -1309,9 +1309,9 @@ print_func(const char *format, ...) va_list arglist; int ret_value; - HDva_start(arglist, format); + va_start(arglist, format); ret_value = HDvprintf(format, arglist); - HDva_end(arglist); + va_end(arglist); return ret_value; } @@ -1388,7 +1388,7 @@ getenv_all(MPI_Comm comm, int root, const char *name) int len; static char *env = NULL; - HDassert(name); + assert(name); MPI_Initialized(&mpi_initialized); MPI_Finalized(&mpi_finalized); @@ -1396,7 +1396,7 @@ getenv_all(MPI_Comm comm, int root, const char *name) if (mpi_initialized && !mpi_finalized) { MPI_Comm_rank(comm, &mpi_rank); MPI_Comm_size(comm, &mpi_size); - HDassert(root < mpi_size); + assert(root < mpi_size); /* The root task does the getenv call * and sends the result to the other tasks */ @@ -1417,16 +1417,16 @@ getenv_all(MPI_Comm comm, int root, const char *name) MPI_Bcast(&len, 1, MPI_INT, root, comm); if (len >= 0) { if (env == NULL) - env = (char *)HDmalloc((size_t)len + 1); + env = (char *)malloc((size_t)len + 1); else if (HDstrlen(env) < (size_t)len) - env = (char *)HDrealloc(env, (size_t)len + 1); + env = (char *)realloc(env, (size_t)len + 1); MPI_Bcast(env, len, MPI_CHAR, root, comm); env[len] = '\0'; } else { if (env) - HDfree(env); + free(env); env = NULL; } } @@ -1437,7 +1437,7 @@ getenv_all(MPI_Comm comm, int root, const char *name) else { /* use original getenv */ if (env) - HDfree(env); + free(env); env = HDgetenv(name); } /* end if */ @@ -1476,7 +1476,7 @@ h5_make_local_copy(const char *origfilename, const char *local_copy_name) goto error; /* Allocate copy buffer */ - if (NULL == (buf = HDcalloc((size_t)1, (size_t)READ_BUF_SIZE))) + if (NULL == (buf = calloc((size_t)1, (size_t)READ_BUF_SIZE))) goto error; /* Copy old file into temporary file */ @@ -1497,7 +1497,7 @@ h5_make_local_copy(const char *origfilename, const char *local_copy_name) goto error; /* Release memory */ - HDfree(buf); + free(buf); return 0; @@ -1507,7 +1507,7 @@ error: HDclose(fd_old); if (fd_new > 0) HDclose(fd_new); - HDfree(buf); + free(buf); return -1; } /* end h5_make_local_copy() */ @@ -1625,20 +1625,20 @@ h5_send_message(const char *send, const char *arg1, const char *arg2) FILE *signalfile = NULL; /* Create signal file (which will send signal to some other process) */ - signalfile = HDfopen(TMP_SIGNAL_FILE, "w+"); + signalfile = fopen(TMP_SIGNAL_FILE, "w+"); /* Write messages to signal file, if provided */ if (arg2 != NULL) { - HDassert(arg1); - HDfprintf(signalfile, "%s\n%s\n", arg1, arg2); + assert(arg1); + fprintf(signalfile, "%s\n%s\n", arg1, arg2); } /* end if */ else if (arg1 != NULL) { - HDassert(arg2 == NULL); - HDfprintf(signalfile, "%s\n", arg1); + assert(arg2 == NULL); + fprintf(signalfile, "%s\n", arg1); } /* end if */ else { - HDassert(arg1 == NULL); - HDassert(arg2 == NULL); + assert(arg1 == NULL); + assert(arg2 == NULL); } /* end else */ HDfclose(signalfile); @@ -1685,7 +1685,7 @@ h5_wait_message(const char *waitfor) HDtime(&t0); /* Wait for return signal from some other process */ - while ((returnfile = HDfopen(waitfor, "r")) == NULL) { + while ((returnfile = fopen(waitfor, "r")) == NULL) { /* make note of current time. */ HDtime(&t1); @@ -1694,7 +1694,7 @@ h5_wait_message(const char *waitfor) it was likely never sent and we should fail rather than loop infinitely */ if (HDdifftime(t1, t0) > MESSAGE_TIMEOUT) { - HDfprintf(stdout, "Error communicating between processes. Make sure test script is running.\n"); + fprintf(stdout, "Error communicating between processes. Make sure test script is running.\n"); TEST_ERROR; } /* end if */ } /* end while */ @@ -1838,17 +1838,17 @@ h5_get_dummy_vfd_class(void) H5FD_class_t *vfd_class = NULL; /* Dummy VFD that will be returned */ /* Create the class and initialize everything to zero/NULL */ - if (NULL == (vfd_class = (H5FD_class_t *)HDmalloc(sizeof(H5FD_class_t)))) + if (NULL == (vfd_class = (H5FD_class_t *)malloc(sizeof(H5FD_class_t)))) TEST_ERROR; /* Copy the dummy VFD */ - HDmemcpy(vfd_class, &H5FD_dummy_g, sizeof(H5FD_class_t)); + memcpy(vfd_class, &H5FD_dummy_g, sizeof(H5FD_class_t)); return vfd_class; error: if (vfd_class) - HDfree(vfd_class); + free(vfd_class); return NULL; } /* h5_get_dummy_vfd_class */ @@ -1878,7 +1878,7 @@ h5_get_dummy_vol_class(void) H5VL_class_t *vol_class = NULL; /* Dummy VOL class that will be returned */ /* Create the class and initialize everything to zero/NULL */ - if (NULL == (vol_class = (H5VL_class_t *)HDcalloc((size_t)1, sizeof(H5VL_class_t)))) + if (NULL == (vol_class = (H5VL_class_t *)calloc((size_t)1, sizeof(H5VL_class_t)))) TEST_ERROR; /* Fill in the minimum parameters to make a VOL connector class that @@ -1891,7 +1891,7 @@ h5_get_dummy_vol_class(void) error: if (vol_class) - HDfree(vol_class); + free(vol_class); return NULL; } /* h5_get_dummy_vol_class */ @@ -1935,15 +1935,15 @@ h5_compare_file_bytes(char *f1name, char *f2name) int ret_value = 0; /* for error handling */ /* Open files for reading */ - f1ptr = HDfopen(f1name, "rb"); + f1ptr = fopen(f1name, "rb"); if (f1ptr == NULL) { - HDfprintf(stderr, "Unable to fopen() %s\n", f1name); + fprintf(stderr, "Unable to fopen() %s\n", f1name); ret_value = -1; goto done; } - f2ptr = HDfopen(f2name, "rb"); + f2ptr = fopen(f2name, "rb"); if (f2ptr == NULL) { - HDfprintf(stderr, "Unable to fopen() %s\n", f2name); + fprintf(stderr, "Unable to fopen() %s\n", f2name); ret_value = -1; goto done; } @@ -1956,8 +1956,8 @@ h5_compare_file_bytes(char *f1name, char *f2name) f2size = HDftell(f2ptr); if (f1size != f2size) { - HDfprintf(stderr, "Files differ in size, %" PRIuHSIZE " vs. %" PRIuHSIZE "\n", (hsize_t)f1size, - (hsize_t)f2size); + fprintf(stderr, "Files differ in size, %" PRIuHSIZE " vs. %" PRIuHSIZE "\n", (hsize_t)f1size, + (hsize_t)f2size); ret_value = -1; goto done; } @@ -1975,7 +1975,7 @@ h5_compare_file_bytes(char *f1name, char *f2name) goto done; } if (f1char != f2char) { - HDfprintf(stderr, "Mismatch @ 0x%" PRIXHSIZE ": 0x%X != 0x%X\n", (hsize_t)ii, f1char, f2char); + fprintf(stderr, "Mismatch @ 0x%" PRIXHSIZE ": 0x%X != 0x%X\n", (hsize_t)ii, f1char, f2char); ret_value = -1; goto done; } @@ -2075,7 +2075,7 @@ h5_duplicate_file_by_bytes(const char *orig, const char *dest) max_buf = 4096 * sizeof(char); - orig_ptr = HDfopen(orig, "rb"); + orig_ptr = fopen(orig, "rb"); if (NULL == orig_ptr) { ret_value = -1; goto done; @@ -2085,14 +2085,14 @@ h5_duplicate_file_by_bytes(const char *orig, const char *dest) fsize = (hsize_t)HDftell(orig_ptr); HDrewind(orig_ptr); - dest_ptr = HDfopen(dest, "wb"); + dest_ptr = fopen(dest, "wb"); if (NULL == dest_ptr) { ret_value = -1; goto done; } read_size = MIN(fsize, max_buf); - dup_buf = HDmalloc(read_size); + dup_buf = malloc(read_size); if (NULL == dup_buf) { ret_value = -1; goto done; @@ -2114,7 +2114,7 @@ done: if (dest_ptr != NULL) HDfclose(dest_ptr); if (dup_buf != NULL) - HDfree(dup_buf); + free(dup_buf); return ret_value; } /* end h5_duplicate_file_by_bytes() */ @@ -2192,7 +2192,7 @@ h5_using_default_driver(const char *drv_name) { hbool_t ret_val = TRUE; - HDassert(H5_DEFAULT_VFD == H5FD_SEC2); + assert(H5_DEFAULT_VFD == H5FD_SEC2); if (!drv_name) drv_name = HDgetenv(HDF5_DRIVER); @@ -2224,8 +2224,8 @@ h5_using_parallel_driver(hid_t fapl_id, hbool_t *driver_is_parallel) hid_t driver_id = H5I_INVALID_HID; herr_t ret_value = SUCCEED; - HDassert(fapl_id >= 0); - HDassert(driver_is_parallel); + assert(fapl_id >= 0); + assert(driver_is_parallel); if (fapl_id == H5P_DEFAULT) fapl_id = H5P_FILE_ACCESS_DEFAULT; @@ -2267,8 +2267,8 @@ h5_driver_is_default_vfd_compatible(hid_t fapl_id, hbool_t *default_vfd_compatib hid_t driver_id = H5I_INVALID_HID; herr_t ret_value = SUCCEED; - HDassert(fapl_id >= 0); - HDassert(default_vfd_compatible); + assert(fapl_id >= 0); + assert(default_vfd_compatible); if (fapl_id == H5P_DEFAULT) fapl_id = H5P_FILE_ACCESS_DEFAULT; diff --git a/test/hdfs.c b/test/hdfs.c index bf8e840..a2b2444 100644 --- a/test/hdfs.c +++ b/test/hdfs.c @@ -102,7 +102,7 @@ */ #define JSFAILED_AT() \ { \ - HDprintf("*FAILED* at %s:%d in %s()...\n", __FILE__, __LINE__, __func__); \ + printf("*FAILED* at %s:%d in %s()...\n", __FILE__, __LINE__, __func__); \ } /*---------------------------------------------------------------------------- @@ -193,10 +193,10 @@ { \ JSFAILED_AT() \ if (reason != NULL) { \ - HDprintf("%s\n", (reason)); \ + printf("%s\n", (reason)); \ } \ else { \ - HDprintf(" ! Expected %ld\n ! Actual %ld\n", (long)(expected), (long)(actual)); \ + printf(" ! Expected %ld\n ! Actual %ld\n", (long)(expected), (long)(actual)); \ } \ } @@ -233,10 +233,10 @@ const char *_reason = reason; \ JSFAILED_AT() \ if (_reason != NULL) { \ - HDprintf("%s\n", _reason); \ + printf("%s\n", _reason); \ } \ else { \ - HDprintf("!!! Expected:\n%s\n!!!Actual:\n%s\n", (expected), (actual)); \ + printf("!!! Expected:\n%s\n!!!Actual:\n%s\n", (expected), (actual)); \ } \ } @@ -413,7 +413,7 @@ test_fapl_config_validation(void) TESTING("HDFS fapl configuration validation"); SKIPPED(); HDputs(" HDFS VFD is not enabled"); - HDfflush(stdout); + fflush(stdout); return 0; #else @@ -621,7 +621,7 @@ test_hdfs_fapl(void) TESTING("HDFS fapl "); SKIPPED(); HDputs(" HDFS VFD is not enabled"); - HDfflush(stdout); + fflush(stdout); return 0; #else @@ -707,7 +707,7 @@ test_vfd_open(void) TESTING("HDFS VFD-level open"); SKIPPED(); HDputs(" HDFS VFD is not enabled"); - HDfflush(stdout); + fflush(stdout); return 0; #else @@ -855,7 +855,7 @@ test_vfd_open(void) } #if HDFS_TEST_DEBUG - HDfprintf(stderr, "testing: %s\n", T.message); + fprintf(stderr, "testing: %s\n", T.message); #endif /* HDFS_TEST_DEBUG */ H5E_BEGIN_TRY @@ -865,9 +865,9 @@ test_vfd_open(void) H5E_END_TRY; if (NULL != fd) { if (TRUE == T.might_use_other_driver && H5FD_HDFS != fd->driver_id) { - HDfprintf(stderr, "\n!!!!! WARNING !!!!!\n" - " Successful open of file on local system " - "with non-HDFS VFD.\n"); + fprintf(stderr, "\n!!!!! WARNING !!!!!\n" + " Successful open of file on local system " + "with non-HDFS VFD.\n"); JSVERIFY(SUCCEED, H5FDclose(fd), "unable to close errant open"); fd = NULL; } @@ -880,7 +880,7 @@ test_vfd_open(void) FAIL_IF(NULL != fd) /* sanity check */ #if HDFS_TEST_DEBUG - HDfprintf(stderr, "nominal open\n"); + fprintf(stderr, "nominal open\n"); #endif /* HDFS_TEST_DEBUG */ /* finally, show that a file can be opened @@ -893,7 +893,7 @@ test_vfd_open(void) ************/ #if HDFS_TEST_DEBUG - HDfprintf(stderr, "teardown...\n"); + fprintf(stderr, "teardown...\n"); #endif /* HDFS_TEST_DEBUG */ FAIL_IF(FAIL == H5FDclose(fd)) @@ -963,7 +963,7 @@ test_eof_eoa(void) TESTING("HDFS eof/eoa gets and sets"); SKIPPED(); HDputs(" HDFS VFD is not enabled"); - HDfflush(stdout); + fflush(stdout); return 0; #else @@ -1076,7 +1076,7 @@ test_H5FDread_without_eoa_set_fails(void) TESTING("HDFS VFD read-eoa temporal coupling library limitation"); SKIPPED(); HDputs(" HDFS VFD is not enabled"); - HDfflush(stdout); + fflush(stdout); return 0; #else @@ -1178,7 +1178,7 @@ test_read(void) TESTING("HDFS VFD read/range-gets"); SKIPPED(); HDputs(" HDFS VFD is not enabled"); - HDfflush(stdout); + fflush(stdout); return 0; #else @@ -1388,7 +1388,7 @@ test_noops_and_autofails(void) TESTING("HDFS VFD always-fail and no-op routines"); SKIPPED(); HDputs(" HDFS VFD is not enabled"); - HDfflush(stdout); + fflush(stdout); return 0; #else @@ -1499,7 +1499,7 @@ test_cmp(void) { TESTING("HDFS cmp (comparison)"); SKIPPED(); - HDfprintf(stderr, " TODO: Distinct valid fapls to open the same file.\n"); + fprintf(stderr, " TODO: Distinct valid fapls to open the same file.\n"); return 0; @@ -1530,7 +1530,7 @@ test_H5F_integration(void) TESTING("HDFS file access through HD5F library (H5F API)"); SKIPPED(); HDputs(" HDFS VFD is not enabled"); - HDfflush(stdout); + fflush(stdout); return 0; #else @@ -1597,8 +1597,8 @@ error: ***********/ #if HDFS_TEST_DEBUG - HDprintf("\nerror!"); - HDfflush(stdout); + printf("\nerror!"); + fflush(stdout); #endif /* HDFS_TEST_DEBUG */ if (fapl_id >= 0) { @@ -1657,7 +1657,7 @@ main(void) h5_reset(); - HDprintf("Testing hdfs VFD functionality.\n"); + printf("Testing hdfs VFD functionality.\n"); nerrors += test_fapl_config_validation(); nerrors += test_hdfs_fapl(); @@ -1670,11 +1670,11 @@ main(void) nerrors += test_H5F_integration(); if (nerrors > 0) { - HDprintf("***** %d hdfs TEST%s FAILED! *****\n", nerrors, nerrors > 1 ? "S" : ""); + printf("***** %d hdfs TEST%s FAILED! *****\n", nerrors, nerrors > 1 ? "S" : ""); nerrors = 1; } else { - HDprintf("All hdfs tests passed.\n"); + printf("All hdfs tests passed.\n"); } return nerrors; /* 0 if no errors, 1 if any errors */ diff --git a/test/hyperslab.c b/test/hyperslab.c index b17293f..5203b7c 100644 --- a/test/hyperslab.c +++ b/test/hyperslab.c @@ -82,19 +82,19 @@ print_array(uint8_t *array, size_t nx, size_t ny, size_t nz) for (i = 0; i < nx; i++) { if (nz > 1) - HDprintf("i=%lu:\n", (unsigned long)i); + printf("i=%lu:\n", (unsigned long)i); else - HDprintf("%03lu:", (unsigned long)i); + printf("%03lu:", (unsigned long)i); for (j = 0; j < ny; j++) { if (nz > 1) - HDprintf("%03lu:", (unsigned long)j); + printf("%03lu:", (unsigned long)j); for (k = 0; k < nz; k++) - HDprintf(" %3d", *array++); + printf(" %3d", *array++); if (nz > 1) - HDprintf("\n"); + printf("\n"); } /* end for */ - HDprintf("\n"); + printf("\n"); } /* end for */ } /* end print_array() */ @@ -117,11 +117,11 @@ print_ref(size_t nx, size_t ny, size_t nz) { uint8_t *array; - if (NULL != (array = (uint8_t *)HDmalloc(nx * ny * nz))) { - HDprintf("Reference array:\n"); + if (NULL != (array = (uint8_t *)malloc(nx * ny * nz))) { + printf("Reference array:\n"); init_full(array, nx, ny, nz); print_array(array, nx, ny, nz); - HDfree(array); + free(array); } /* end if */ } /* end print_ref() */ @@ -175,11 +175,11 @@ test_fill(size_t nx, size_t ny, size_t nz, size_t di, size_t dj, size_t dk, size HDsnprintf(dim, sizeof(dim), "%lux%lux%lu", (unsigned long)nx, (unsigned long)ny, (unsigned long)nz); } /* end else */ HDsnprintf(s, sizeof(s), "Testing hyperslab fill %-11s variable hyperslab", dim); - HDprintf("%-70s", s); - HDfflush(stdout); + printf("%-70s", s); + fflush(stdout); /* Allocate array */ - if (NULL == (dst = (uint8_t *)HDcalloc((size_t)1, nx * ny * nz))) + if (NULL == (dst = (uint8_t *)calloc((size_t)1, nx * ny * nz))) TEST_ERROR; init_full(dst, nx, ny, nz); @@ -235,15 +235,15 @@ test_fill(size_t nx, size_t ny, size_t nz, size_t di, size_t dj, size_t dk, size * is going directly to a terminal. */ AT(); - HDprintf(" acc != ref_value\n"); - HDprintf(" i=%lu, j=%lu, k=%lu, " - "dx=%lu, dy=%lu, dz=%lu, " - "fill=%d\n", - (unsigned long)i, (unsigned long)j, (unsigned long)k, - (unsigned long)dx, (unsigned long)dy, (unsigned long)dz, - fill_value); + printf(" acc != ref_value\n"); + printf(" i=%lu, j=%lu, k=%lu, " + "dx=%lu, dy=%lu, dz=%lu, " + "fill=%d\n", + (unsigned long)i, (unsigned long)j, (unsigned long)k, + (unsigned long)dx, (unsigned long)dy, (unsigned long)dz, + fill_value); print_ref(nx, ny, nz); - HDprintf("\n Result is:\n"); + printf("\n Result is:\n"); print_array(dst, nx, ny, nz); } /* end if */ goto error; @@ -258,13 +258,13 @@ test_fill(size_t nx, size_t ny, size_t nz, size_t di, size_t dj, size_t dk, size PASSED(); - HDfree(dst); + free(dst); return SUCCEED; error: if (dst) - HDfree(dst); + free(dst); return FAIL; } /* end test_fill() */ @@ -364,15 +364,15 @@ test_copy(int mode, size_t nx, size_t ny, size_t nz, size_t di, size_t dj, size_ } /* end switch */ HDsnprintf(s, sizeof(s), "Testing hyperslab copy %-11s %s", dim, sub); - HDprintf("%-70s", s); - HDfflush(stdout); + printf("%-70s", s); + fflush(stdout); /* * Allocate arrays */ - if (NULL == (src = (uint8_t *)HDcalloc((size_t)1, nx * ny * nz))) + if (NULL == (src = (uint8_t *)calloc((size_t)1, nx * ny * nz))) TEST_ERROR; - if (NULL == (dst = (uint8_t *)HDcalloc((size_t)1, nx * ny * nz))) + if (NULL == (dst = (uint8_t *)calloc((size_t)1, nx * ny * nz))) TEST_ERROR; init_full(src, nx, ny, nz); @@ -469,13 +469,13 @@ test_copy(int mode, size_t nx, size_t ny, size_t nz, size_t di, size_t dj, size_ * going directly to a terminal. */ AT(); - HDprintf(" acc != ref_value\n"); - HDprintf(" i=%lu, j=%lu, k=%lu, " - "dx=%lu, dy=%lu, dz=%lu\n", - (unsigned long)i, (unsigned long)j, (unsigned long)k, - (unsigned long)dx, (unsigned long)dy, (unsigned long)dz); + printf(" acc != ref_value\n"); + printf(" i=%lu, j=%lu, k=%lu, " + "dx=%lu, dy=%lu, dz=%lu\n", + (unsigned long)i, (unsigned long)j, (unsigned long)k, + (unsigned long)dx, (unsigned long)dy, (unsigned long)dz); print_ref(nx, ny, nz); - HDprintf("\n Destination array is:\n"); + printf("\n Destination array is:\n"); print_array(dst, nx, ny, nz); } /* end if */ goto error; @@ -506,14 +506,14 @@ test_copy(int mode, size_t nx, size_t ny, size_t nz, size_t di, size_t dj, size_ * going directly to a terminal. */ AT(); - HDprintf(" acc != ref_value + nx*ny*nz - " - "dx*dy*dz\n"); - HDprintf(" i=%lu, j=%lu, k=%lu, " - "dx=%lu, dy=%lu, dz=%lu\n", - (unsigned long)i, (unsigned long)j, (unsigned long)k, - (unsigned long)dx, (unsigned long)dy, (unsigned long)dz); + printf(" acc != ref_value + nx*ny*nz - " + "dx*dy*dz\n"); + printf(" i=%lu, j=%lu, k=%lu, " + "dx=%lu, dy=%lu, dz=%lu\n", + (unsigned long)i, (unsigned long)j, (unsigned long)k, + (unsigned long)dx, (unsigned long)dy, (unsigned long)dz); print_ref(nx, ny, nz); - HDprintf("\n Destination array is:\n"); + printf("\n Destination array is:\n"); print_array(dst, nx, ny, nz); } /* end if */ goto error; @@ -527,16 +527,16 @@ test_copy(int mode, size_t nx, size_t ny, size_t nz, size_t di, size_t dj, size_ PASSED(); - HDfree(src); - HDfree(dst); + free(src); + free(dst); return SUCCEED; error: if (src) - HDfree(src); + free(src); if (dst) - HDfree(dst); + free(dst); return FAIL; } /* end test_copy() */ @@ -573,13 +573,13 @@ test_multifill(size_t nx) } fill, *src = NULL, *dst = NULL; hsize_t i, j; - HDprintf("%-70s", "Testing multi-byte fill value"); - HDfflush(stdout); + printf("%-70s", "Testing multi-byte fill value"); + fflush(stdout); /* Initialize the source and destination */ - if (NULL == (src = (struct a_struct *)HDmalloc(nx * sizeof(*src)))) + if (NULL == (src = (struct a_struct *)malloc(nx * sizeof(*src)))) TEST_ERROR; - if (NULL == (dst = (struct a_struct *)HDmalloc(nx * sizeof(*dst)))) + if (NULL == (dst = (struct a_struct *)malloc(nx * sizeof(*dst)))) TEST_ERROR; for (i = 0; i < nx; i++) { @@ -630,14 +630,14 @@ test_multifill(size_t nx) H5_FAILED(); if (!HDisatty(1)) { AT(); - HDprintf(" fill={%d,%g,%d}\n ", fill.left, fill.mid, fill.right); + printf(" fill={%d,%g,%d}\n ", fill.left, fill.mid, fill.right); for (j = 0; j < sizeof(fill); j++) - HDprintf(" %02x", ((uint8_t *)&fill)[j]); - HDprintf("\n dst[%lu]={%d,%g,%d}\n ", (unsigned long)i, dst[i].left, dst[i].mid, - dst[i].right); + printf(" %02x", ((uint8_t *)&fill)[j]); + printf("\n dst[%lu]={%d,%g,%d}\n ", (unsigned long)i, dst[i].left, dst[i].mid, + dst[i].right); for (j = 0; j < sizeof(dst[i]); j++) - HDprintf(" %02x", ((uint8_t *)(dst + i))[j]); - HDprintf("\n"); + printf(" %02x", ((uint8_t *)(dst + i))[j]); + printf("\n"); } /* end if */ goto error; } /* end if */ @@ -645,16 +645,16 @@ test_multifill(size_t nx) PASSED(); - HDfree(src); - HDfree(dst); + free(src); + free(dst); return SUCCEED; error: if (src) - HDfree(src); + free(src); if (dst) - HDfree(dst); + free(dst); return FAIL; } /* end test_multifill() */ @@ -685,13 +685,13 @@ test_endian(size_t nx) hsize_t size[2]; /*size vector */ hsize_t i, j; - HDprintf("%-70s", "Testing endian conversion by stride"); - HDfflush(stdout); + printf("%-70s", "Testing endian conversion by stride"); + fflush(stdout); /* Initialize arrays */ - if (NULL == (src = (uint8_t *)HDmalloc(nx * 4))) + if (NULL == (src = (uint8_t *)malloc(nx * 4))) TEST_ERROR; - if (NULL == (dst = (uint8_t *)HDcalloc(nx, (size_t)4))) + if (NULL == (dst = (uint8_t *)calloc(nx, (size_t)4))) TEST_ERROR; init_full(src, nx, (size_t)4, (size_t)1); @@ -718,10 +718,10 @@ test_endian(size_t nx) * to a terminal. */ AT(); - HDprintf(" i=%lu, j=%lu\n", (unsigned long)i, (unsigned long)j); - HDprintf(" Source array is:\n"); + printf(" i=%lu, j=%lu\n", (unsigned long)i, (unsigned long)j); + printf(" Source array is:\n"); print_array(src, nx, (size_t)4, (size_t)1); - HDprintf("\n Result is:\n"); + printf("\n Result is:\n"); print_array(dst, nx, (size_t)4, (size_t)1); } /* end if */ goto error; @@ -731,16 +731,16 @@ test_endian(size_t nx) PASSED(); - HDfree(src); - HDfree(dst); + free(src); + free(dst); return SUCCEED; error: if (src) - HDfree(src); + free(src); if (dst) - HDfree(dst); + free(dst); return FAIL; } /* end test_endian() */ @@ -772,13 +772,13 @@ test_transpose(size_t nx, size_t ny) HDsnprintf(s, sizeof(s), "Testing 2d transpose by stride %4lux%-lud", (unsigned long)nx, (unsigned long)ny); - HDprintf("%-70s", s); - HDfflush(stdout); + printf("%-70s", s); + fflush(stdout); /* Initialize */ - if (NULL == (src = (int *)HDmalloc(nx * ny * sizeof(*src)))) + if (NULL == (src = (int *)malloc(nx * ny * sizeof(*src)))) TEST_ERROR; - if (NULL == (dst = (int *)HDcalloc(nx * ny, sizeof(*dst)))) + if (NULL == (dst = (int *)calloc(nx * ny, sizeof(*dst)))) TEST_ERROR; for (i = 0; i < nx; i++) @@ -803,20 +803,20 @@ test_transpose(size_t nx, size_t ny) H5_FAILED(); if (!HDisatty(1)) { AT(); - HDprintf(" diff at i=%lu, j=%lu\n", (unsigned long)i, (unsigned long)j); - HDprintf(" Source is:\n"); + printf(" diff at i=%lu, j=%lu\n", (unsigned long)i, (unsigned long)j); + printf(" Source is:\n"); for (i = 0; i < nx; i++) { - HDprintf("%3lu:", (unsigned long)i); + printf("%3lu:", (unsigned long)i); for (j = 0; j < ny; j++) - HDprintf(" %6d", src[i * ny + j]); - HDprintf("\n"); + printf(" %6d", src[i * ny + j]); + printf("\n"); } /* end for */ - HDprintf("\n Destination is:\n"); + printf("\n Destination is:\n"); for (i = 0; i < ny; i++) { - HDprintf("%3lu:", (unsigned long)i); + printf("%3lu:", (unsigned long)i); for (j = 0; j < nx; j++) - HDprintf(" %6d", dst[i * nx + j]); - HDprintf("\n"); + printf(" %6d", dst[i * nx + j]); + printf("\n"); } /* end for */ } /* end if */ goto error; @@ -826,16 +826,16 @@ test_transpose(size_t nx, size_t ny) PASSED(); - HDfree(src); - HDfree(dst); + free(src); + free(dst); return SUCCEED; error: if (src) - HDfree(src); + free(src); if (dst) - HDfree(dst); + free(dst); return FAIL; } /* end test_transpose() */ @@ -871,15 +871,15 @@ test_sub_super(size_t nx, size_t ny) HDsnprintf(s, sizeof(s), "Testing image sampling %4lux%-4lu to %4lux%-4lu ", (unsigned long)(2 * nx), (unsigned long)(2 * ny), (unsigned long)nx, (unsigned long)ny); - HDprintf("%-70s", s); - HDfflush(stdout); + printf("%-70s", s); + fflush(stdout); /* Initialize */ - if (NULL == (full = (uint8_t *)HDmalloc(4 * nx * ny))) + if (NULL == (full = (uint8_t *)malloc(4 * nx * ny))) TEST_ERROR; - if (NULL == (half = (uint8_t *)HDcalloc((size_t)1, nx * ny))) + if (NULL == (half = (uint8_t *)calloc((size_t)1, nx * ny))) TEST_ERROR; - if (NULL == (twice = (uint8_t *)HDcalloc((size_t)4, nx * ny))) + if (NULL == (twice = (uint8_t *)calloc((size_t)4, nx * ny))) TEST_ERROR; init_full(full, 2 * nx, 2 * ny, (size_t)1); @@ -902,11 +902,11 @@ test_sub_super(size_t nx, size_t ny) H5_FAILED(); if (!HDisatty(1)) { AT(); - HDprintf(" full[%lu][%lu] != half[%lu][%lu]\n", (unsigned long)i * 2, - (unsigned long)j * 2, (unsigned long)i, (unsigned long)j); - HDprintf(" full is:\n"); + printf(" full[%lu][%lu] != half[%lu][%lu]\n", (unsigned long)i * 2, + (unsigned long)j * 2, (unsigned long)i, (unsigned long)j); + printf(" full is:\n"); print_array(full, 2 * nx, 2 * ny, (size_t)1); - HDprintf("\n half is:\n"); + printf("\n half is:\n"); print_array(half, nx, ny, (size_t)1); } /* end if */ goto error; @@ -921,8 +921,8 @@ test_sub_super(size_t nx, size_t ny) */ HDsnprintf(s, sizeof(s), "Testing image sampling %4lux%-4lu to %4lux%-4lu ", (unsigned long)nx, (unsigned long)ny, (unsigned long)(2 * nx), (unsigned long)(2 * ny)); - HDprintf("%-70s", s); - HDfflush(stdout); + printf("%-70s", s); + fflush(stdout); /* Setup stride */ size[0] = nx; @@ -961,9 +961,9 @@ test_sub_super(size_t nx, size_t ny) H5_FAILED(); if (!HDisatty(1)) { AT(); - HDprintf(" %s\n Half is:\n", s); + printf(" %s\n Half is:\n", s); print_array(half, nx, ny, (size_t)1); - HDprintf("\n Twice is:\n"); + printf("\n Twice is:\n"); print_array(twice, 2 * nx, 2 * ny, (size_t)1); } /* end if */ goto error; @@ -973,19 +973,19 @@ test_sub_super(size_t nx, size_t ny) PASSED(); - HDfree(full); - HDfree(half); - HDfree(twice); + free(full); + free(half); + free(twice); return SUCCEED; error: if (full) - HDfree(full); + free(full); if (half) - HDfree(half); + free(half); if (twice) - HDfree(twice); + free(twice); return FAIL; } /* test_sub_super() */ @@ -1018,7 +1018,7 @@ test_array_fill(size_t lo, size_t hi) TESTING(s); /* Initialize */ - if (NULL == (dst = (int *)HDcalloc(sizeof(int), ARRAY_FILL_SIZE * hi))) + if (NULL == (dst = (int *)calloc(sizeof(int), ARRAY_FILL_SIZE * hi))) TEST_ERROR; /* Setup */ @@ -1035,18 +1035,18 @@ test_array_fill(size_t lo, size_t hi) if (dst[(u * ARRAY_FILL_SIZE) + v] != src[v]) TEST_ERROR; - HDmemset(dst, 0, sizeof(int) * ARRAY_FILL_SIZE * w); + memset(dst, 0, sizeof(int) * ARRAY_FILL_SIZE * w); } /* end for */ PASSED(); - HDfree(dst); + free(dst); return SUCCEED; error: if (dst) - HDfree(dst); + free(dst); return FAIL; } /* end test_array_fill() */ @@ -1083,7 +1083,7 @@ test_array_offset_n_calc(size_t n, size_t x, size_t y, size_t z) TESTING(s); /* Initialize */ - if (NULL == (a = (hsize_t *)HDmalloc(sizeof(hsize_t) * x * y * z))) + if (NULL == (a = (hsize_t *)malloc(sizeof(hsize_t) * x * y * z))) TEST_ERROR; dims[0] = z; @@ -1117,21 +1117,21 @@ test_array_offset_n_calc(size_t n, size_t x, size_t y, size_t z) /* Check computed coordinates */ for (v = 0; v < ARRAY_OFFSET_NDIMS; v++) if (coords[v] != new_coords[v]) { - HDfprintf(stderr, "coords[%zu]=%" PRIuHSIZE ", new_coords[%zu]=%" PRIuHSIZE "\n", v, - coords[v], v, new_coords[v]); + fprintf(stderr, "coords[%zu]=%" PRIuHSIZE ", new_coords[%zu]=%" PRIuHSIZE "\n", v, coords[v], + v, new_coords[v]); TEST_ERROR; } /* end if */ } /* end for */ PASSED(); - HDfree(a); + free(a); return SUCCEED; error: if (a) - HDfree(a); + free(a); return FAIL; } /* end test_array_offset_n_calc() */ @@ -1169,18 +1169,18 @@ main(int argc, char *argv[]) else if (!HDstrcmp(argv[i], "medium")) size_of_test |= TEST_MEDIUM; else { - HDprintf("unrecognized argument: %s\n", argv[i]); - HDexit(EXIT_FAILURE); + printf("unrecognized argument: %s\n", argv[i]); + exit(EXIT_FAILURE); } /* end else */ } /* end for */ } /* end else */ - HDprintf("Test sizes: "); + printf("Test sizes: "); if (size_of_test & TEST_SMALL) - HDprintf(" SMALL"); + printf(" SMALL"); if (size_of_test & TEST_MEDIUM) - HDprintf(" MEDIUM"); - HDprintf("\n"); + printf(" MEDIUM"); + printf("\n"); /* Set the random # seed */ HDsrandom((unsigned)HDtime(NULL)); @@ -1384,17 +1384,17 @@ main(int argc, char *argv[]) /*--- END OF TESTS ---*/ if (nerrors) { - HDprintf("***** %d HYPERSLAB TEST%s FAILED! *****\n", nerrors, 1 == nerrors ? "" : "S"); + printf("***** %d HYPERSLAB TEST%s FAILED! *****\n", nerrors, 1 == nerrors ? "" : "S"); if (HDisatty(1)) - HDprintf("(Redirect output to a pager or a file to see debug output)\n"); - HDexit(EXIT_FAILURE); + printf("(Redirect output to a pager or a file to see debug output)\n"); + exit(EXIT_FAILURE); } /* end if */ - HDprintf("All hyperslab tests passed.\n"); + printf("All hyperslab tests passed.\n"); #ifdef H5_HAVE_THREADSAFE H5close(); #endif /* H5_HAVE_THREADSAFE */ - HDexit(EXIT_SUCCESS); + exit(EXIT_SUCCESS); } diff --git a/test/istore.c b/test/istore.c index b688acd..b2d8a69 100644 --- a/test/istore.c +++ b/test/istore.c @@ -103,22 +103,22 @@ print_array(uint8_t *array, size_t nx, size_t ny, size_t nz) for (i = 0; i < nx; i++) { if (nz > 1) { - HDfprintf(stderr, "i=%lu:\n", (unsigned long)i); + fprintf(stderr, "i=%lu:\n", (unsigned long)i); } else { - HDfprintf(stderr, "%03lu:", (unsigned long)i); + fprintf(stderr, "%03lu:", (unsigned long)i); } for (j = 0; j < ny; j++) { if (nz > 1) - HDfprintf(stderr, "%03lu:", (unsigned long)j); + fprintf(stderr, "%03lu:", (unsigned long)j); for (k = 0; k < nz; k++) { - HDfprintf(stderr, " %3d", *array++); + fprintf(stderr, " %3d", *array++); } if (nz > 1) - HDfprintf(stderr, "\n"); + fprintf(stderr, "\n"); } - HDfprintf(stderr, "\n"); + fprintf(stderr, "\n"); } } @@ -273,9 +273,9 @@ test_extend(hid_t f, const char *prefix, size_t nx, size_t ny, size_t nz) HDsnprintf(s, sizeof(s), "istore extend: %s", dims); TESTING(s); - buf = (uint8_t *)HDmalloc(nx * ny * nz); - check = (uint8_t *)HDmalloc(nx * ny * nz); - whole = (uint8_t *)HDcalloc((size_t)1, nx * ny * nz); + buf = (uint8_t *)malloc(nx * ny * nz); + check = (uint8_t *)malloc(nx * ny * nz); + whole = (uint8_t *)calloc((size_t)1, nx * ny * nz); whole_size[0] = nx; whole_size[1] = ny; @@ -287,7 +287,7 @@ test_extend(hid_t f, const char *prefix, size_t nx, size_t ny, size_t nz) /* Build the new empty object */ HDsnprintf(name, sizeof(name), "%s_%s", prefix, dims); if ((dataset = new_object(f, name, ndims, whole_size, whole_size)) < 0) { - HDfprintf(stderr, " Cannot create %u-d object `%s'\n", ndims, name); + fprintf(stderr, " Cannot create %u-d object `%s'\n", ndims, name); goto error; } @@ -320,7 +320,7 @@ test_extend(hid_t f, const char *prefix, size_t nx, size_t ny, size_t nz) /* Fill the source array */ if (0 == nelmts) continue; - HDmemset(buf, (signed)(128 + ctr), (size_t)nelmts); + memset(buf, (signed)(128 + ctr), (size_t)nelmts); /* Create dataspace for selection in memory */ if ((mspace = H5Screate_simple(1, &nelmts, NULL)) < 0) @@ -333,23 +333,23 @@ test_extend(hid_t f, const char *prefix, size_t nx, size_t ny, size_t nz) /* Write to disk */ if (H5Dwrite(dataset, TEST_DATATYPE, mspace, fspace, H5P_DEFAULT, buf) < 0) { H5_FAILED(); - HDfprintf(stderr, " Write failed: ctr=%lu\n", (unsigned long)ctr); + fprintf(stderr, " Write failed: ctr=%lu\n", (unsigned long)ctr); goto error; } /* Read from disk */ - HDmemset(check, 0xff, (size_t)nelmts); + memset(check, 0xff, (size_t)nelmts); if (H5Dread(dataset, TEST_DATATYPE, mspace, fspace, H5P_DEFAULT, check) < 0) { H5_FAILED(); - HDfprintf(stderr, " Read failed: ctr=%lu\n", (unsigned long)ctr); + fprintf(stderr, " Read failed: ctr=%lu\n", (unsigned long)ctr); goto error; } - if (HDmemcmp(buf, check, (size_t)nelmts) != 0) { + if (memcmp(buf, check, (size_t)nelmts) != 0) { H5_FAILED(); - HDfprintf(stderr, " Read check failed: ctr=%lu\n", (unsigned long)ctr); - HDfprintf(stderr, " Wrote:\n"); + fprintf(stderr, " Read check failed: ctr=%lu\n", (unsigned long)ctr); + fprintf(stderr, " Wrote:\n"); print_array(buf, (size_t)size[0], (size_t)size[1], (size_t)size[2]); - HDfprintf(stderr, " Read:\n"); + fprintf(stderr, " Read:\n"); print_array(check, (size_t)size[0], (size_t)size[1], (size_t)size[2]); goto error; } @@ -368,10 +368,10 @@ test_extend(hid_t f, const char *prefix, size_t nx, size_t ny, size_t nz) } /* Now read the entire array back out and check it */ - HDmemset(buf, 0xff, nx * ny * nz); + memset(buf, 0xff, nx * ny * nz); if (H5Dread(dataset, TEST_DATATYPE, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) { H5_FAILED(); - HDfprintf(stderr, " Read failed for whole array.\n"); + fprintf(stderr, " Read failed for whole array.\n"); goto error; } for (i = 0; i < nx; i++) { @@ -379,16 +379,16 @@ test_extend(hid_t f, const char *prefix, size_t nx, size_t ny, size_t nz) for (k = 0; k < nz; k++) { if (whole[i * ny * nz + j * nz + k] != buf[i * ny * nz + j * nz + k]) { H5_FAILED(); - HDfprintf(stderr, " Check failed at i=%lu", (unsigned long)i); + fprintf(stderr, " Check failed at i=%lu", (unsigned long)i); if (ndims > 1) { - HDfprintf(stderr, ", j=%lu", (unsigned long)j); + fprintf(stderr, ", j=%lu", (unsigned long)j); } if (ndims > 2) { - HDfprintf(stderr, ", k=%lu", (unsigned long)k); + fprintf(stderr, ", k=%lu", (unsigned long)k); } - HDfprintf(stderr, "\n Check array is:\n"); + fprintf(stderr, "\n Check array is:\n"); print_array(whole, nx, ny, nz); - HDfprintf(stderr, " Value read is:\n"); + fprintf(stderr, " Value read is:\n"); print_array(buf, nx, ny, nz); goto error; } @@ -405,17 +405,17 @@ test_extend(hid_t f, const char *prefix, size_t nx, size_t ny, size_t nz) TEST_ERROR; /* Free memory used */ - HDfree(buf); - HDfree(check); - HDfree(whole); + free(buf); + free(check); + free(whole); PASSED(); return SUCCEED; error: - HDfree(buf); - HDfree(check); - HDfree(whole); + free(buf); + free(check); + free(whole); return FAIL; } @@ -473,8 +473,8 @@ test_sparse(hid_t f, const char *prefix, size_t nblocks, size_t nx, size_t ny, s SKIPPED(); return SUCCEED; } - buf = (uint8_t *)HDmalloc(nx * ny * nz); - HDmemset(buf, 128, nx * ny * nz); + buf = (uint8_t *)malloc(nx * ny * nz); + memset(buf, 128, nx * ny * nz); /* Set dimensions of dataset */ for (u = 0; u < (size_t)ndims; u++) @@ -488,7 +488,7 @@ test_sparse(hid_t f, const char *prefix, size_t nblocks, size_t nx, size_t ny, s /* Build the new empty object */ HDsnprintf(name, sizeof(name), "%s_%s", prefix, dims); if ((dataset = new_object(f, name, ndims, whole_size, chunk_dims)) < 0) { - HDprintf(" Cannot create %u-d object `%s'\n", ndims, name); + printf(" Cannot create %u-d object `%s'\n", ndims, name); goto error; } @@ -512,18 +512,18 @@ test_sparse(hid_t f, const char *prefix, size_t nblocks, size_t nx, size_t ny, s /* write to disk */ if (H5Dwrite(dataset, TEST_DATATYPE, mspace, fspace, H5P_DEFAULT, buf) < 0) { H5_FAILED(); - HDprintf(" Write failed: ctr=%lu\n", (unsigned long)ctr); - HDprintf(" offset=(%lu", (unsigned long)(offset[0])); + printf(" Write failed: ctr=%lu\n", (unsigned long)ctr); + printf(" offset=(%lu", (unsigned long)(offset[0])); if (ndims > 1) - HDprintf(",%lu", (unsigned long)(offset[1])); + printf(",%lu", (unsigned long)(offset[1])); if (ndims > 2) - HDprintf(",%lu", (unsigned long)(offset[2])); - HDprintf("), size=(%lu", (unsigned long)(size[0])); + printf(",%lu", (unsigned long)(offset[2])); + printf("), size=(%lu", (unsigned long)(size[0])); if (ndims > 1) - HDprintf(",%lu", (unsigned long)(size[1])); + printf(",%lu", (unsigned long)(size[1])); if (ndims > 2) - HDprintf(",%lu", (unsigned long)(size[2])); - HDprintf(")\n"); + printf(",%lu", (unsigned long)(size[2])); + printf(")\n"); goto error; } @@ -542,12 +542,12 @@ test_sparse(hid_t f, const char *prefix, size_t nblocks, size_t nx, size_t ny, s if (H5Dclose(dataset) < 0) TEST_ERROR; - HDfree(buf); + free(buf); PASSED(); return SUCCEED; error: - HDfree(buf); + free(buf); return FAIL; } @@ -592,18 +592,18 @@ main(int argc, char *argv[]) size_of_test |= TEST_LARGE; } else { - HDprintf("unrecognized argument: %s\n", argv[i]); + printf("unrecognized argument: %s\n", argv[i]); } } } - HDprintf("Test sizes: "); + printf("Test sizes: "); if (size_of_test & TEST_SMALL) - HDprintf(" SMALL"); + printf(" SMALL"); if (size_of_test & TEST_MEDIUM) - HDprintf(" MEDIUM"); + printf(" MEDIUM"); if (size_of_test & TEST_LARGE) - HDprintf(" LARGE"); - HDprintf("\n"); + printf(" LARGE"); + printf("\n"); /* Set the random # seed */ HDsrandom((unsigned)HDtime(NULL)); @@ -625,8 +625,8 @@ main(int argc, char *argv[]) /* Create the test file */ h5_fixname(FILENAME[0], fapl, filename, sizeof filename); if ((file = H5Fcreate(filename, H5F_ACC_TRUNC, fcpl, fapl)) < 0) { - HDprintf("Cannot create file %s; test aborted\n", filename); - HDexit(EXIT_FAILURE); + printf("Cannot create file %s; test aborted\n", filename); + exit(EXIT_FAILURE); } /* Initialize chunk dimensions */ @@ -680,7 +680,7 @@ main(int argc, char *argv[]) */ status = test_sparse(file, "sparse", (size_t)800, (size_t)50, (size_t)50, (size_t)50, skip_test); if (skip_test) - HDprintf(" The current VFD does not support sparse files on this platform.\n"); + printf(" The current VFD does not support sparse files on this platform.\n"); nerrors += status < 0 ? 1 : 0; } @@ -692,13 +692,13 @@ main(int argc, char *argv[]) nerrors += (h5_verify_cached_stabs(FILENAME, fapl) < 0 ? 1 : 0); if (nerrors) { - HDprintf("***** %d I-STORE TEST%s FAILED! *****\n", nerrors, 1 == nerrors ? "" : "S"); - HDexit(EXIT_FAILURE); + printf("***** %d I-STORE TEST%s FAILED! *****\n", nerrors, 1 == nerrors ? "" : "S"); + exit(EXIT_FAILURE); } - HDprintf("All i-store tests passed.\n"); + printf("All i-store tests passed.\n"); h5_cleanup(FILENAME, fapl); - HDexit(EXIT_SUCCESS); + exit(EXIT_SUCCESS); } diff --git a/test/lheap.c b/test/lheap.c index 7db032e..f79e1b5 100644 --- a/test/lheap.c +++ b/test/lheap.c @@ -157,9 +157,9 @@ main(void) if (HDstrcmp(s, buf) != 0) { H5_FAILED(); - HDprintf(" i=%d, heap offset=%lu\n", i, (unsigned long)(obj[i])); - HDprintf(" got: \"%s\"\n", s); - HDprintf(" ans: \"%s\"\n", buf); + printf(" i=%d, heap offset=%lu\n", i, (unsigned long)(obj[i])); + printf(" got: \"%s\"\n", s); + printf(" ans: \"%s\"\n", buf); goto error; } @@ -194,7 +194,7 @@ main(void) } else { H5_FAILED(); - HDprintf("***cannot open the pre-created non-default sizes test file (%s)\n", testfile); + printf("***cannot open the pre-created non-default sizes test file (%s)\n", testfile); goto error; } /* end else */ } diff --git a/test/links.c b/test/links.c index 9e4d2e3..bfc3252 100644 --- a/test/links.c +++ b/test/links.c @@ -639,7 +639,7 @@ cklinks(hid_t fapl, hbool_t new_format) FAIL_STACK_ERROR; if (H5O_TYPE_DATASET != oinfo2.type) { H5_FAILED(); - HDprintf(" %d: Unexpected object type should have been a dataset\n", __LINE__); + printf(" %d: Unexpected object type should have been a dataset\n", __LINE__); TEST_ERROR; } /* end if */ @@ -689,7 +689,7 @@ cklinks(hid_t fapl, hbool_t new_format) FAIL_STACK_ERROR; if (H5O_TYPE_DATASET != oinfo2.type) { H5_FAILED(); - HDprintf(" %d: Unexpected object type should have been a dataset\n", __LINE__); + printf(" %d: Unexpected object type should have been a dataset\n", __LINE__); TEST_ERROR; } /* end if */ if (H5Otoken_cmp(file, &oinfo1.token, &oinfo2.token, &token_cmp) < 0) @@ -725,12 +725,12 @@ cklinks(hid_t fapl, hbool_t new_format) FAIL_STACK_ERROR; if (H5L_TYPE_SOFT != linfo.type) { H5_FAILED(); - HDprintf(" %d: Unexpected object type should have been a symbolic link\n", __LINE__); + printf(" %d: Unexpected object type should have been a symbolic link\n", __LINE__); TEST_ERROR; } /* end if */ if (H5Lget_val(file, "grp1/dangle", linkval, sizeof linkval, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" %d: Can't retrieve link value\n", __LINE__); + printf(" %d: Can't retrieve link value\n", __LINE__); TEST_ERROR; } /* end if */ if (HDstrcmp(linkval, "foobar") != 0) { @@ -756,12 +756,12 @@ cklinks(hid_t fapl, hbool_t new_format) FAIL_STACK_ERROR; if (H5L_TYPE_SOFT != linfo.type) { H5_FAILED(); - HDprintf(" %d: Unexpected object type should have been a symbolic link\n", __LINE__); + printf(" %d: Unexpected object type should have been a symbolic link\n", __LINE__); TEST_ERROR; } /* end if */ if (H5Lget_val(file, "grp1/recursive", linkval, sizeof linkval, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" %d: Can't retrieve link value\n", __LINE__); + printf(" %d: Can't retrieve link value\n", __LINE__); TEST_ERROR; } /* end if */ if (HDstrcmp(linkval, "/grp1/recursive") != 0) { @@ -824,7 +824,7 @@ ck_new_links(hid_t fapl, hbool_t new_format) /* Check hard links */ if (H5O_TYPE_DATASET != oi_hard1.type || H5O_TYPE_DATASET != oi_hard2.type) { H5_FAILED(); - HDprintf(" %d: Unexpected object type should have been a dataset\n", __LINE__); + printf(" %d: Unexpected object type should have been a dataset\n", __LINE__); TEST_ERROR; } @@ -884,7 +884,7 @@ long_links(hid_t fapl, hbool_t new_format) TEST_ERROR; /* Construct very long file name */ - if ((objname = (char *)HDmalloc((size_t)(MAX_NAME_LEN + 1))) == NULL) + if ((objname = (char *)malloc((size_t)(MAX_NAME_LEN + 1))) == NULL) TEST_ERROR; for (u = 0; u < MAX_NAME_LEN; u++) objname[u] = 'a'; @@ -912,7 +912,7 @@ long_links(hid_t fapl, hbool_t new_format) TEST_ERROR; /* Release memory */ - HDfree(objname); + free(objname); PASSED(); return SUCCEED; @@ -925,7 +925,7 @@ error: H5Fclose(fid); } H5E_END_TRY; - HDfree(objname); + free(objname); return FAIL; } @@ -955,7 +955,7 @@ toomany(hid_t fapl, hbool_t new_format) /* XXX: should probably make a "generic" test that creates the proper * # of links based on this value - QAK */ - HDassert(H5L_NUM_LINKS == 16); + assert(H5L_NUM_LINKS == 16); /* Create file */ h5_fixname(FILENAME[1], fapl, filename, sizeof filename); @@ -2019,7 +2019,7 @@ test_deprec(hid_t fapl, hbool_t new_format) if (H5Gget_objinfo(file_id, "/group1/link_to_group2", TRUE, &sb_hard2) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(&sb_hard1.objno, sb_hard2.objno, sizeof(sb_hard1.objno)) != 0) { + if (memcmp(&sb_hard1.objno, sb_hard2.objno, sizeof(sb_hard1.objno)) != 0) { H5_FAILED(); HDputs(" Hard link test failed. Link seems not to point to the "); HDputs(" expected file location."); @@ -2032,7 +2032,7 @@ test_deprec(hid_t fapl, hbool_t new_format) if (H5Gget_objinfo(file_id, "/group2/link_to_group1", TRUE, &sb_hard2) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(&sb_hard1.objno, sb_hard2.objno, sizeof(sb_hard1.objno)) != 0) { + if (memcmp(&sb_hard1.objno, sb_hard2.objno, sizeof(sb_hard1.objno)) != 0) { H5_FAILED(); HDputs(" Hard link test failed. Link seems not to point to the "); HDputs(" expected file location."); @@ -2162,7 +2162,7 @@ cklinks_deprec(hid_t fapl, hbool_t new_format) FAIL_STACK_ERROR; if (H5O_TYPE_DATASET != oinfo2.type) { H5_FAILED(); - HDprintf(" %d: Unexpected object type should have been a dataset\n", __LINE__); + printf(" %d: Unexpected object type should have been a dataset\n", __LINE__); TEST_ERROR; } /* end if */ if (H5F_addr_ne(oinfo1.addr, oinfo2.addr)) { @@ -2207,7 +2207,7 @@ cklinks_deprec(hid_t fapl, hbool_t new_format) FAIL_STACK_ERROR; if (H5O_TYPE_DATASET != oinfo2.type) { H5_FAILED(); - HDprintf(" %d: Unexpected object type should have been a dataset\n", __LINE__); + printf(" %d: Unexpected object type should have been a dataset\n", __LINE__); TEST_ERROR; } /* end if */ if (H5F_addr_ne(oinfo1.addr, oinfo2.addr)) { @@ -2241,12 +2241,12 @@ cklinks_deprec(hid_t fapl, hbool_t new_format) FAIL_STACK_ERROR; if (H5L_TYPE_SOFT != linfo.type) { H5_FAILED(); - HDprintf(" %d: Unexpected object type should have been a symbolic link\n", __LINE__); + printf(" %d: Unexpected object type should have been a symbolic link\n", __LINE__); TEST_ERROR; } /* end if */ if (H5Lget_val(file, "grp1/dangle", linkval, sizeof linkval, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" %d: Can't retrieve link value\n", __LINE__); + printf(" %d: Can't retrieve link value\n", __LINE__); TEST_ERROR; } /* end if */ if (HDstrcmp(linkval, "foobar") != 0) { @@ -2272,12 +2272,12 @@ cklinks_deprec(hid_t fapl, hbool_t new_format) FAIL_STACK_ERROR; if (H5L_TYPE_SOFT != linfo.type) { H5_FAILED(); - HDprintf(" %d: Unexpected object type should have been a symbolic link\n", __LINE__); + printf(" %d: Unexpected object type should have been a symbolic link\n", __LINE__); TEST_ERROR; } /* end if */ if (H5Lget_val(file, "grp1/recursive", linkval, sizeof linkval, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf(" %d: Can't retrieve link value\n", __LINE__); + printf(" %d: Can't retrieve link value\n", __LINE__); TEST_ERROR; } /* end if */ if (HDstrcmp(linkval, "/grp1/recursive") != 0) { @@ -4148,7 +4148,7 @@ lapl_nlinks_deprec(hid_t fapl, hbool_t new_format) /* XXX: should probably make a "generic" test that creates the proper * # of links based on this value - QAK */ - HDassert(H5L_NUM_LINKS == 16); + assert(H5L_NUM_LINKS == 16); /* Create file */ h5_fixname(FILENAME[1], fapl, filename, sizeof filename); @@ -4867,7 +4867,7 @@ link_info_by_idx_check_deprec(hid_t group_id, const char *linkname, hsize_t n, h HDsnprintf(valname, sizeof(valname), "value %02u", (unsigned)n); /* Verify the link information for first link, in increasing creation order */ - HDmemset(&linfo, 0, sizeof(linfo)); + memset(&linfo, 0, sizeof(linfo)); if (H5Lget_info_by_idx1(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)0, &linfo, H5P_DEFAULT) < 0) TEST_ERROR; @@ -4875,7 +4875,7 @@ link_info_by_idx_check_deprec(hid_t group_id, const char *linkname, hsize_t n, h TEST_ERROR; /* Verify the link information for new link, in increasing creation order */ - HDmemset(&linfo, 0, sizeof(linfo)); + memset(&linfo, 0, sizeof(linfo)); if (H5Lget_info_by_idx1(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, n, &linfo, H5P_DEFAULT) < 0) TEST_ERROR; if (linfo.corder != (int64_t)n) @@ -4883,7 +4883,7 @@ link_info_by_idx_check_deprec(hid_t group_id, const char *linkname, hsize_t n, h /* Verify value for new soft link, in increasing creation order */ if (!hard_link) { - HDmemset(tmpval, 0, (size_t)NAME_BUF_SIZE); + memset(tmpval, 0, (size_t)NAME_BUF_SIZE); if (H5Lget_val_by_idx(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, n, tmpval, (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR; @@ -4892,7 +4892,7 @@ link_info_by_idx_check_deprec(hid_t group_id, const char *linkname, hsize_t n, h } /* end if */ /* Verify the name for new link, in increasing creation order */ - HDmemset(tmpname, 0, (size_t)NAME_BUF_SIZE); + memset(tmpname, 0, (size_t)NAME_BUF_SIZE); if (H5Lget_name_by_idx(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, n, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR; @@ -4905,7 +4905,7 @@ link_info_by_idx_check_deprec(hid_t group_id, const char *linkname, hsize_t n, h */ if (use_index) { /* Verify the link information for first link, in native creation order (which is increasing) */ - HDmemset(&linfo, 0, sizeof(linfo)); + memset(&linfo, 0, sizeof(linfo)); if (H5Lget_info_by_idx1(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_NATIVE, (hsize_t)0, &linfo, H5P_DEFAULT) < 0) TEST_ERROR; @@ -4913,7 +4913,7 @@ link_info_by_idx_check_deprec(hid_t group_id, const char *linkname, hsize_t n, h TEST_ERROR; /* Verify the link information for new link, in native creation order (which is increasing) */ - HDmemset(&linfo, 0, sizeof(linfo)); + memset(&linfo, 0, sizeof(linfo)); if (H5Lget_info_by_idx1(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_NATIVE, n, &linfo, H5P_DEFAULT) < 0) TEST_ERROR; @@ -4922,7 +4922,7 @@ link_info_by_idx_check_deprec(hid_t group_id, const char *linkname, hsize_t n, h /* Verify value for new soft link, in native creation order (which is increasing) */ if (!hard_link) { - HDmemset(tmpval, 0, (size_t)NAME_BUF_SIZE); + memset(tmpval, 0, (size_t)NAME_BUF_SIZE); if (H5Lget_val_by_idx(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_NATIVE, n, tmpval, (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR; @@ -4931,7 +4931,7 @@ link_info_by_idx_check_deprec(hid_t group_id, const char *linkname, hsize_t n, h } /* end if */ /* Verify the name for new link, in native creation order (which is increasing) */ - HDmemset(tmpname, 0, (size_t)NAME_BUF_SIZE); + memset(tmpname, 0, (size_t)NAME_BUF_SIZE); if (H5Lget_name_by_idx(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_NATIVE, n, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR; @@ -4940,14 +4940,14 @@ link_info_by_idx_check_deprec(hid_t group_id, const char *linkname, hsize_t n, h } /* end if */ /* Verify the link information for first link, in decreasing creation order */ - HDmemset(&linfo, 0, sizeof(linfo)); + memset(&linfo, 0, sizeof(linfo)); if (H5Lget_info_by_idx1(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, n, &linfo, H5P_DEFAULT) < 0) TEST_ERROR; if (linfo.corder != 0) TEST_ERROR; /* Verify the link information for new link, in decreasing creation order */ - HDmemset(&linfo, 0, sizeof(linfo)); + memset(&linfo, 0, sizeof(linfo)); if (H5Lget_info_by_idx1(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, (hsize_t)0, &linfo, H5P_DEFAULT) < 0) TEST_ERROR; @@ -4956,7 +4956,7 @@ link_info_by_idx_check_deprec(hid_t group_id, const char *linkname, hsize_t n, h /* Verify value for new soft link, in decreasing creation order */ if (!hard_link) { - HDmemset(tmpval, 0, (size_t)NAME_BUF_SIZE); + memset(tmpval, 0, (size_t)NAME_BUF_SIZE); if (H5Lget_val_by_idx(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, (hsize_t)0, tmpval, (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR; @@ -4965,7 +4965,7 @@ link_info_by_idx_check_deprec(hid_t group_id, const char *linkname, hsize_t n, h } /* end if */ /* Verify the name for new link, in decreasing creation order */ - HDmemset(tmpname, 0, (size_t)NAME_BUF_SIZE); + memset(tmpname, 0, (size_t)NAME_BUF_SIZE); if (H5Lget_name_by_idx(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, (hsize_t)0, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR; @@ -4973,14 +4973,14 @@ link_info_by_idx_check_deprec(hid_t group_id, const char *linkname, hsize_t n, h TEST_ERROR; /* Verify the link information for first link, in increasing link name order */ - HDmemset(&linfo, 0, sizeof(linfo)); + memset(&linfo, 0, sizeof(linfo)); if (H5Lget_info_by_idx1(group_id, ".", H5_INDEX_NAME, H5_ITER_INC, (hsize_t)0, &linfo, H5P_DEFAULT) < 0) TEST_ERROR; if (linfo.corder != 0) TEST_ERROR; /* Verify the link information for new link, in increasing link name order */ - HDmemset(&linfo, 0, sizeof(linfo)); + memset(&linfo, 0, sizeof(linfo)); if (H5Lget_info_by_idx1(group_id, ".", H5_INDEX_NAME, H5_ITER_INC, n, &linfo, H5P_DEFAULT) < 0) TEST_ERROR; if (linfo.corder != (int64_t)n) @@ -4988,7 +4988,7 @@ link_info_by_idx_check_deprec(hid_t group_id, const char *linkname, hsize_t n, h /* Verify value for new soft link, in increasing link name order */ if (!hard_link) { - HDmemset(tmpval, 0, (size_t)NAME_BUF_SIZE); + memset(tmpval, 0, (size_t)NAME_BUF_SIZE); if (H5Lget_val_by_idx(group_id, ".", H5_INDEX_NAME, H5_ITER_INC, n, tmpval, (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR; @@ -4997,7 +4997,7 @@ link_info_by_idx_check_deprec(hid_t group_id, const char *linkname, hsize_t n, h } /* end if */ /* Verify the name for new link, in increasing link name order */ - HDmemset(tmpname, 0, (size_t)NAME_BUF_SIZE); + memset(tmpname, 0, (size_t)NAME_BUF_SIZE); if (H5Lget_name_by_idx(group_id, ".", H5_INDEX_NAME, H5_ITER_INC, n, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR; @@ -5009,14 +5009,14 @@ link_info_by_idx_check_deprec(hid_t group_id, const char *linkname, hsize_t n, h */ /* Verify the link information for first link, in decreasing link name order */ - HDmemset(&linfo, 0, sizeof(linfo)); + memset(&linfo, 0, sizeof(linfo)); if (H5Lget_info_by_idx1(group_id, ".", H5_INDEX_NAME, H5_ITER_DEC, n, &linfo, H5P_DEFAULT) < 0) TEST_ERROR; if (linfo.corder != 0) TEST_ERROR; /* Verify the link information for new link, in decreasing link name order */ - HDmemset(&linfo, 0, sizeof(linfo)); + memset(&linfo, 0, sizeof(linfo)); if (H5Lget_info_by_idx1(group_id, ".", H5_INDEX_NAME, H5_ITER_DEC, (hsize_t)0, &linfo, H5P_DEFAULT) < 0) TEST_ERROR; if (linfo.corder != (int64_t)n) @@ -5024,7 +5024,7 @@ link_info_by_idx_check_deprec(hid_t group_id, const char *linkname, hsize_t n, h /* Verify value for new soft link, in decreasing link name order */ if (!hard_link) { - HDmemset(tmpval, 0, (size_t)NAME_BUF_SIZE); + memset(tmpval, 0, (size_t)NAME_BUF_SIZE); if (H5Lget_val_by_idx(group_id, ".", H5_INDEX_NAME, H5_ITER_DEC, (hsize_t)0, tmpval, (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR; @@ -5033,7 +5033,7 @@ link_info_by_idx_check_deprec(hid_t group_id, const char *linkname, hsize_t n, h } /* end if */ /* Verify the name for new link, in decreasing link name order */ - HDmemset(tmpname, 0, (size_t)NAME_BUF_SIZE); + memset(tmpname, 0, (size_t)NAME_BUF_SIZE); if (H5Lget_name_by_idx(group_id, ".", H5_INDEX_NAME, H5_ITER_DEC, (hsize_t)0, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR; @@ -5648,7 +5648,7 @@ delete_by_idx_deprec(hid_t fapl) TEST_ERROR; /* Verify the link information for first link in appropriate order */ - HDmemset(&linfo, 0, sizeof(linfo)); + memset(&linfo, 0, sizeof(linfo)); if (H5Lget_info_by_idx1(group_id, ".", idx_type, order, (hsize_t)0, &linfo, H5P_DEFAULT) < 0) TEST_ERROR; @@ -5662,7 +5662,7 @@ delete_by_idx_deprec(hid_t fapl) } /* end else */ /* Verify the name for first link in appropriate order */ - HDmemset(tmpname, 0, (size_t)NAME_BUF_SIZE); + memset(tmpname, 0, (size_t)NAME_BUF_SIZE); if (H5Lget_name_by_idx(group_id, ".", idx_type, order, (hsize_t)0, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR; @@ -5722,7 +5722,7 @@ delete_by_idx_deprec(hid_t fapl) TEST_ERROR; /* Verify the link information for first link in appropriate order */ - HDmemset(&linfo, 0, sizeof(linfo)); + memset(&linfo, 0, sizeof(linfo)); if (H5Lget_info_by_idx1(group_id, ".", idx_type, order, (hsize_t)0, &linfo, H5P_DEFAULT) < 0) TEST_ERROR; @@ -5736,7 +5736,7 @@ delete_by_idx_deprec(hid_t fapl) } /* end else */ /* Verify the name for first link in appropriate order */ - HDmemset(tmpname, 0, (size_t)NAME_BUF_SIZE); + memset(tmpname, 0, (size_t)NAME_BUF_SIZE); if (H5Lget_name_by_idx(group_id, ".", idx_type, order, (hsize_t)0, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR; @@ -5800,7 +5800,7 @@ delete_by_idx_deprec(hid_t fapl) TEST_ERROR; /* Verify the link information for current link in appropriate order */ - HDmemset(&linfo, 0, sizeof(linfo)); + memset(&linfo, 0, sizeof(linfo)); if (H5Lget_info_by_idx1(group_id, ".", idx_type, order, (hsize_t)u, &linfo, H5P_DEFAULT) < 0) TEST_ERROR; @@ -5814,7 +5814,7 @@ delete_by_idx_deprec(hid_t fapl) } /* end else */ /* Verify the name for current link in appropriate order */ - HDmemset(tmpname, 0, (size_t)NAME_BUF_SIZE); + memset(tmpname, 0, (size_t)NAME_BUF_SIZE); if (H5Lget_name_by_idx(group_id, ".", idx_type, order, (hsize_t)u, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR; @@ -5834,7 +5834,7 @@ delete_by_idx_deprec(hid_t fapl) TEST_ERROR; /* Verify the link information for first link in appropriate order */ - HDmemset(&linfo, 0, sizeof(linfo)); + memset(&linfo, 0, sizeof(linfo)); if (H5Lget_info_by_idx1(group_id, ".", idx_type, order, (hsize_t)0, &linfo, H5P_DEFAULT) < 0) TEST_ERROR; @@ -5848,7 +5848,7 @@ delete_by_idx_deprec(hid_t fapl) } /* end else */ /* Verify the name for first link in appropriate order */ - HDmemset(tmpname, 0, (size_t)NAME_BUF_SIZE); + memset(tmpname, 0, (size_t)NAME_BUF_SIZE); if (H5Lget_name_by_idx(group_id, ".", idx_type, order, (hsize_t)0, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR; @@ -6003,7 +6003,7 @@ delete_by_idx_old_deprec(hid_t fapl) TEST_ERROR; /* Verify the link information for first link in appropriate order */ - HDmemset(&linfo, 0, sizeof(linfo)); + memset(&linfo, 0, sizeof(linfo)); if (H5Lget_info_by_idx1(group_id, ".", H5_INDEX_NAME, order, (hsize_t)0, &linfo, H5P_DEFAULT) < 0) TEST_ERROR; if (order == H5_ITER_INC) { @@ -6016,7 +6016,7 @@ delete_by_idx_old_deprec(hid_t fapl) } /* end else */ /* Verify the name for first link in appropriate order */ - HDmemset(tmpname, 0, (size_t)NAME_BUF_SIZE); + memset(tmpname, 0, (size_t)NAME_BUF_SIZE); if (H5Lget_name_by_idx(group_id, ".", H5_INDEX_NAME, order, (hsize_t)0, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR; @@ -6077,7 +6077,7 @@ delete_by_idx_old_deprec(hid_t fapl) TEST_ERROR; /* Verify the link information for current link in appropriate order */ - HDmemset(&linfo, 0, sizeof(linfo)); + memset(&linfo, 0, sizeof(linfo)); if (H5Lget_info_by_idx1(group_id, ".", H5_INDEX_NAME, order, (hsize_t)u, &linfo, H5P_DEFAULT) < 0) TEST_ERROR; if (order == H5_ITER_INC) { @@ -6090,7 +6090,7 @@ delete_by_idx_old_deprec(hid_t fapl) } /* end else */ /* Verify the name for current link in appropriate order */ - HDmemset(tmpname, 0, (size_t)NAME_BUF_SIZE); + memset(tmpname, 0, (size_t)NAME_BUF_SIZE); if (H5Lget_name_by_idx(group_id, ".", H5_INDEX_NAME, order, (hsize_t)u, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR; @@ -6111,7 +6111,7 @@ delete_by_idx_old_deprec(hid_t fapl) TEST_ERROR; /* Verify the link information for first link in appropriate order */ - HDmemset(&linfo, 0, sizeof(linfo)); + memset(&linfo, 0, sizeof(linfo)); if (H5Lget_info_by_idx1(group_id, ".", H5_INDEX_NAME, order, (hsize_t)0, &linfo, H5P_DEFAULT) < 0) TEST_ERROR; if (order == H5_ITER_INC) { @@ -6124,7 +6124,7 @@ delete_by_idx_old_deprec(hid_t fapl) } /* end else */ /* Verify the name for first link in appropriate order */ - HDmemset(tmpname, 0, (size_t)NAME_BUF_SIZE); + memset(tmpname, 0, (size_t)NAME_BUF_SIZE); if (H5Lget_name_by_idx(group_id, ".", H5_INDEX_NAME, order, (hsize_t)0, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR; @@ -6295,7 +6295,7 @@ link_iterate_check_deprec(hid_t group_id, H5_index_t idx_type, H5_iter_order_t o iter_info->stop = -1; iter_info->ncalled = 0; iter_info->curr = order != H5_ITER_DEC ? 0 : (max_links - 1); - HDmemset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); if (H5Literate1(group_id, idx_type, order, &skip, link_iterate_deprec_cb, iter_info) < 0) TEST_ERROR; @@ -6312,7 +6312,7 @@ link_iterate_check_deprec(hid_t group_id, H5_index_t idx_type, H5_iter_order_t o iter_info->stop = -1; iter_info->ncalled = 0; iter_info->curr = order != H5_ITER_DEC ? 0 : (max_links - 1); - HDmemset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); if (H5Giterate(group_id, ".", &gskip, group_iterate_deprec_cb, iter_info) < 0) TEST_ERROR; @@ -6329,7 +6329,7 @@ link_iterate_check_deprec(hid_t group_id, H5_index_t idx_type, H5_iter_order_t o iter_info->stop = -1; iter_info->ncalled = 0; iter_info->curr = (int64_t)(order != H5_ITER_DEC ? skip : ((max_links - 1) - skip)); - HDmemset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); if (H5Literate1(group_id, idx_type, order, &skip, link_iterate_deprec_cb, iter_info) < 0) TEST_ERROR; @@ -6349,7 +6349,7 @@ link_iterate_check_deprec(hid_t group_id, H5_index_t idx_type, H5_iter_order_t o else { unsigned nvisit = 0; /* # of links visited */ - HDassert(order == H5_ITER_NATIVE); + assert(order == H5_ITER_NATIVE); for (v = 0; v < max_links; v++) if (iter_info->visited[v] == TRUE) nvisit++; @@ -6364,7 +6364,7 @@ link_iterate_check_deprec(hid_t group_id, H5_index_t idx_type, H5_iter_order_t o iter_info->stop = -1; iter_info->ncalled = 0; iter_info->curr = order != H5_ITER_DEC ? (unsigned)gskip : ((max_links - 1) - (unsigned)gskip); - HDmemset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); if (H5Giterate(group_id, ".", &gskip, group_iterate_deprec_cb, iter_info) < 0) TEST_ERROR; @@ -6384,7 +6384,7 @@ link_iterate_check_deprec(hid_t group_id, H5_index_t idx_type, H5_iter_order_t o else { unsigned nvisit = 0; /* # of links visited */ - HDassert(order == H5_ITER_NATIVE); + assert(order == H5_ITER_NATIVE); for (v = 0; v < max_links; v++) if (iter_info->visited[v] == TRUE) nvisit++; @@ -6399,7 +6399,7 @@ link_iterate_check_deprec(hid_t group_id, H5_index_t idx_type, H5_iter_order_t o iter_info->stop = 3; iter_info->ncalled = 0; iter_info->curr = order != H5_ITER_DEC ? 0 : (max_links - 1); - HDmemset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); if ((ret = H5Literate1(group_id, idx_type, order, &skip, link_iterate_deprec_cb, iter_info)) < 0) TEST_ERROR; if (ret != CORDER_ITER_STOP) @@ -6413,7 +6413,7 @@ link_iterate_check_deprec(hid_t group_id, H5_index_t idx_type, H5_iter_order_t o iter_info->stop = 3; iter_info->ncalled = 0; iter_info->curr = order != H5_ITER_DEC ? 0 : (max_links - 1); - HDmemset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); if ((ret = H5Giterate(group_id, ".", &gskip, group_iterate_deprec_cb, iter_info)) < 0) TEST_ERROR; if (ret != CORDER_ITER_STOP) @@ -6481,7 +6481,7 @@ link_iterate_deprec(hid_t fapl) /* Allocate the "visited link" array */ iter_info.max_visit = max_compact * 2; - if (NULL == (visited = (hbool_t *)HDmalloc(sizeof(hbool_t) * iter_info.max_visit))) + if (NULL == (visited = (hbool_t *)malloc(sizeof(hbool_t) * iter_info.max_visit))) TEST_ERROR; iter_info.visited = visited; @@ -6510,7 +6510,7 @@ link_iterate_deprec(hid_t fapl) "creation order index using deprecated routines"); } /* end else */ else { - HDassert(order == H5_ITER_NATIVE); + assert(order == H5_ITER_NATIVE); if (use_index) TESTING("iterating over links by creation order index in native order w/creation " "order index using deprecated routines"); @@ -6537,7 +6537,7 @@ link_iterate_deprec(hid_t fapl) "order index using deprecated routines"); } /* end else */ else { - HDassert(order == H5_ITER_NATIVE); + assert(order == H5_ITER_NATIVE); if (use_index) TESTING("iterating over links by name index in native order w/creation order " "index using deprecated routines"); @@ -6653,7 +6653,7 @@ link_iterate_deprec(hid_t fapl) /* Free resources */ if (visited) - HDfree(visited); + free(visited); return SUCCEED; @@ -6668,7 +6668,7 @@ error: H5E_END_TRY; if (visited) - HDfree(visited); + free(visited); return FAIL; } /* end link_iterate_deprec() */ @@ -6778,7 +6778,7 @@ link_iterate_old_check_deprec(hid_t group_id, H5_iter_order_t order, unsigned ma iter_info->stop = -1; iter_info->ncalled = 0; iter_info->curr = order != H5_ITER_DEC ? 0 : (max_links - 1); - HDmemset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); if (H5Literate1(group_id, H5_INDEX_NAME, order, &skip, link_iterate_old_deprec_cb, iter_info) < 0) TEST_ERROR; @@ -6795,7 +6795,7 @@ link_iterate_old_check_deprec(hid_t group_id, H5_iter_order_t order, unsigned ma iter_info->stop = -1; iter_info->ncalled = 0; iter_info->curr = order != H5_ITER_DEC ? 0 : (max_links - 1); - HDmemset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); if (H5Giterate(group_id, ".", &gskip, group_iterate_old_deprec_cb, iter_info) < 0) TEST_ERROR; @@ -6812,7 +6812,7 @@ link_iterate_old_check_deprec(hid_t group_id, H5_iter_order_t order, unsigned ma iter_info->stop = -1; iter_info->ncalled = 0; iter_info->curr = (int64_t)(order != H5_ITER_DEC ? skip : ((max_links - 1) - skip)); - HDmemset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); if (H5Literate1(group_id, H5_INDEX_NAME, order, &skip, link_iterate_old_deprec_cb, iter_info) < 0) TEST_ERROR; @@ -6832,7 +6832,7 @@ link_iterate_old_check_deprec(hid_t group_id, H5_iter_order_t order, unsigned ma else { unsigned nvisit = 0; /* # of links visited */ - HDassert(order == H5_ITER_NATIVE); + assert(order == H5_ITER_NATIVE); for (v = 0; v < max_links; v++) if (iter_info->visited[v] == TRUE) nvisit++; @@ -6847,7 +6847,7 @@ link_iterate_old_check_deprec(hid_t group_id, H5_iter_order_t order, unsigned ma iter_info->stop = -1; iter_info->ncalled = 0; iter_info->curr = order != H5_ITER_DEC ? (unsigned)gskip : ((max_links - 1) - (unsigned)gskip); - HDmemset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); if (H5Giterate(group_id, ".", &gskip, group_iterate_old_deprec_cb, iter_info) < 0) TEST_ERROR; @@ -6867,7 +6867,7 @@ link_iterate_old_check_deprec(hid_t group_id, H5_iter_order_t order, unsigned ma else { unsigned nvisit = 0; /* # of links visited */ - HDassert(order == H5_ITER_NATIVE); + assert(order == H5_ITER_NATIVE); for (v = 0; v < max_links; v++) if (iter_info->visited[v] == TRUE) nvisit++; @@ -6882,7 +6882,7 @@ link_iterate_old_check_deprec(hid_t group_id, H5_iter_order_t order, unsigned ma iter_info->stop = 3; iter_info->ncalled = 0; iter_info->curr = order != H5_ITER_DEC ? 0 : (max_links - 1); - HDmemset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); if ((ret = H5Literate1(group_id, H5_INDEX_NAME, order, &skip, link_iterate_old_deprec_cb, iter_info)) < 0) TEST_ERROR; if (ret != CORDER_ITER_STOP) @@ -6896,7 +6896,7 @@ link_iterate_old_check_deprec(hid_t group_id, H5_iter_order_t order, unsigned ma iter_info->stop = 3; iter_info->ncalled = 0; iter_info->curr = order != H5_ITER_DEC ? 0 : (max_links - 1); - HDmemset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); if ((ret = H5Giterate(group_id, ".", &gskip, group_iterate_old_deprec_cb, iter_info)) < 0) TEST_ERROR; if (ret != CORDER_ITER_STOP) @@ -6964,7 +6964,7 @@ link_iterate_old_deprec(hid_t fapl) /* Allocate the "visited link" array */ iter_info.max_visit = CORDER_NLINKS; - if (NULL == (visited = (hbool_t *)HDmalloc(sizeof(hbool_t) * iter_info.max_visit))) + if (NULL == (visited = (hbool_t *)malloc(sizeof(hbool_t) * iter_info.max_visit))) TEST_ERROR; iter_info.visited = visited; @@ -6980,7 +6980,7 @@ link_iterate_old_deprec(hid_t fapl) "deprecated routines"); } /* end else */ else { - HDassert(order == H5_ITER_NATIVE); + assert(order == H5_ITER_NATIVE); TESTING("iterating over links by name index in native order in old-style group using deprecated " "routines"); } /* end else */ @@ -7055,7 +7055,7 @@ link_iterate_old_deprec(hid_t fapl) /* Free resources */ if (visited) - HDfree(visited); + free(visited); return SUCCEED; @@ -7069,7 +7069,7 @@ error: H5E_END_TRY; if (visited) - HDfree(visited); + free(visited); return FAIL; } /* end link_iterate_old_deprec() */ @@ -7986,7 +7986,7 @@ external_link_toomany(hid_t fapl, hbool_t new_format) /* XXX: should probably make a "generic" test that creates the proper * # of links based on this value - QAK */ - HDassert(H5L_NUM_LINKS == 16); + assert(H5L_NUM_LINKS == 16); /* Set up filenames */ h5_fixname(FILENAME[3], fapl, filename1, sizeof filename1); @@ -8064,7 +8064,7 @@ external_link_toomany(hid_t fapl, hbool_t new_format) H5E_END_TRY; if (gid >= 0) { H5_FAILED(); - HDprintf("%d: Should have failed for sequence of too many nested links.", __LINE__); + printf("%d: Should have failed for sequence of too many nested links.", __LINE__); goto error; } @@ -9041,11 +9041,11 @@ external_set_elink_fapl1(hid_t fapl, hbool_t new_format) h5_fixname(FILENAME[37], fam_fapl, filename2A, sizeof filename2A); /* settings for multi file */ - HDmemset(memb_map, 0, sizeof memb_map); - HDmemset(memb_fapl, 0, sizeof memb_fapl); - HDmemset(memb_name, 0, sizeof memb_name); - HDmemset(memb_addr, 0, sizeof memb_addr); - HDmemset(sv, 0, sizeof sv); + memset(memb_map, 0, sizeof memb_map); + memset(memb_fapl, 0, sizeof memb_fapl); + memset(memb_name, 0, sizeof memb_name); + memset(memb_addr, 0, sizeof memb_addr); + memset(sv, 0, sizeof sv); for (mt = H5FD_MEM_DEFAULT; mt < H5FD_MEM_NTYPES; mt++) { memb_map[mt] = H5FD_MEM_SUPER; @@ -9242,13 +9242,13 @@ external_set_elink_fapl2(hid_t fapl, hbool_t new_format) TESTING("H5Pset/get_elink_fapl() with same physical layout"); /* Set up file names and paths */ - if (NULL == (filename1 = (char *)HDcalloc(NAME_BUF_SIZE, sizeof(char)))) + if (NULL == (filename1 = (char *)calloc(NAME_BUF_SIZE, sizeof(char)))) TEST_ERROR; - if (NULL == (filename2 = (char *)HDcalloc(NAME_BUF_SIZE, sizeof(char)))) + if (NULL == (filename2 = (char *)calloc(NAME_BUF_SIZE, sizeof(char)))) TEST_ERROR; - if (NULL == (tmpname = (char *)HDcalloc(NAME_BUF_SIZE, sizeof(char)))) + if (NULL == (tmpname = (char *)calloc(NAME_BUF_SIZE, sizeof(char)))) TEST_ERROR; - if (NULL == (cwdpath = (char *)HDcalloc(NAME_BUF_SIZE, sizeof(char)))) + if (NULL == (cwdpath = (char *)calloc(NAME_BUF_SIZE, sizeof(char)))) TEST_ERROR; if ((HDmkdir(TMPDIR, (mode_t)0755) < 0 && errno != EEXIST) || @@ -9256,9 +9256,9 @@ external_set_elink_fapl2(hid_t fapl, hbool_t new_format) TEST_ERROR; /* Set up data array */ - if (NULL == (points_data = (int *)HDcalloc(NUM40 * NUM40, sizeof(int)))) + if (NULL == (points_data = (int *)calloc(NUM40 * NUM40, sizeof(int)))) TEST_ERROR; - if (NULL == (points = (int **)HDcalloc(NUM40, sizeof(points_data)))) + if (NULL == (points = (int **)calloc(NUM40, sizeof(points_data)))) TEST_ERROR; for (i = 0; i < NUM40; i++) points[i] = points_data + (i * NUM40); @@ -9371,13 +9371,13 @@ external_set_elink_fapl2(hid_t fapl, hbool_t new_format) if (H5Pclose(core_fapl) < 0) TEST_ERROR; - HDfree(points); - HDfree(points_data); + free(points); + free(points_data); - HDfree(filename1); - HDfree(filename2); - HDfree(tmpname); - HDfree(cwdpath); + free(filename1); + free(filename2); + free(tmpname); + free(cwdpath); PASSED(); return SUCCEED; @@ -9396,13 +9396,13 @@ error: } H5E_END_TRY; - HDfree(points); - HDfree(points_data); + free(points); + free(points_data); - HDfree(filename1); - HDfree(filename2); - HDfree(tmpname); - HDfree(cwdpath); + free(filename1); + free(filename2); + free(tmpname); + free(cwdpath); return FAIL; } /* end external_set_elink_fapl2() */ @@ -12476,27 +12476,27 @@ external_symlink(const char *env_h5_drvr, hid_t fapl, hbool_t new_format) return SUCCEED; } - if (NULL == (filename1 = (char *)HDcalloc(NAME_BUF_SIZE, sizeof(char)))) + if (NULL == (filename1 = (char *)calloc(NAME_BUF_SIZE, sizeof(char)))) TEST_ERROR; - if (NULL == (filename2a = (char *)HDcalloc(NAME_BUF_SIZE, sizeof(char)))) + if (NULL == (filename2a = (char *)calloc(NAME_BUF_SIZE, sizeof(char)))) TEST_ERROR; - if (NULL == (filename2b = (char *)HDcalloc(NAME_BUF_SIZE, sizeof(char)))) + if (NULL == (filename2b = (char *)calloc(NAME_BUF_SIZE, sizeof(char)))) TEST_ERROR; - if (NULL == (filename3a = (char *)HDcalloc(NAME_BUF_SIZE, sizeof(char)))) + if (NULL == (filename3a = (char *)calloc(NAME_BUF_SIZE, sizeof(char)))) TEST_ERROR; - if (NULL == (filename3b = (char *)HDcalloc(NAME_BUF_SIZE, sizeof(char)))) + if (NULL == (filename3b = (char *)calloc(NAME_BUF_SIZE, sizeof(char)))) TEST_ERROR; - if (NULL == (filename4a = (char *)HDcalloc(NAME_BUF_SIZE, sizeof(char)))) + if (NULL == (filename4a = (char *)calloc(NAME_BUF_SIZE, sizeof(char)))) TEST_ERROR; - if (NULL == (filename4b = (char *)HDcalloc(NAME_BUF_SIZE, sizeof(char)))) + if (NULL == (filename4b = (char *)calloc(NAME_BUF_SIZE, sizeof(char)))) TEST_ERROR; - if (NULL == (filename5a = (char *)HDcalloc(NAME_BUF_SIZE, sizeof(char)))) + if (NULL == (filename5a = (char *)calloc(NAME_BUF_SIZE, sizeof(char)))) TEST_ERROR; - if (NULL == (filename5b = (char *)HDcalloc(NAME_BUF_SIZE, sizeof(char)))) + if (NULL == (filename5b = (char *)calloc(NAME_BUF_SIZE, sizeof(char)))) TEST_ERROR; - if (NULL == (tmpname = (char *)HDcalloc(NAME_BUF_SIZE, sizeof(char)))) + if (NULL == (tmpname = (char *)calloc(NAME_BUF_SIZE, sizeof(char)))) TEST_ERROR; - if (NULL == (cwdpath = (char *)HDcalloc(NAME_BUF_SIZE, sizeof(char)))) + if (NULL == (cwdpath = (char *)calloc(NAME_BUF_SIZE, sizeof(char)))) TEST_ERROR; /* set up name for main file: "extlinks21A" */ @@ -12666,17 +12666,17 @@ external_symlink(const char *env_h5_drvr, hid_t fapl, hbool_t new_format) if (H5Fclose(file1) < 0) TEST_ERROR; - HDfree(filename1); - HDfree(filename2a); - HDfree(filename2b); - HDfree(filename3a); - HDfree(filename3b); - HDfree(filename4a); - HDfree(filename4b); - HDfree(filename5a); - HDfree(filename5b); - HDfree(tmpname); - HDfree(cwdpath); + free(filename1); + free(filename2a); + free(filename2b); + free(filename3a); + free(filename3b); + free(filename4a); + free(filename4b); + free(filename5a); + free(filename5b); + free(tmpname); + free(cwdpath); PASSED(); @@ -12697,17 +12697,17 @@ error: } H5E_END_TRY; - HDfree(filename1); - HDfree(filename2a); - HDfree(filename2b); - HDfree(filename3a); - HDfree(filename3b); - HDfree(filename4a); - HDfree(filename4b); - HDfree(filename5a); - HDfree(filename5b); - HDfree(tmpname); - HDfree(cwdpath); + free(filename1); + free(filename2a); + free(filename2b); + free(filename3a); + free(filename3b); + free(filename4a); + free(filename4b); + free(filename5a); + free(filename5b); + free(tmpname); + free(cwdpath); return FAIL; @@ -13663,7 +13663,7 @@ external_link_with_committed_datatype(hid_t fapl, hbool_t new_format) FAIL_STACK_ERROR; /* Compare the data read should be the same as wbuf */ - if (HDmemcmp(wbuf, rbuf, sizeof(wbuf)) != 0) + if (memcmp(wbuf, rbuf, sizeof(wbuf)) != 0) FAIL_STACK_ERROR; /* Close the dataset */ @@ -15244,7 +15244,7 @@ lapl_nlinks(hid_t fapl, hbool_t new_format) /* XXX: should probably make a "generic" test that creates the proper * # of links based on this value - QAK */ - HDassert(H5L_NUM_LINKS == 16); + assert(H5L_NUM_LINKS == 16); /* Create file */ h5_fixname(FILENAME[1], fapl, filename, sizeof filename); @@ -18004,7 +18004,7 @@ link_info_by_idx_check(hid_t group_id, const char *linkname, hsize_t n, hbool_t HDsnprintf(valname, sizeof(valname), "value %02u", (unsigned)n); /* Verify the link information for first link, in increasing creation order */ - HDmemset(&linfo, 0, sizeof(linfo)); + memset(&linfo, 0, sizeof(linfo)); if (H5Lget_info_by_idx2(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)0, &linfo, H5P_DEFAULT) < 0) TEST_ERROR; @@ -18012,7 +18012,7 @@ link_info_by_idx_check(hid_t group_id, const char *linkname, hsize_t n, hbool_t TEST_ERROR; /* Verify the link information for new link, in increasing creation order */ - HDmemset(&linfo, 0, sizeof(linfo)); + memset(&linfo, 0, sizeof(linfo)); if (H5Lget_info_by_idx2(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, n, &linfo, H5P_DEFAULT) < 0) TEST_ERROR; if (linfo.corder != (int64_t)n) @@ -18020,7 +18020,7 @@ link_info_by_idx_check(hid_t group_id, const char *linkname, hsize_t n, hbool_t /* Verify value for new soft link, in increasing creation order */ if (!hard_link) { - HDmemset(tmpval, 0, (size_t)NAME_BUF_SIZE); + memset(tmpval, 0, (size_t)NAME_BUF_SIZE); if (H5Lget_val_by_idx(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, n, tmpval, (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR; @@ -18029,7 +18029,7 @@ link_info_by_idx_check(hid_t group_id, const char *linkname, hsize_t n, hbool_t } /* end if */ /* Verify the name for new link, in increasing creation order */ - HDmemset(tmpname, 0, (size_t)NAME_BUF_SIZE); + memset(tmpname, 0, (size_t)NAME_BUF_SIZE); if (H5Lget_name_by_idx(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, n, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR; @@ -18042,7 +18042,7 @@ link_info_by_idx_check(hid_t group_id, const char *linkname, hsize_t n, hbool_t */ if (use_index) { /* Verify the link information for first link, in native creation order (which is increasing) */ - HDmemset(&linfo, 0, sizeof(linfo)); + memset(&linfo, 0, sizeof(linfo)); if (H5Lget_info_by_idx2(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_NATIVE, (hsize_t)0, &linfo, H5P_DEFAULT) < 0) TEST_ERROR; @@ -18050,7 +18050,7 @@ link_info_by_idx_check(hid_t group_id, const char *linkname, hsize_t n, hbool_t TEST_ERROR; /* Verify the link information for new link, in native creation order (which is increasing) */ - HDmemset(&linfo, 0, sizeof(linfo)); + memset(&linfo, 0, sizeof(linfo)); if (H5Lget_info_by_idx2(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_NATIVE, n, &linfo, H5P_DEFAULT) < 0) TEST_ERROR; @@ -18059,7 +18059,7 @@ link_info_by_idx_check(hid_t group_id, const char *linkname, hsize_t n, hbool_t /* Verify value for new soft link, in native creation order (which is increasing) */ if (!hard_link) { - HDmemset(tmpval, 0, (size_t)NAME_BUF_SIZE); + memset(tmpval, 0, (size_t)NAME_BUF_SIZE); if (H5Lget_val_by_idx(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_NATIVE, n, tmpval, (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR; @@ -18068,7 +18068,7 @@ link_info_by_idx_check(hid_t group_id, const char *linkname, hsize_t n, hbool_t } /* end if */ /* Verify the name for new link, in native creation order (which is increasing) */ - HDmemset(tmpname, 0, (size_t)NAME_BUF_SIZE); + memset(tmpname, 0, (size_t)NAME_BUF_SIZE); if (H5Lget_name_by_idx(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_NATIVE, n, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR; @@ -18077,14 +18077,14 @@ link_info_by_idx_check(hid_t group_id, const char *linkname, hsize_t n, hbool_t } /* end if */ /* Verify the link information for first link, in decreasing creation order */ - HDmemset(&linfo, 0, sizeof(linfo)); + memset(&linfo, 0, sizeof(linfo)); if (H5Lget_info_by_idx2(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, n, &linfo, H5P_DEFAULT) < 0) TEST_ERROR; if (linfo.corder != 0) TEST_ERROR; /* Verify the link information for new link, in decreasing creation order */ - HDmemset(&linfo, 0, sizeof(linfo)); + memset(&linfo, 0, sizeof(linfo)); if (H5Lget_info_by_idx2(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, (hsize_t)0, &linfo, H5P_DEFAULT) < 0) TEST_ERROR; @@ -18093,7 +18093,7 @@ link_info_by_idx_check(hid_t group_id, const char *linkname, hsize_t n, hbool_t /* Verify value for new soft link, in decreasing creation order */ if (!hard_link) { - HDmemset(tmpval, 0, (size_t)NAME_BUF_SIZE); + memset(tmpval, 0, (size_t)NAME_BUF_SIZE); if (H5Lget_val_by_idx(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, (hsize_t)0, tmpval, (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR; @@ -18102,7 +18102,7 @@ link_info_by_idx_check(hid_t group_id, const char *linkname, hsize_t n, hbool_t } /* end if */ /* Verify the name for new link, in decreasing creation order */ - HDmemset(tmpname, 0, (size_t)NAME_BUF_SIZE); + memset(tmpname, 0, (size_t)NAME_BUF_SIZE); if (H5Lget_name_by_idx(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, (hsize_t)0, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR; @@ -18110,14 +18110,14 @@ link_info_by_idx_check(hid_t group_id, const char *linkname, hsize_t n, hbool_t TEST_ERROR; /* Verify the link information for first link, in increasing link name order */ - HDmemset(&linfo, 0, sizeof(linfo)); + memset(&linfo, 0, sizeof(linfo)); if (H5Lget_info_by_idx2(group_id, ".", H5_INDEX_NAME, H5_ITER_INC, (hsize_t)0, &linfo, H5P_DEFAULT) < 0) TEST_ERROR; if (linfo.corder != 0) TEST_ERROR; /* Verify the link information for new link, in increasing link name order */ - HDmemset(&linfo, 0, sizeof(linfo)); + memset(&linfo, 0, sizeof(linfo)); if (H5Lget_info_by_idx2(group_id, ".", H5_INDEX_NAME, H5_ITER_INC, n, &linfo, H5P_DEFAULT) < 0) TEST_ERROR; if (linfo.corder != (int64_t)n) @@ -18125,7 +18125,7 @@ link_info_by_idx_check(hid_t group_id, const char *linkname, hsize_t n, hbool_t /* Verify value for new soft link, in increasing link name order */ if (!hard_link) { - HDmemset(tmpval, 0, (size_t)NAME_BUF_SIZE); + memset(tmpval, 0, (size_t)NAME_BUF_SIZE); if (H5Lget_val_by_idx(group_id, ".", H5_INDEX_NAME, H5_ITER_INC, n, tmpval, (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR; @@ -18134,7 +18134,7 @@ link_info_by_idx_check(hid_t group_id, const char *linkname, hsize_t n, hbool_t } /* end if */ /* Verify the name for new link, in increasing link name order */ - HDmemset(tmpname, 0, (size_t)NAME_BUF_SIZE); + memset(tmpname, 0, (size_t)NAME_BUF_SIZE); if (H5Lget_name_by_idx(group_id, ".", H5_INDEX_NAME, H5_ITER_INC, n, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR; @@ -18146,14 +18146,14 @@ link_info_by_idx_check(hid_t group_id, const char *linkname, hsize_t n, hbool_t */ /* Verify the link information for first link, in decreasing link name order */ - HDmemset(&linfo, 0, sizeof(linfo)); + memset(&linfo, 0, sizeof(linfo)); if (H5Lget_info_by_idx2(group_id, ".", H5_INDEX_NAME, H5_ITER_DEC, n, &linfo, H5P_DEFAULT) < 0) TEST_ERROR; if (linfo.corder != 0) TEST_ERROR; /* Verify the link information for new link, in decreasing link name order */ - HDmemset(&linfo, 0, sizeof(linfo)); + memset(&linfo, 0, sizeof(linfo)); if (H5Lget_info_by_idx2(group_id, ".", H5_INDEX_NAME, H5_ITER_DEC, (hsize_t)0, &linfo, H5P_DEFAULT) < 0) TEST_ERROR; if (linfo.corder != (int64_t)n) @@ -18161,7 +18161,7 @@ link_info_by_idx_check(hid_t group_id, const char *linkname, hsize_t n, hbool_t /* Verify value for new soft link, in decreasing link name order */ if (!hard_link) { - HDmemset(tmpval, 0, (size_t)NAME_BUF_SIZE); + memset(tmpval, 0, (size_t)NAME_BUF_SIZE); if (H5Lget_val_by_idx(group_id, ".", H5_INDEX_NAME, H5_ITER_DEC, (hsize_t)0, tmpval, (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR; @@ -18170,7 +18170,7 @@ link_info_by_idx_check(hid_t group_id, const char *linkname, hsize_t n, hbool_t } /* end if */ /* Verify the name for new link, in decreasing link name order */ - HDmemset(tmpname, 0, (size_t)NAME_BUF_SIZE); + memset(tmpname, 0, (size_t)NAME_BUF_SIZE); if (H5Lget_name_by_idx(group_id, ".", H5_INDEX_NAME, H5_ITER_DEC, (hsize_t)0, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR; @@ -18491,7 +18491,7 @@ link_info_by_idx_old(hid_t fapl) if (H5Oget_info3(group_id2, &oi, H5O_INFO_BASIC) < 0) TEST_ERROR; - HDmemcpy(&objtoken[u], &oi.token, sizeof(H5O_token_t)); + memcpy(&objtoken[u], &oi.token, sizeof(H5O_token_t)); /* Close group */ if (H5Gclose(group_id2) < 0) @@ -18799,7 +18799,7 @@ delete_by_idx(hid_t fapl) TEST_ERROR; /* Verify the link information for first link in appropriate order */ - HDmemset(&linfo, 0, sizeof(linfo)); + memset(&linfo, 0, sizeof(linfo)); if (H5Lget_info_by_idx2(group_id, ".", idx_type, order, (hsize_t)0, &linfo, H5P_DEFAULT) < 0) TEST_ERROR; @@ -18813,7 +18813,7 @@ delete_by_idx(hid_t fapl) } /* end else */ /* Verify the name for first link in appropriate order */ - HDmemset(tmpname, 0, (size_t)NAME_BUF_SIZE); + memset(tmpname, 0, (size_t)NAME_BUF_SIZE); if (H5Lget_name_by_idx(group_id, ".", idx_type, order, (hsize_t)0, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR; @@ -18873,7 +18873,7 @@ delete_by_idx(hid_t fapl) TEST_ERROR; /* Verify the link information for first link in appropriate order */ - HDmemset(&linfo, 0, sizeof(linfo)); + memset(&linfo, 0, sizeof(linfo)); if (H5Lget_info_by_idx2(group_id, ".", idx_type, order, (hsize_t)0, &linfo, H5P_DEFAULT) < 0) TEST_ERROR; @@ -18887,7 +18887,7 @@ delete_by_idx(hid_t fapl) } /* end else */ /* Verify the name for first link in appropriate order */ - HDmemset(tmpname, 0, (size_t)NAME_BUF_SIZE); + memset(tmpname, 0, (size_t)NAME_BUF_SIZE); if (H5Lget_name_by_idx(group_id, ".", idx_type, order, (hsize_t)0, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR; @@ -18951,7 +18951,7 @@ delete_by_idx(hid_t fapl) TEST_ERROR; /* Verify the link information for current link in appropriate order */ - HDmemset(&linfo, 0, sizeof(linfo)); + memset(&linfo, 0, sizeof(linfo)); if (H5Lget_info_by_idx2(group_id, ".", idx_type, order, (hsize_t)u, &linfo, H5P_DEFAULT) < 0) TEST_ERROR; @@ -18965,7 +18965,7 @@ delete_by_idx(hid_t fapl) } /* end else */ /* Verify the name for current link in appropriate order */ - HDmemset(tmpname, 0, (size_t)NAME_BUF_SIZE); + memset(tmpname, 0, (size_t)NAME_BUF_SIZE); if (H5Lget_name_by_idx(group_id, ".", idx_type, order, (hsize_t)u, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR; @@ -18985,7 +18985,7 @@ delete_by_idx(hid_t fapl) TEST_ERROR; /* Verify the link information for first link in appropriate order */ - HDmemset(&linfo, 0, sizeof(linfo)); + memset(&linfo, 0, sizeof(linfo)); if (H5Lget_info_by_idx2(group_id, ".", idx_type, order, (hsize_t)0, &linfo, H5P_DEFAULT) < 0) TEST_ERROR; @@ -18999,7 +18999,7 @@ delete_by_idx(hid_t fapl) } /* end else */ /* Verify the name for first link in appropriate order */ - HDmemset(tmpname, 0, (size_t)NAME_BUF_SIZE); + memset(tmpname, 0, (size_t)NAME_BUF_SIZE); if (H5Lget_name_by_idx(group_id, ".", idx_type, order, (hsize_t)0, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR; @@ -19130,7 +19130,7 @@ delete_by_idx_old(hid_t fapl) if (H5Oget_info3(group_id2, &oi, H5O_INFO_BASIC) < 0) TEST_ERROR; - HDmemcpy(&objtoken[u], &oi.token, sizeof(H5O_token_t)); + memcpy(&objtoken[u], &oi.token, sizeof(H5O_token_t)); /* Close group */ if (H5Gclose(group_id2) < 0) @@ -19164,7 +19164,7 @@ delete_by_idx_old(hid_t fapl) TEST_ERROR; /* Verify the link information for first link in appropriate order */ - HDmemset(&linfo, 0, sizeof(linfo)); + memset(&linfo, 0, sizeof(linfo)); if (H5Lget_info_by_idx2(group_id, ".", H5_INDEX_NAME, order, (hsize_t)0, &linfo, H5P_DEFAULT) < 0) TEST_ERROR; if (order == H5_ITER_INC) { @@ -19181,7 +19181,7 @@ delete_by_idx_old(hid_t fapl) } /* end else */ /* Verify the name for first link in appropriate order */ - HDmemset(tmpname, 0, (size_t)NAME_BUF_SIZE); + memset(tmpname, 0, (size_t)NAME_BUF_SIZE); if (H5Lget_name_by_idx(group_id, ".", H5_INDEX_NAME, order, (hsize_t)0, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR; @@ -19227,7 +19227,7 @@ delete_by_idx_old(hid_t fapl) if (H5Oget_info3(group_id2, &oi, H5O_INFO_BASIC) < 0) TEST_ERROR; - HDmemcpy(&objtoken[u], &oi.token, sizeof(H5O_token_t)); + memcpy(&objtoken[u], &oi.token, sizeof(H5O_token_t)); /* Close group */ if (H5Gclose(group_id2) < 0) @@ -19243,7 +19243,7 @@ delete_by_idx_old(hid_t fapl) TEST_ERROR; /* Verify the link information for current link in appropriate order */ - HDmemset(&linfo, 0, sizeof(linfo)); + memset(&linfo, 0, sizeof(linfo)); if (H5Lget_info_by_idx2(group_id, ".", H5_INDEX_NAME, order, (hsize_t)u, &linfo, H5P_DEFAULT) < 0) TEST_ERROR; if (order == H5_ITER_INC) { @@ -19260,7 +19260,7 @@ delete_by_idx_old(hid_t fapl) } /* end else */ /* Verify the name for current link in appropriate order */ - HDmemset(tmpname, 0, (size_t)NAME_BUF_SIZE); + memset(tmpname, 0, (size_t)NAME_BUF_SIZE); if (H5Lget_name_by_idx(group_id, ".", H5_INDEX_NAME, order, (hsize_t)u, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR; @@ -19281,7 +19281,7 @@ delete_by_idx_old(hid_t fapl) TEST_ERROR; /* Verify the link information for first link in appropriate order */ - HDmemset(&linfo, 0, sizeof(linfo)); + memset(&linfo, 0, sizeof(linfo)); if (H5Lget_info_by_idx2(group_id, ".", H5_INDEX_NAME, order, (hsize_t)0, &linfo, H5P_DEFAULT) < 0) TEST_ERROR; if (order == H5_ITER_INC) { @@ -19298,7 +19298,7 @@ delete_by_idx_old(hid_t fapl) } /* end else */ /* Verify the name for first link in appropriate order */ - HDmemset(tmpname, 0, (size_t)NAME_BUF_SIZE); + memset(tmpname, 0, (size_t)NAME_BUF_SIZE); if (H5Lget_name_by_idx(group_id, ".", H5_INDEX_NAME, order, (hsize_t)0, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR; @@ -19478,7 +19478,7 @@ link_iterate_check(hid_t group_id, H5_index_t idx_type, H5_iter_order_t order, u iter_info->stop = -1; iter_info->ncalled = 0; iter_info->curr = order != H5_ITER_DEC ? 0 : (max_links - 1); - HDmemset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); if (H5Literate2(group_id, idx_type, order, &skip, link_iterate_cb, iter_info) < 0) TEST_ERROR; @@ -19496,7 +19496,7 @@ link_iterate_check(hid_t group_id, H5_index_t idx_type, H5_iter_order_t order, u iter_info->stop = -1; iter_info->ncalled = 0; iter_info->curr = order != H5_ITER_DEC ? 0 : (max_links - 1); - HDmemset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); if (H5Giterate(group_id, ".", &gskip, group_iterate_cb, iter_info) < 0) TEST_ERROR; @@ -19514,7 +19514,7 @@ link_iterate_check(hid_t group_id, H5_index_t idx_type, H5_iter_order_t order, u iter_info->stop = -1; iter_info->ncalled = 0; iter_info->curr = (int64_t)(order != H5_ITER_DEC ? skip : ((max_links - 1) - skip)); - HDmemset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); if (H5Literate2(group_id, idx_type, order, &skip, link_iterate_cb, iter_info) < 0) TEST_ERROR; @@ -19534,7 +19534,7 @@ link_iterate_check(hid_t group_id, H5_index_t idx_type, H5_iter_order_t order, u else { unsigned nvisit = 0; /* # of links visited */ - HDassert(order == H5_ITER_NATIVE); + assert(order == H5_ITER_NATIVE); for (v = 0; v < max_links; v++) if (iter_info->visited[v] == TRUE) nvisit++; @@ -19550,7 +19550,7 @@ link_iterate_check(hid_t group_id, H5_index_t idx_type, H5_iter_order_t order, u iter_info->stop = -1; iter_info->ncalled = 0; iter_info->curr = order != H5_ITER_DEC ? (unsigned)gskip : ((max_links - 1) - (unsigned)gskip); - HDmemset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); if (H5Giterate(group_id, ".", &gskip, group_iterate_cb, iter_info) < 0) TEST_ERROR; @@ -19570,7 +19570,7 @@ link_iterate_check(hid_t group_id, H5_index_t idx_type, H5_iter_order_t order, u else { unsigned nvisit = 0; /* # of links visited */ - HDassert(order == H5_ITER_NATIVE); + assert(order == H5_ITER_NATIVE); for (v = 0; v < max_links; v++) if (iter_info->visited[v] == TRUE) nvisit++; @@ -19586,7 +19586,7 @@ link_iterate_check(hid_t group_id, H5_index_t idx_type, H5_iter_order_t order, u iter_info->stop = 3; iter_info->ncalled = 0; iter_info->curr = order != H5_ITER_DEC ? 0 : (max_links - 1); - HDmemset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); if ((ret = H5Literate2(group_id, idx_type, order, &skip, link_iterate_cb, iter_info)) < 0) TEST_ERROR; if (ret != CORDER_ITER_STOP) @@ -19601,7 +19601,7 @@ link_iterate_check(hid_t group_id, H5_index_t idx_type, H5_iter_order_t order, u iter_info->stop = 3; iter_info->ncalled = 0; iter_info->curr = order != H5_ITER_DEC ? 0 : (max_links - 1); - HDmemset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); if ((ret = H5Giterate(group_id, ".", &gskip, group_iterate_cb, iter_info)) < 0) TEST_ERROR; if (ret != CORDER_ITER_STOP) @@ -19670,7 +19670,7 @@ link_iterate(hid_t fapl) /* Allocate the "visited link" array */ iter_info.max_visit = max_compact * 2; - if (NULL == (visited = (hbool_t *)HDmalloc(sizeof(hbool_t) * iter_info.max_visit))) + if (NULL == (visited = (hbool_t *)malloc(sizeof(hbool_t) * iter_info.max_visit))) TEST_ERROR; iter_info.visited = visited; @@ -19699,7 +19699,7 @@ link_iterate(hid_t fapl) "creation order index"); } /* end else */ else { - HDassert(order == H5_ITER_NATIVE); + assert(order == H5_ITER_NATIVE); if (use_index) TESTING("iterating over links by creation order index in native order w/creation " "order index"); @@ -19726,7 +19726,7 @@ link_iterate(hid_t fapl) "order index"); } /* end else */ else { - HDassert(order == H5_ITER_NATIVE); + assert(order == H5_ITER_NATIVE); if (use_index) TESTING( "iterating over links by name index in native order w/creation order index"); @@ -19842,7 +19842,7 @@ link_iterate(hid_t fapl) /* Free resources */ if (visited) - HDfree(visited); + free(visited); return SUCCEED; @@ -19857,7 +19857,7 @@ error: H5E_END_TRY; if (visited) - HDfree(visited); + free(visited); return FAIL; } /* end link_iterate() */ @@ -19975,7 +19975,7 @@ link_iterate_old_check(hid_t group_id, H5_iter_order_t order, unsigned max_links iter_info->stop = -1; iter_info->ncalled = 0; iter_info->curr = order != H5_ITER_DEC ? 0 : (max_links - 1); - HDmemset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); if (H5Literate2(group_id, H5_INDEX_NAME, order, &skip, link_iterate_old_cb, iter_info) < 0) TEST_ERROR; @@ -19993,7 +19993,7 @@ link_iterate_old_check(hid_t group_id, H5_iter_order_t order, unsigned max_links iter_info->stop = -1; iter_info->ncalled = 0; iter_info->curr = order != H5_ITER_DEC ? 0 : (max_links - 1); - HDmemset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); if (H5Giterate(group_id, ".", &gskip, group_iterate_old_cb, iter_info) < 0) TEST_ERROR; @@ -20011,7 +20011,7 @@ link_iterate_old_check(hid_t group_id, H5_iter_order_t order, unsigned max_links iter_info->stop = -1; iter_info->ncalled = 0; iter_info->curr = (int64_t)(order != H5_ITER_DEC ? skip : ((max_links - 1) - skip)); - HDmemset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); if (H5Literate2(group_id, H5_INDEX_NAME, order, &skip, link_iterate_old_cb, iter_info) < 0) TEST_ERROR; @@ -20031,7 +20031,7 @@ link_iterate_old_check(hid_t group_id, H5_iter_order_t order, unsigned max_links else { unsigned nvisit = 0; /* # of links visited */ - HDassert(order == H5_ITER_NATIVE); + assert(order == H5_ITER_NATIVE); for (v = 0; v < max_links; v++) if (iter_info->visited[v] == TRUE) nvisit++; @@ -20047,7 +20047,7 @@ link_iterate_old_check(hid_t group_id, H5_iter_order_t order, unsigned max_links iter_info->stop = -1; iter_info->ncalled = 0; iter_info->curr = order != H5_ITER_DEC ? (unsigned)gskip : ((max_links - 1) - (unsigned)gskip); - HDmemset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); if (H5Giterate(group_id, ".", &gskip, group_iterate_old_cb, iter_info) < 0) TEST_ERROR; @@ -20067,7 +20067,7 @@ link_iterate_old_check(hid_t group_id, H5_iter_order_t order, unsigned max_links else { unsigned nvisit = 0; /* # of links visited */ - HDassert(order == H5_ITER_NATIVE); + assert(order == H5_ITER_NATIVE); for (v = 0; v < max_links; v++) if (iter_info->visited[v] == TRUE) nvisit++; @@ -20083,7 +20083,7 @@ link_iterate_old_check(hid_t group_id, H5_iter_order_t order, unsigned max_links iter_info->stop = 3; iter_info->ncalled = 0; iter_info->curr = order != H5_ITER_DEC ? 0 : (max_links - 1); - HDmemset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); if ((ret = H5Literate2(group_id, H5_INDEX_NAME, order, &skip, link_iterate_old_cb, iter_info)) < 0) TEST_ERROR; if (ret != CORDER_ITER_STOP) @@ -20098,7 +20098,7 @@ link_iterate_old_check(hid_t group_id, H5_iter_order_t order, unsigned max_links iter_info->stop = 3; iter_info->ncalled = 0; iter_info->curr = order != H5_ITER_DEC ? 0 : (max_links - 1); - HDmemset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); if ((ret = H5Giterate(group_id, ".", &gskip, group_iterate_old_cb, iter_info)) < 0) TEST_ERROR; if (ret != CORDER_ITER_STOP) @@ -20169,7 +20169,7 @@ link_iterate_old(hid_t fapl) /* Allocate the "visited link" array */ iter_info.max_visit = CORDER_NLINKS; - if (NULL == (visited = (hbool_t *)HDmalloc(sizeof(hbool_t) * iter_info.max_visit))) + if (NULL == (visited = (hbool_t *)malloc(sizeof(hbool_t) * iter_info.max_visit))) TEST_ERROR; iter_info.visited = visited; @@ -20183,7 +20183,7 @@ link_iterate_old(hid_t fapl) TESTING("iterating over links by name index in decreasing order in old-style group"); } /* end else */ else { - HDassert(order == H5_ITER_NATIVE); + assert(order == H5_ITER_NATIVE); TESTING("iterating over links by name index in native order in old-style group"); } /* end else */ @@ -20257,7 +20257,7 @@ link_iterate_old(hid_t fapl) /* Free resources */ if (visited) - HDfree(visited); + free(visited); return SUCCEED; @@ -20271,7 +20271,7 @@ error: H5E_END_TRY; if (visited) - HDfree(visited); + free(visited); return FAIL; } /* end link_iterate_old() */ @@ -20346,7 +20346,7 @@ open_by_idx_check(hid_t main_group_id, hid_t soft_group_id, hid_t mount_file_id, /* Get the address of the root group in the file to mount */ if (H5Oget_info3(mount_file_id, &oi, H5O_INFO_BASIC) < 0) TEST_ERROR; - HDmemcpy(&mnt_root_token, &oi.token, sizeof(mnt_root_token)); + memcpy(&mnt_root_token, &oi.token, sizeof(mnt_root_token)); /* Mount a file over a group in main group */ mnt_idx = 2; @@ -20428,7 +20428,7 @@ open_by_idx(hid_t fapl) TEST_ERROR; /* Allocate object token array */ - if (NULL == (objno = (H5O_token_t *)HDmalloc(sizeof(H5O_token_t) * (max_compact * 2)))) + if (NULL == (objno = (H5O_token_t *)malloc(sizeof(H5O_token_t) * (max_compact * 2)))) TEST_ERROR; /* Create file to mount */ @@ -20461,7 +20461,7 @@ open_by_idx(hid_t fapl) "order index"); } /* end else */ else { - HDassert(order == H5_ITER_NATIVE); + assert(order == H5_ITER_NATIVE); if (use_index) TESTING( "open object by creation order index in native order w/creation order index"); @@ -20484,7 +20484,7 @@ open_by_idx(hid_t fapl) TESTING("open object by name index in decreasing order w/o creation order index"); } /* end else */ else { - HDassert(order == H5_ITER_NATIVE); + assert(order == H5_ITER_NATIVE); if (use_index) TESTING("open object by name index in native order w/creation order index"); else @@ -20635,7 +20635,7 @@ open_by_idx(hid_t fapl) /* Free resources */ if (objno) - HDfree(objno); + free(objno); return SUCCEED; @@ -20652,7 +20652,7 @@ error: H5E_END_TRY; if (objno) - HDfree(objno); + free(objno); return FAIL; } /* end open_by_idx() */ @@ -20810,7 +20810,7 @@ open_by_idx_old(hid_t fapl) TESTING("open object by name index in decreasing order in old-style group"); } /* end else */ else { - HDassert(order == H5_ITER_NATIVE); + assert(order == H5_ITER_NATIVE); TESTING("open object by name index in native order in old-style group"); } /* end else */ @@ -21046,7 +21046,7 @@ object_info(hid_t fapl) TEST_ERROR; /* Allocate object token array */ - if (NULL == (objno = (H5O_token_t *)HDmalloc(sizeof(H5O_token_t) * (max_compact * 2)))) + if (NULL == (objno = (H5O_token_t *)malloc(sizeof(H5O_token_t) * (max_compact * 2)))) TEST_ERROR; /* Create dataspace for attributes */ @@ -21078,7 +21078,7 @@ object_info(hid_t fapl) "creation order index"); } /* end else */ else { - HDassert(order == H5_ITER_NATIVE); + assert(order == H5_ITER_NATIVE); if (use_index) TESTING("query object info by creation order index in native order w/creation " "order index"); @@ -21105,7 +21105,7 @@ object_info(hid_t fapl) "index"); } /* end else */ else { - HDassert(order == H5_ITER_NATIVE); + assert(order == H5_ITER_NATIVE); if (use_index) TESTING("query object info by name index in native order w/creation order index"); else @@ -21288,7 +21288,7 @@ object_info(hid_t fapl) if (H5Sclose(space_id) < 0) TEST_ERROR; if (objno) - HDfree(objno); + free(objno); return SUCCEED; @@ -21305,7 +21305,7 @@ error: H5E_END_TRY; if (objno) - HDfree(objno); + free(objno); return FAIL; } /* end object_info() */ @@ -21435,7 +21435,7 @@ object_info_old(hid_t fapl) TESTING("query object info by name index in decreasing order in old-style group"); } /* end else */ else { - HDassert(order == H5_ITER_NATIVE); + assert(order == H5_ITER_NATIVE); TESTING("query object info by name index in native order in old-style group"); } /* end else */ @@ -21629,7 +21629,7 @@ group_info(hid_t fapl) "creation order index"); } /* end else */ else { - HDassert(order == H5_ITER_NATIVE); + assert(order == H5_ITER_NATIVE); if (use_index) TESTING("query group info by creation order index in native order w/creation " "order index"); @@ -21656,7 +21656,7 @@ group_info(hid_t fapl) "index"); } /* end else */ else { - HDassert(order == H5_ITER_NATIVE); + assert(order == H5_ITER_NATIVE); if (use_index) TESTING("query group info by name index in native order w/creation order index"); else @@ -22149,7 +22149,7 @@ group_info_old(hid_t fapl) TESTING("query group info by name index in decreasing order in old-style group"); } /* end else */ else { - HDassert(order == H5_ITER_NATIVE); + assert(order == H5_ITER_NATIVE); TESTING("query group info by name index in native order in old-style group"); } /* end else */ @@ -22678,13 +22678,13 @@ main(void) for (minimize_dset_oh = 0; minimize_dset_oh <= 1; minimize_dset_oh++) { if (minimize_dset_oh) { - HDprintf("\n-Testing with minimized dataset object headers-\n"); + printf("\n-Testing with minimized dataset object headers-\n"); dcpl_g = H5Pcreate(H5P_DATASET_CREATE); if (0 > dcpl_g) TEST_ERROR; } else { - HDprintf("\n-Testing with unminimzed dataset object headers-\n"); + printf("\n-Testing with unminimzed dataset object headers-\n"); dcpl_g = H5P_DEFAULT; } @@ -22694,11 +22694,11 @@ main(void) /* Check for FAPL to use */ if (new_format) { my_fapl = fapl2; - HDprintf("\n--Testing with 'new format'--\n"); + printf("\n--Testing with 'new format'--\n"); } else { my_fapl = fapl; - HDprintf("\n--Testing with 'old format'--\n"); + printf("\n--Testing with 'old format'--\n"); } /* always enter tests without external cache */ @@ -22752,12 +22752,12 @@ main(void) if (efc) { if (H5Pset_elink_file_cache_size(my_fapl, 8) < 0) TEST_ERROR; - HDprintf("\n---Testing with external file cache---\n"); + printf("\n---Testing with external file cache---\n"); } /* end if */ else { if (H5Pset_elink_file_cache_size(my_fapl, 0) < 0) TEST_ERROR; - HDprintf("\n---Testing without external file cache---\n"); + printf("\n---Testing without external file cache---\n"); } /* end else */ nerrors += external_link_root(my_fapl, new_format) < 0 ? 1 : 0; @@ -22941,10 +22941,10 @@ main(void) /* Results */ if (nerrors) { - HDprintf("***** %d LINK TEST%s FAILED! *****\n", nerrors, 1 == nerrors ? "" : "S"); - HDexit(EXIT_FAILURE); + printf("***** %d LINK TEST%s FAILED! *****\n", nerrors, 1 == nerrors ? "" : "S"); + exit(EXIT_FAILURE); } - HDprintf("All link tests passed.\n"); + printf("All link tests passed.\n"); /* clean up symlink created by external link tests */ HDremove(SYMLINK1); @@ -22954,9 +22954,9 @@ main(void) HDrmdir(TMPDIR); HDrmdir(TMPDIR2); - HDexit(EXIT_SUCCESS); + exit(EXIT_SUCCESS); error: HDputs("*** TESTS FAILED ***"); - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); } /* end main() */ diff --git a/test/links_env.c b/test/links_env.c index 27e29ea..ca65ef8 100644 --- a/test/links_env.c +++ b/test/links_env.c @@ -161,7 +161,7 @@ main(void) /* Splitter VFD has issues with external links */ if (!HDstrcmp(env_h5_drvr, "splitter")) { HDputs(" -- SKIPPED for incompatible VFD --"); - HDexit(EXIT_SUCCESS); + exit(EXIT_SUCCESS); } h5_reset(); @@ -182,18 +182,18 @@ main(void) /* Results */ if (nerrors) { - HDprintf("***** %d External Link (HDF5_EXT_PREFIX) test%s FAILED! *****\n", nerrors, - 1 == nerrors ? "" : "s"); - HDexit(EXIT_FAILURE); + printf("***** %d External Link (HDF5_EXT_PREFIX) test%s FAILED! *****\n", nerrors, + 1 == nerrors ? "" : "s"); + exit(EXIT_FAILURE); } - HDprintf("All external Link (HDF5_EXT_PREFIX) tests passed.\n"); + printf("All external Link (HDF5_EXT_PREFIX) tests passed.\n"); /* clean up tmp_links_env directory created by external link tests */ HDrmdir(TMPDIR); - HDexit(EXIT_SUCCESS); + exit(EXIT_SUCCESS); error: HDputs("*** TESTS FAILED ***"); - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); } /* end main() */ diff --git a/test/mdset.c b/test/mdset.c index 06e7af2..fc022e2 100644 --- a/test/mdset.c +++ b/test/mdset.c @@ -83,7 +83,7 @@ test_mdset_location(hid_t fapl_id) if ((file_id2 = H5Fcreate(filename2, H5F_ACC_TRUNC, H5P_DEFAULT, fapl_id)) < 0) TEST_ERROR; - if (NULL == (buf = (int *)HDcalloc(2 * MAX_DSET_X * MAX_DSET_Y, sizeof(int)))) + if (NULL == (buf = (int *)calloc(2 * MAX_DSET_X * MAX_DSET_Y, sizeof(int)))) TEST_ERROR; /* Generate memory dataspace */ @@ -224,13 +224,13 @@ test_mdset(size_t niter, unsigned flags, hid_t fapl_id) dcpl_id[i] = -1; /* Allocate buffers */ - if (NULL == (rbuf = (unsigned *)HDmalloc(buf_size))) + if (NULL == (rbuf = (unsigned *)malloc(buf_size))) TEST_ERROR; - if (NULL == (erbuf = (unsigned *)HDmalloc(buf_size))) + if (NULL == (erbuf = (unsigned *)malloc(buf_size))) TEST_ERROR; - if (NULL == (wbuf = (unsigned *)HDmalloc(buf_size))) + if (NULL == (wbuf = (unsigned *)malloc(buf_size))) TEST_ERROR; - if (NULL == (efbuf = (unsigned *)HDmalloc(buf_size))) + if (NULL == (efbuf = (unsigned *)malloc(buf_size))) TEST_ERROR; /* Initialize buffer indices */ @@ -378,8 +378,8 @@ test_mdset(size_t niter, unsigned flags, hid_t fapl_id) } /* end for */ /* Initialize read buffer and expected read buffer */ - (void)HDmemset(rbuf, 0, buf_size); - (void)HDmemset(erbuf, 0, buf_size); + (void)memset(rbuf, 0, buf_size); + (void)memset(erbuf, 0, buf_size); /* Initialize write buffer */ for (j = 0; j < max_dsets; j++) @@ -388,7 +388,7 @@ test_mdset(size_t niter, unsigned flags, hid_t fapl_id) wbufi[j][k][l] = (unsigned)((j * MAX_DSET_X * MAX_DSET_Y) + (k * MAX_DSET_Y) + l); /* Initialize expected file buffer */ - (void)HDmemset(efbuf, 0, buf_size); + (void)memset(efbuf, 0, buf_size); /* Perform read/write operations */ for (j = 0; j < OPS_PER_FILE; j++) { @@ -159,36 +159,35 @@ check_stats(const H5F_t *f, const H5FS_t *frsp, H5FS_stat_t *state) { H5FS_stat_t frspace_stats; /* Statistics about the heap */ - HDassert(f); - HDassert(frsp); + assert(f); + assert(frsp); /* Get statistics for free-space and verify they are correct */ if (H5FS_stat_info(f, frsp, &frspace_stats) < 0) FAIL_STACK_ERROR; if (frspace_stats.tot_space != state->tot_space) { - HDfprintf(stdout, "frspace_stats.tot_space = %" PRIuHSIZE ", state->tot_space = %" PRIuHSIZE "\n", - frspace_stats.tot_space, state->tot_space); + fprintf(stdout, "frspace_stats.tot_space = %" PRIuHSIZE ", state->tot_space = %" PRIuHSIZE "\n", + frspace_stats.tot_space, state->tot_space); TEST_ERROR; } /* end if */ if (frspace_stats.tot_sect_count != state->tot_sect_count) { - HDfprintf(stdout, - "frspace_stats.tot_sect_count = %" PRIuHSIZE ", state->tot_sect_count = %" PRIuHSIZE "\n", - frspace_stats.tot_sect_count, state->tot_sect_count); + fprintf(stdout, + "frspace_stats.tot_sect_count = %" PRIuHSIZE ", state->tot_sect_count = %" PRIuHSIZE "\n", + frspace_stats.tot_sect_count, state->tot_sect_count); TEST_ERROR; } /* end if */ if (frspace_stats.serial_sect_count != state->serial_sect_count) { - HDfprintf(stdout, - "frspace_stats.serial_sect_count = %" PRIuHSIZE ", state->serial_sect_count = %" PRIuHSIZE - "\n", - frspace_stats.serial_sect_count, state->serial_sect_count); + fprintf(stdout, + "frspace_stats.serial_sect_count = %" PRIuHSIZE ", state->serial_sect_count = %" PRIuHSIZE + "\n", + frspace_stats.serial_sect_count, state->serial_sect_count); TEST_ERROR; } /* end if */ if (frspace_stats.ghost_sect_count != state->ghost_sect_count) { - HDfprintf(stdout, - "frspace_stats.ghost_sect_count = %" PRIuHSIZE ", state->ghost_sect_count = %" PRIuHSIZE - "\n", - frspace_stats.ghost_sect_count, state->ghost_sect_count); + fprintf(stdout, + "frspace_stats.ghost_sect_count = %" PRIuHSIZE ", state->ghost_sect_count = %" PRIuHSIZE "\n", + frspace_stats.ghost_sect_count, state->ghost_sect_count); TEST_ERROR; } /* end if */ @@ -1105,7 +1104,7 @@ test_mf_fs_start(hid_t fapl) if (f->shared->fs_man[H5FD_MEM_SUPER]->client != H5FS_CLIENT_FILE_ID) TEST_ERROR; - HDmemset(&state, 0, sizeof(H5FS_stat_t)); + memset(&state, 0, sizeof(H5FS_stat_t)); if (check_stats(f, f->shared->fs_man[H5FD_MEM_SUPER], &state)) TEST_ERROR; @@ -1226,7 +1225,7 @@ test_mf_fs_alloc_free(hid_t fapl) if (H5MF__add_sect(f, H5FD_MEM_SUPER, f->shared->fs_man[H5FD_MEM_SUPER], sect_node)) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(H5FS_stat_t)); + memset(&state, 0, sizeof(H5FS_stat_t)); state.tot_space += TBLOCK_SIZE30; state.tot_sect_count += 1; state.serial_sect_count += 1; @@ -1304,7 +1303,7 @@ test_mf_fs_alloc_free(hid_t fapl) if (H5MF__add_sect(f, H5FD_MEM_SUPER, f->shared->fs_man[H5FD_MEM_SUPER], sect_node)) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(H5FS_stat_t)); + memset(&state, 0, sizeof(H5FS_stat_t)); state.tot_space += TBLOCK_SIZE30; state.tot_sect_count += 1; state.serial_sect_count += 1; @@ -1380,7 +1379,7 @@ test_mf_fs_alloc_free(hid_t fapl) if (H5MF__add_sect(f, H5FD_MEM_SUPER, f->shared->fs_man[H5FD_MEM_SUPER], sect_node)) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(H5FS_stat_t)); + memset(&state, 0, sizeof(H5FS_stat_t)); state.tot_space += TBLOCK_SIZE30; state.tot_sect_count += 1; state.serial_sect_count += 1; @@ -1412,7 +1411,7 @@ test_mf_fs_alloc_free(hid_t fapl) if (tmp != TBLOCK_ADDR70) TEST_ERROR; - HDmemset(&state, 0, sizeof(H5FS_stat_t)); + memset(&state, 0, sizeof(H5FS_stat_t)); if (check_stats(f, f->shared->fs_man[H5FD_MEM_SUPER], &state)) TEST_ERROR; @@ -1556,7 +1555,7 @@ test_mf_fs_extend(hid_t fapl) if (H5MF__add_sect(f, H5FD_MEM_SUPER, f->shared->fs_man[H5FD_MEM_SUPER], sect_node1)) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(H5FS_stat_t)); + memset(&state, 0, sizeof(H5FS_stat_t)); state.tot_space += TBLOCK_SIZE30; state.tot_sect_count += 1; state.serial_sect_count += 1; @@ -1666,7 +1665,7 @@ test_mf_fs_extend(hid_t fapl) if (H5MF__add_sect(f, H5FD_MEM_SUPER, f->shared->fs_man[H5FD_MEM_SUPER], sect_node1)) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(H5FS_stat_t)); + memset(&state, 0, sizeof(H5FS_stat_t)); state.tot_space += TBLOCK_SIZE30; state.tot_sect_count += 1; state.serial_sect_count += 1; @@ -1771,7 +1770,7 @@ test_mf_fs_extend(hid_t fapl) if (H5MF__add_sect(f, H5FD_MEM_SUPER, f->shared->fs_man[H5FD_MEM_SUPER], sect_node1)) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(H5FS_stat_t)); + memset(&state, 0, sizeof(H5FS_stat_t)); state.tot_space += TBLOCK_SIZE30; state.tot_sect_count += 1; state.serial_sect_count += 1; @@ -1877,7 +1876,7 @@ test_mf_fs_extend(hid_t fapl) if (H5MF__add_sect(f, H5FD_MEM_SUPER, f->shared->fs_man[H5FD_MEM_SUPER], sect_node1)) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(H5FS_stat_t)); + memset(&state, 0, sizeof(H5FS_stat_t)); state.tot_space += (TBLOCK_SIZE30 - 10); state.tot_sect_count += 1; state.serial_sect_count += 1; @@ -3029,7 +3028,7 @@ test_mf_aggr_alloc6(const char *env_h5_drvr, hid_t fapl) TEST_ERROR; /* Verify that meta_aggr's unused space of 1968 is freed to free-space */ - HDmemset(&state, 0, sizeof(H5FS_stat_t)); + memset(&state, 0, sizeof(H5FS_stat_t)); state.tot_space += (TBLOCK_SIZE2048 - (TBLOCK_SIZE30 + TBLOCK_SIZE50)); state.tot_sect_count += 1; state.serial_sect_count += 1; @@ -3219,7 +3218,7 @@ test_mf_aggr_alloc7(const char *env_h5_drvr, hid_t fapl) TEST_ERROR; /* Verify that meta_aggr's unused space of 1968 is freed to free-space */ - HDmemset(&state, 0, sizeof(H5FS_stat_t)); + memset(&state, 0, sizeof(H5FS_stat_t)); state.tot_space += (TBLOCK_SIZE2048 - (TBLOCK_SIZE30 + TBLOCK_SIZE50)); state.tot_sect_count += 1; state.serial_sect_count += 1; @@ -3914,7 +3913,7 @@ test_mf_align_eoa(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl) if (ma_addr || ma_size) TEST_ERROR; - HDmemset(&state, 0, sizeof(H5FS_stat_t)); + memset(&state, 0, sizeof(H5FS_stat_t)); if (mis_align) { state.tot_space += mis_align; state.tot_sect_count += 1; @@ -4187,7 +4186,7 @@ test_mf_align_fs(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl) if (H5MF__add_sect(f, H5FD_MEM_SUPER, f->shared->fs_man[H5FD_MEM_SUPER], sect_node)) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(H5FS_stat_t)); + memset(&state, 0, sizeof(H5FS_stat_t)); state.tot_space += TBLOCK_SIZE50; state.tot_sect_count += 1; state.serial_sect_count += 1; @@ -4251,7 +4250,7 @@ test_mf_align_fs(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl) if (H5MF__add_sect(f, H5FD_MEM_SUPER, f->shared->fs_man[H5FD_MEM_SUPER], sect_node)) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(H5FS_stat_t)); + memset(&state, 0, sizeof(H5FS_stat_t)); state.tot_space += TBLOCK_SIZE8000; state.tot_sect_count += 1; state.serial_sect_count += 1; @@ -4338,7 +4337,7 @@ test_mf_align_fs(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl) if (H5MF__add_sect(f, H5FD_MEM_SUPER, f->shared->fs_man[H5FD_MEM_SUPER], sect_node)) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(H5FS_stat_t)); + memset(&state, 0, sizeof(H5FS_stat_t)); state.tot_space += TBLOCK_SIZE700; state.tot_sect_count += 1; state.serial_sect_count += 1; @@ -4558,7 +4557,7 @@ test_mf_align_alloc1(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl) TEST_ERROR; /* fragment for alignment of block 30 is freed to free-space */ - HDmemset(&state, 0, sizeof(H5FS_stat_t)); + memset(&state, 0, sizeof(H5FS_stat_t)); if (mis_align) { state.tot_space += mis_align; state.tot_sect_count += 1; @@ -4821,7 +4820,7 @@ test_mf_align_alloc2(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl) TEST_ERROR; /* fragment for alignment of block 30 is freed to free-space */ - HDmemset(&state, 0, sizeof(H5FS_stat_t) * H5FD_MEM_NTYPES); + memset(&state, 0, sizeof(H5FS_stat_t) * H5FD_MEM_NTYPES); if (mis_align) { state[type].tot_space += mis_align; state[type].tot_sect_count += 1; @@ -5167,7 +5166,7 @@ test_mf_align_alloc3(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl) TEST_ERROR; /* fragment for alignment of block 30 is freed to free-space */ - HDmemset(&state, 0, sizeof(H5FS_stat_t) * H5FD_MEM_NTYPES); + memset(&state, 0, sizeof(H5FS_stat_t) * H5FD_MEM_NTYPES); if (mis_align) { state[type].tot_space += mis_align; state[type].tot_sect_count += 1; @@ -5481,7 +5480,7 @@ test_mf_align_alloc4(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl) TEST_ERROR; /* fragment for alignment of block 30 is freed to free-space */ - HDmemset(&state, 0, sizeof(H5FS_stat_t)); + memset(&state, 0, sizeof(H5FS_stat_t)); if (mis_align) { state.tot_space += mis_align; state.tot_sect_count += 1; @@ -5705,7 +5704,7 @@ test_mf_align_alloc5(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl) TEST_ERROR; /* fragment for alignment of block 30 is freed to free-space */ - HDmemset(&state, 0, sizeof(H5FS_stat_t) * H5FD_MEM_NTYPES); + memset(&state, 0, sizeof(H5FS_stat_t) * H5FD_MEM_NTYPES); if (mis_align) { state[type].tot_space += mis_align; state[type].tot_sect_count += 1; @@ -5971,7 +5970,7 @@ test_mf_align_alloc6(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl) TEST_ERROR; /* fragment for alignment of block 30 in meta_aggr is freed to free-space */ - HDmemset(&state, 0, sizeof(H5FS_stat_t) * H5FD_MEM_NTYPES); + memset(&state, 0, sizeof(H5FS_stat_t) * H5FD_MEM_NTYPES); if (mis_align) { state[type].tot_space += mis_align; state[type].tot_sect_count += 1; @@ -6183,7 +6182,7 @@ test_mf_bug1(const char *env_h5_drvr, hid_t fapl) H5FD_mem_t mt; /* Get current multi settings */ - HDmemset(memb_name, 0, sizeof memb_name); + memset(memb_name, 0, sizeof memb_name); if (H5Pget_fapl_multi(copied_fapl, memb_map, memb_fapl_arr, memb_name, memb_addr, &relax) < 0) TEST_ERROR; @@ -6204,7 +6203,7 @@ test_mf_bug1(const char *env_h5_drvr, hid_t fapl) /* Free memb_name */ for (mt = H5FD_MEM_DEFAULT; mt < H5FD_MEM_NTYPES; mt++) - HDfree(memb_name[mt]); + free(memb_name[mt]); } /* end else */ } /* end if */ @@ -6315,7 +6314,7 @@ test_mf_fs_persist_split(void) * with the split file driver. */ SKIPPED(); - HDfprintf(stdout, " Persistent FSMs disabled in multi file driver.\n"); + fprintf(stdout, " Persistent FSMs disabled in multi file driver.\n"); return 0; /* <========== note return */ /* File creation property list template */ @@ -6325,7 +6324,7 @@ test_mf_fs_persist_split(void) * with the split file driver. */ SKIPPED(); - HDfprintf(stdout, " Persistent FSMs disabled in multi file driver.\n"); + fprintf(stdout, " Persistent FSMs disabled in multi file driver.\n"); return 0; /* <========== note return */ /* File creation property list template */ @@ -6571,11 +6570,11 @@ error: #define MULTI_SETUP(memb_map, memb_fapl, memb_name, memb_addr, sv) \ { \ H5FD_mem_t mt; \ - HDmemset(memb_map, 0, sizeof memb_map); \ - HDmemset(memb_fapl, 0, sizeof memb_fapl); \ - HDmemset(memb_name, 0, sizeof memb_name); \ - HDmemset(memb_addr, 0, sizeof memb_addr); \ - HDmemset(sv, 0, sizeof sv); \ + memset(memb_map, 0, sizeof memb_map); \ + memset(memb_fapl, 0, sizeof memb_fapl); \ + memset(memb_name, 0, sizeof memb_name); \ + memset(memb_addr, 0, sizeof memb_addr); \ + memset(sv, 0, sizeof sv); \ for (mt = H5FD_MEM_DEFAULT; mt < H5FD_MEM_NTYPES; mt++) { \ memb_map[mt] = H5FD_MEM_SUPER; \ memb_fapl[mt] = H5P_DEFAULT; \ @@ -6638,14 +6637,14 @@ test_mf_fs_persist_multi(void) * with the multi file driver. */ SKIPPED(); - HDfprintf(stdout, " Persistent FSMs disabled in multi file driver.\n"); + fprintf(stdout, " Persistent FSMs disabled in multi file driver.\n"); return 0; /* <========== note return */ /* for now, we don't support persistent free space managers * with the multi file driver. */ SKIPPED(); - HDfprintf(stdout, " Persistent FSMs disabled in multi file driver.\n"); + fprintf(stdout, " Persistent FSMs disabled in multi file driver.\n"); return 0; /* <========== note return */ /* File creation property list template */ @@ -7415,7 +7414,7 @@ test_mf_strat_thres_persist(const char *env_h5_drvr, hid_t fapl, hbool_t new_for if (nsects) { /* Allocate storage for the free space section information */ - sect_info = (H5F_sect_info_t *)HDcalloc((size_t)nsects, sizeof(H5F_sect_info_t)); + sect_info = (H5F_sect_info_t *)calloc((size_t)nsects, sizeof(H5F_sect_info_t)); H5Fget_free_sections(file, H5FD_MEM_DEFAULT, (size_t)nsects, sect_info); @@ -7424,7 +7423,7 @@ test_mf_strat_thres_persist(const char *env_h5_drvr, hid_t fapl, hbool_t new_for if (sect_info[i].size < fs_threshold) TEST_ERROR; if (sect_info) - HDfree(sect_info); + free(sect_info); } } else { @@ -7493,7 +7492,7 @@ test_mf_strat_thres_gone(const char *env_h5_drvr, hid_t fapl, hbool_t new_format /* Set the filename to use for this test (dependent on fapl) */ h5_fixname(FILENAME[0], fapl, filename, sizeof(filename)); - HDmemset(&fs_state_zero, 0, sizeof(H5FS_stat_t)); + memset(&fs_state_zero, 0, sizeof(H5FS_stat_t)); /* Copy the file access property list */ if ((fapl2 = H5Pcopy(fapl)) < 0) @@ -7513,7 +7512,7 @@ test_mf_strat_thres_gone(const char *env_h5_drvr, hid_t fapl, hbool_t new_format continue; /* Clear out free-space statistics */ - HDmemset(&fs_state, 0, sizeof(H5FS_stat_t)); + memset(&fs_state, 0, sizeof(H5FS_stat_t)); /* Create file-creation template */ if ((fcpl = H5Pcreate(H5P_FILE_CREATE)) < 0) @@ -7756,9 +7755,9 @@ set_multi_split(hid_t fapl, hsize_t pagesize, hbool_t is_multi_or_split) hbool_t relax; H5FD_mem_t mt; - HDassert(is_multi_or_split); + assert(is_multi_or_split); - HDmemset(memb_name, 0, sizeof memb_name); + memset(memb_name, 0, sizeof memb_name); /* Get current split settings */ if (H5Pget_fapl_multi(fapl, memb_map, memb_fapl_arr, memb_name, memb_addr, &relax) < 0) @@ -7782,7 +7781,7 @@ set_multi_split(hid_t fapl, hsize_t pagesize, hbool_t is_multi_or_split) /* Free memb_name */ for (mt = H5FD_MEM_DEFAULT; mt < H5FD_MEM_NTYPES; mt++) - HDfree(memb_name[mt]); + free(memb_name[mt]); return 0; @@ -8897,7 +8896,7 @@ test_page_alignment(const char *env_h5_drvr, hid_t fapl) if (H5Pset_alignment(memb_fapl, 0, (hsize_t)TEST_ALIGN16) < 0) TEST_ERROR; - HDmemset(memb_name, 0, sizeof memb_name); + memset(memb_name, 0, sizeof memb_name); if (split) { /* Set split driver with new FAPLs */ @@ -8941,7 +8940,7 @@ test_page_alignment(const char *env_h5_drvr, hid_t fapl) /* Free memb_name */ for (mt = H5FD_MEM_DEFAULT; mt < H5FD_MEM_NTYPES; mt++) - HDfree(memb_name[mt]); + free(memb_name[mt]); /* Close memb_fapl */ if (H5Pclose(memb_fapl) < 0) diff --git a/test/mirror_vfd.c b/test/mirror_vfd.c index 489a9c0..0d88a30 100644 --- a/test/mirror_vfd.c +++ b/test/mirror_vfd.c @@ -63,8 +63,8 @@ static unsigned int g_verbosity = DEFAULT_VERBOSITY; #define LOGPRINT(lvl, ...) \ do { \ if ((lvl) <= g_verbosity) { \ - HDfprintf(g_log_stream, __VA_ARGS__); \ - HDfflush(g_log_stream); \ + fprintf(g_log_stream, __VA_ARGS__); \ + fflush(g_log_stream); \ } \ } while (0) @@ -140,7 +140,7 @@ populate_filepath(const char *dirname, const char *basename, hid_t fapl_id, char if ((basename == NULL) || (*basename == 0) || (dirname == NULL) || (*dirname == 0) || (path_out == NULL)) TEST_ERROR; - if (NULL == (path = HDcalloc(H5FD_SPLITTER_PATH_MAX, sizeof(char)))) + if (NULL == (path = calloc(H5FD_SPLITTER_PATH_MAX, sizeof(char)))) TEST_ERROR; if (HDsnprintf(path, H5FD_SPLITTER_PATH_MAX, "%s%s%s", dirname, @@ -157,12 +157,12 @@ populate_filepath(const char *dirname, const char *basename, hid_t fapl_id, char TEST_ERROR; } - HDfree(path); + free(path); return SUCCEED; error: - HDfree(path); + free(path); return FAIL; } /* end populate_filepath() */ @@ -181,7 +181,7 @@ build_paths(const char *basename, H5FD_splitter_vfd_config_t *splitter_config, { char *baselogname = NULL; - if (NULL == (baselogname = HDcalloc(H5FD_SPLITTER_PATH_MAX, sizeof(char)))) + if (NULL == (baselogname = calloc(H5FD_SPLITTER_PATH_MAX, sizeof(char)))) TEST_ERROR; if (populate_filepath(MIRROR_RW_DIR, basename, splitter_config->rw_fapl_id, names->rw, TRUE) < 0) @@ -198,12 +198,12 @@ build_paths(const char *basename, H5FD_splitter_vfd_config_t *splitter_config, if (populate_filepath(MIRROR_WO_DIR, baselogname, splitter_config->wo_fapl_id, names->log, FALSE) < 0) TEST_ERROR; - HDfree(baselogname); + free(baselogname); return SUCCEED; error: - HDfree(baselogname); + free(baselogname); return FAIL; } /* end build_paths() */ @@ -274,16 +274,16 @@ error: } \ if (_x != (len)) { \ size_t _y = 0; \ - HDprintf("First bytes differ at %zu\n", _x); \ - HDprintf("exp "); \ + printf("First bytes differ at %zu\n", _x); \ + printf("exp "); \ for (_y = _x; _y < (len); _y++) { \ - HDprintf("%02X", (unsigned char)(exp)[_y]); \ + printf("%02X", (unsigned char)(exp)[_y]); \ } \ - HDprintf("\nact "); \ + printf("\nact "); \ for (_y = _x; _y < (len); _y++) { \ - HDprintf("%02X", (unsigned char)(act)[_y]); \ + printf("%02X", (unsigned char)(act)[_y]); \ } \ - HDprintf("\n"); \ + printf("\n"); \ } \ } while (0); /* end PRINT_BUFFER_DIFF */ @@ -303,13 +303,13 @@ test_encdec_uint8_t(void) TESTING("Mirror encode/decode of uint8_t data"); /* Start of buffer uint8_t */ - HDmemset(buf, 0, 8); - HDmemset(expected, 0, 8); + memset(buf, 0, 8); + memset(expected, 0, 8); expected[0] = 200; out = 0; if (H5FD__mirror_xmit_encode_uint8(buf, v) != 1) TEST_ERROR; - if (HDmemcmp(buf, expected, 8) != 0) { + if (memcmp(buf, expected, 8) != 0) { PRINT_BUFFER_DIFF(buf, expected, 8); TEST_ERROR; } @@ -319,13 +319,13 @@ test_encdec_uint8_t(void) TEST_ERROR; /* Middle of buffer uint8_t */ - HDmemset(buf, 0, 8); - HDmemset(expected, 0, 8); + memset(buf, 0, 8); + memset(expected, 0, 8); expected[3] = v; out = 0; if (H5FD__mirror_xmit_encode_uint8((buf + 3), v) != 1) TEST_ERROR; - if (HDmemcmp(buf, expected, 8) != 0) { + if (memcmp(buf, expected, 8) != 0) { PRINT_BUFFER_DIFF(buf, expected, 8); TEST_ERROR; } @@ -335,13 +335,13 @@ test_encdec_uint8_t(void) TEST_ERROR; /* End of buffer uint8_t */ - HDmemset(buf, 0, 8); - HDmemset(expected, 0, 8); + memset(buf, 0, 8); + memset(expected, 0, 8); expected[7] = v; out = 0; if (H5FD__mirror_xmit_encode_uint8((buf + 7), v) != 1) TEST_ERROR; - if (HDmemcmp(buf, expected, 8) != 0) { + if (memcmp(buf, expected, 8) != 0) { PRINT_BUFFER_DIFF(buf, expected, 8); TEST_ERROR; } @@ -369,14 +369,14 @@ test_encdec_uint16_t(void) TESTING("Mirror encode/decode of uint16_t data"); /* Start of buffer uint16_t */ - HDmemset(buf, 0, 8); - HDmemset(expected, 0, 8); + memset(buf, 0, 8); + memset(expected, 0, 8); expected[0] = 0x8F; expected[1] = 0x02; out = 0; if (H5FD__mirror_xmit_encode_uint16(buf, v) != 2) TEST_ERROR; - if (HDmemcmp(buf, expected, 8) != 0) { + if (memcmp(buf, expected, 8) != 0) { PRINT_BUFFER_DIFF(buf, expected, 8); TEST_ERROR; } @@ -386,14 +386,14 @@ test_encdec_uint16_t(void) TEST_ERROR; /* Middle of buffer uint16_t */ - HDmemset(buf, 0, 8); - HDmemset(expected, 0, 8); + memset(buf, 0, 8); + memset(expected, 0, 8); expected[3] = 0x8F; expected[4] = 0x02; out = 0; if (H5FD__mirror_xmit_encode_uint16((buf + 3), v) != 2) TEST_ERROR; - if (HDmemcmp(buf, expected, 8) != 0) { + if (memcmp(buf, expected, 8) != 0) { PRINT_BUFFER_DIFF(buf, expected, 8); TEST_ERROR; } @@ -409,14 +409,14 @@ test_encdec_uint16_t(void) TEST_ERROR; /* End of buffer uint16_t */ - HDmemset(buf, 0, 8); - HDmemset(expected, 0, 8); + memset(buf, 0, 8); + memset(expected, 0, 8); expected[6] = 0x8F; expected[7] = 0x02; out = 0; if (H5FD__mirror_xmit_encode_uint16((buf + 6), v) != 2) TEST_ERROR; - if (HDmemcmp(buf, expected, 8) != 0) { + if (memcmp(buf, expected, 8) != 0) { PRINT_BUFFER_DIFF(buf, expected, 8); TEST_ERROR; } @@ -444,8 +444,8 @@ test_encdec_uint32_t(void) TESTING("Mirror encode/decode of uint32_t data"); /* Start of buffer uint32_t */ - HDmemset(buf, 0, 8); - HDmemset(expected, 0, 8); + memset(buf, 0, 8); + memset(expected, 0, 8); expected[0] = 0x8F; expected[1] = 0x02; expected[2] = 0x00; @@ -453,7 +453,7 @@ test_encdec_uint32_t(void) out = 0; if (H5FD__mirror_xmit_encode_uint32(buf, v) != 4) TEST_ERROR; - if (HDmemcmp(buf, expected, 8) != 0) { + if (memcmp(buf, expected, 8) != 0) { PRINT_BUFFER_DIFF(buf, expected, 8); TEST_ERROR; } @@ -463,8 +463,8 @@ test_encdec_uint32_t(void) TEST_ERROR; /* Middle of buffer uint32_t */ - HDmemset(buf, 0, 8); - HDmemset(expected, 0, 8); + memset(buf, 0, 8); + memset(expected, 0, 8); expected[3] = 0x8F; expected[4] = 0x02; expected[5] = 0x00; @@ -472,7 +472,7 @@ test_encdec_uint32_t(void) out = 0; if (H5FD__mirror_xmit_encode_uint32((buf + 3), v) != 4) TEST_ERROR; - if (HDmemcmp(buf, expected, 8) != 0) { + if (memcmp(buf, expected, 8) != 0) { PRINT_BUFFER_DIFF(buf, expected, 8); TEST_ERROR; } @@ -487,8 +487,8 @@ test_encdec_uint32_t(void) TEST_ERROR; /* End of buffer uint32_t */ - HDmemset(buf, 0, 8); - HDmemset(expected, 0, 8); + memset(buf, 0, 8); + memset(expected, 0, 8); expected[4] = 0x8F; expected[5] = 0x02; expected[6] = 0x00; @@ -496,7 +496,7 @@ test_encdec_uint32_t(void) out = 0; if (H5FD__mirror_xmit_encode_uint32((buf + 4), v) != 4) TEST_ERROR; - if (HDmemcmp(buf, expected, 8) != 0) { + if (memcmp(buf, expected, 8) != 0) { PRINT_BUFFER_DIFF(buf, expected, 8); TEST_ERROR; } @@ -524,8 +524,8 @@ test_encdec_uint64_t(void) TESTING("Mirror encode/decode of uint64_t data"); /* Start of buffer uint64_t */ - HDmemset(buf, 0, 16); - HDmemset(expected, 0, 16); + memset(buf, 0, 16); + memset(expected, 0, 16); expected[0] = 0x90; expected[1] = 0xDC; expected[2] = 0xBE; @@ -537,7 +537,7 @@ test_encdec_uint64_t(void) out = 0; if (H5FD__mirror_xmit_encode_uint64(buf, v) != 8) TEST_ERROR; - if (HDmemcmp(buf, expected, 16) != 0) { + if (memcmp(buf, expected, 16) != 0) { PRINT_BUFFER_DIFF(buf, expected, 16); TEST_ERROR; } @@ -547,8 +547,8 @@ test_encdec_uint64_t(void) TEST_ERROR; /* Middle of buffer uint64_t */ - HDmemset(buf, 0, 16); - HDmemset(expected, 0, 16); + memset(buf, 0, 16); + memset(expected, 0, 16); expected[3] = 0x90; expected[4] = 0xDC; expected[5] = 0xBE; @@ -560,7 +560,7 @@ test_encdec_uint64_t(void) out = 0; if (H5FD__mirror_xmit_encode_uint64((buf + 3), v) != 8) TEST_ERROR; - if (HDmemcmp(buf, expected, 16) != 0) { + if (memcmp(buf, expected, 16) != 0) { PRINT_BUFFER_DIFF(buf, expected, 16); TEST_ERROR; } @@ -575,8 +575,8 @@ test_encdec_uint64_t(void) TEST_ERROR; /* End of buffer uint64_t */ - HDmemset(buf, 0, 16); - HDmemset(expected, 0, 16); + memset(buf, 0, 16); + memset(expected, 0, 16); expected[8] = 0x90; expected[9] = 0xDC; expected[10] = 0xBE; @@ -588,7 +588,7 @@ test_encdec_uint64_t(void) out = 0; if (H5FD__mirror_xmit_encode_uint64((buf + 8), v) != 8) TEST_ERROR; - if (HDmemcmp(buf, expected, 16) != 0) { + if (memcmp(buf, expected, 16) != 0) { PRINT_BUFFER_DIFF(buf, expected, 16); TEST_ERROR; } @@ -628,7 +628,7 @@ test_encdec_header(H5FD_mirror_xmit_t xmit_mock) FAIL_PUTS_ERROR("Header size definition does not match test\n"); /* Populate the expected buffer; expect end padding of 0xFF */ - HDmemset(expected, 0xFF, H5FD_MIRROR_XMIT_HEADER_SIZE + 8); + memset(expected, 0xFF, H5FD_MIRROR_XMIT_HEADER_SIZE + 8); for (i = 0; i < H5FD_MIRROR_XMIT_HEADER_SIZE; i++) { expected[i + 2] = (unsigned char)i; } @@ -636,10 +636,10 @@ test_encdec_header(H5FD_mirror_xmit_t xmit_mock) /* Encode, and compare buffer contents * Initial buffer is filled with 0xFF to match expected padding */ - HDmemset(buf, 0xFF, H5FD_MIRROR_XMIT_HEADER_SIZE + 8); + memset(buf, 0xFF, H5FD_MIRROR_XMIT_HEADER_SIZE + 8); if (H5FD_mirror_xmit_encode_header((buf + 2), &xmit_mock) != H5FD_MIRROR_XMIT_HEADER_SIZE) TEST_ERROR; - if (HDmemcmp(buf, expected, H5FD_MIRROR_XMIT_HEADER_SIZE + 8) != 0) { + if (memcmp(buf, expected, H5FD_MIRROR_XMIT_HEADER_SIZE + 8) != 0) { PRINT_BUFFER_DIFF(buf, expected, H5FD_MIRROR_XMIT_HEADER_SIZE + 8); TEST_ERROR; } @@ -704,7 +704,7 @@ test_encdec_set_eoa(H5FD_mirror_xmit_t xmit_mock) FAIL_PUTS_ERROR("shared header structure is not in expected state"); /* Populate the expected buffer; expect end padding of 0xFF */ - HDmemset(expected, 0xFF, H5FD_MIRROR_XMIT_EOA_SIZE + 8); + memset(expected, 0xFF, H5FD_MIRROR_XMIT_EOA_SIZE + 8); for (i = 0; i < H5FD_MIRROR_XMIT_EOA_SIZE; i++) expected[i + 2] = (unsigned char)i; @@ -716,10 +716,10 @@ test_encdec_set_eoa(H5FD_mirror_xmit_t xmit_mock) /* Encode, and compare buffer contents * Initial buffer is filled with 0xFF to match expected padding */ - HDmemset(buf, 0xFF, H5FD_MIRROR_XMIT_EOA_SIZE + 8); + memset(buf, 0xFF, H5FD_MIRROR_XMIT_EOA_SIZE + 8); if (H5FD_mirror_xmit_encode_set_eoa((buf + 2), &xmit_in) != H5FD_MIRROR_XMIT_EOA_SIZE) TEST_ERROR; - if (HDmemcmp(buf, expected, H5FD_MIRROR_XMIT_EOA_SIZE + 8) != 0) { + if (memcmp(buf, expected, H5FD_MIRROR_XMIT_EOA_SIZE + 8) != 0) { PRINT_BUFFER_DIFF(buf, expected, H5FD_MIRROR_XMIT_EOA_SIZE + 8); TEST_ERROR; } @@ -792,7 +792,7 @@ test_encdec_lock(H5FD_mirror_xmit_t xmit_mock) FAIL_PUTS_ERROR("shared header structure is not in expected state"); /* Populate the expected buffer; expect end padding of 0xFF */ - HDmemset(expected, 0xFF, H5FD_MIRROR_XMIT_LOCK_SIZE + 8); + memset(expected, 0xFF, H5FD_MIRROR_XMIT_LOCK_SIZE + 8); for (i = 0; i < H5FD_MIRROR_XMIT_LOCK_SIZE; i++) expected[i + 2] = (unsigned char)i; @@ -803,10 +803,10 @@ test_encdec_lock(H5FD_mirror_xmit_t xmit_mock) /* Encode, and compare buffer contents * Initial buffer is filled with 0xFF to match expected padding */ - HDmemset(buf, 0xFF, H5FD_MIRROR_XMIT_LOCK_SIZE + 8); + memset(buf, 0xFF, H5FD_MIRROR_XMIT_LOCK_SIZE + 8); if (H5FD_mirror_xmit_encode_lock((buf + 2), &xmit_in) != H5FD_MIRROR_XMIT_LOCK_SIZE) TEST_ERROR; - if (HDmemcmp(buf, expected, H5FD_MIRROR_XMIT_LOCK_SIZE + 8) != 0) { + if (memcmp(buf, expected, H5FD_MIRROR_XMIT_LOCK_SIZE + 8) != 0) { PRINT_BUFFER_DIFF(buf, expected, H5FD_MIRROR_XMIT_LOCK_SIZE + 8); TEST_ERROR; } @@ -877,17 +877,17 @@ test_encdec_open(H5FD_mirror_xmit_t xmit_mock) FAIL_PUTS_ERROR("shared header structure is not in expected state"); /* Allocate memory */ - if (NULL == (buf = HDmalloc((H5FD_MIRROR_XMIT_OPEN_SIZE + 8) * sizeof(unsigned char)))) + if (NULL == (buf = malloc((H5FD_MIRROR_XMIT_OPEN_SIZE + 8) * sizeof(unsigned char)))) FAIL_PUTS_ERROR("Unable to allocate memory for buf"); - if (NULL == (expected = HDmalloc((H5FD_MIRROR_XMIT_OPEN_SIZE + 8) * sizeof(unsigned char)))) + if (NULL == (expected = malloc((H5FD_MIRROR_XMIT_OPEN_SIZE + 8) * sizeof(unsigned char)))) FAIL_PUTS_ERROR("Unable to allocate memory for expected"); - if (NULL == (xmit_in = HDmalloc(sizeof(H5FD_mirror_xmit_open_t)))) + if (NULL == (xmit_in = malloc(sizeof(H5FD_mirror_xmit_open_t)))) FAIL_PUTS_ERROR("Unable to allocate memory for xmit_in"); - if (NULL == (xmit_out = HDmalloc(sizeof(H5FD_mirror_xmit_open_t)))) + if (NULL == (xmit_out = malloc(sizeof(H5FD_mirror_xmit_open_t)))) FAIL_PUTS_ERROR("Unable to allocate memory for xmit_out"); /* Populate the expected buffer; expect end padding of 0xFF */ - HDmemset(expected, 0xFF, H5FD_MIRROR_XMIT_OPEN_SIZE + 8); + memset(expected, 0xFF, H5FD_MIRROR_XMIT_OPEN_SIZE + 8); for (size_t i = 0; i < H5FD_MIRROR_XMIT_OPEN_SIZE; i++) { /* 0x100 is "zero" in a byte, so encode will treat it as a NULL- * terminator in the filepath string. Expect all zeroes following. @@ -909,10 +909,10 @@ test_encdec_open(H5FD_mirror_xmit_t xmit_mock) /* Encode, and compare buffer contents * Initial buffer is filled with 0xFF to match expected padding */ - HDmemset(buf, 0xFF, H5FD_MIRROR_XMIT_OPEN_SIZE + 8); + memset(buf, 0xFF, H5FD_MIRROR_XMIT_OPEN_SIZE + 8); if (H5FD_mirror_xmit_encode_open((buf + 2), xmit_in) != H5FD_MIRROR_XMIT_OPEN_SIZE) TEST_ERROR; - if (HDmemcmp(buf, expected, H5FD_MIRROR_XMIT_OPEN_SIZE + 8) != 0) { + if (memcmp(buf, expected, H5FD_MIRROR_XMIT_OPEN_SIZE + 8) != 0) { PRINT_BUFFER_DIFF(buf, expected, H5FD_MIRROR_XMIT_OPEN_SIZE + 8); TEST_ERROR; } @@ -970,19 +970,19 @@ test_encdec_open(H5FD_mirror_xmit_t xmit_mock) TEST_ERROR; } - HDfree(buf); - HDfree(expected); - HDfree(xmit_in); - HDfree(xmit_out); + free(buf); + free(expected); + free(xmit_in); + free(xmit_out); PASSED(); return 0; error: - HDfree(buf); - HDfree(expected); - HDfree(xmit_in); - HDfree(xmit_out); + free(buf); + free(expected); + free(xmit_in); + free(xmit_out); return -1; } @@ -1013,7 +1013,7 @@ test_encdec_reply(H5FD_mirror_xmit_t xmit_mock) FAIL_PUTS_ERROR("shared header structure is not in expected state"); /* Populate the expected buffer; expect end padding of 0xFF */ - HDmemset(expected, 0xFF, H5FD_MIRROR_XMIT_REPLY_SIZE + 8); + memset(expected, 0xFF, H5FD_MIRROR_XMIT_REPLY_SIZE + 8); for (i = 0; i < H5FD_MIRROR_XMIT_REPLY_SIZE; i++) { /* 0x100 is "zero" in a byte, so encode will treat it as a NULL- * terminator in the filepath string. Expect all zeroes following. @@ -1033,10 +1033,10 @@ test_encdec_reply(H5FD_mirror_xmit_t xmit_mock) /* Encode, and compare buffer contents * Initial buffer is filled with 0xFF to match expected padding */ - HDmemset(buf, 0xFF, H5FD_MIRROR_XMIT_REPLY_SIZE + 8); + memset(buf, 0xFF, H5FD_MIRROR_XMIT_REPLY_SIZE + 8); if (H5FD_mirror_xmit_encode_reply((buf + 2), &xmit_in) != H5FD_MIRROR_XMIT_REPLY_SIZE) TEST_ERROR; - if (HDmemcmp(buf, expected, H5FD_MIRROR_XMIT_REPLY_SIZE + 8) != 0) { + if (memcmp(buf, expected, H5FD_MIRROR_XMIT_REPLY_SIZE + 8) != 0) { PRINT_BUFFER_DIFF(buf, expected, H5FD_MIRROR_XMIT_REPLY_SIZE + 8); TEST_ERROR; } @@ -1116,7 +1116,7 @@ test_encdec_write(H5FD_mirror_xmit_t xmit_mock) FAIL_PUTS_ERROR("shared header structure is not in expected state"); /* Populate the expected buffer; expect end padding of 0xFF */ - HDmemset(expected, 0xFF, H5FD_MIRROR_XMIT_WRITE_SIZE + 8); + memset(expected, 0xFF, H5FD_MIRROR_XMIT_WRITE_SIZE + 8); for (i = 0; i < H5FD_MIRROR_XMIT_WRITE_SIZE; i++) expected[i + 2] = (unsigned char)i; @@ -1129,10 +1129,10 @@ test_encdec_write(H5FD_mirror_xmit_t xmit_mock) /* Encode, and compare buffer contents * Initial buffer is filled with 0xFF to match expected padding */ - HDmemset(buf, 0xFF, H5FD_MIRROR_XMIT_WRITE_SIZE + 8); + memset(buf, 0xFF, H5FD_MIRROR_XMIT_WRITE_SIZE + 8); if (H5FD_mirror_xmit_encode_write((buf + 2), &xmit_in) != H5FD_MIRROR_XMIT_WRITE_SIZE) TEST_ERROR; - if (HDmemcmp(buf, expected, H5FD_MIRROR_XMIT_WRITE_SIZE + 8) != 0) { + if (memcmp(buf, expected, H5FD_MIRROR_XMIT_WRITE_SIZE + 8) != 0) { PRINT_BUFFER_DIFF(buf, expected, H5FD_MIRROR_XMIT_WRITE_SIZE + 8); TEST_ERROR; } @@ -1209,7 +1209,7 @@ create_mirroring_split_fapl(const char *basename, struct mirrortest_filenames *n H5FD_mirror_fapl_t mirror_conf; hid_t ret_value = H5I_INVALID_HID; - if (NULL == (splitter_config = HDmalloc(sizeof(H5FD_splitter_vfd_config_t)))) + if (NULL == (splitter_config = malloc(sizeof(H5FD_splitter_vfd_config_t)))) TEST_ERROR; /* Initialize the fapls, too, so the library doesn't try to @@ -1263,7 +1263,7 @@ create_mirroring_split_fapl(const char *basename, struct mirrortest_filenames *n if (H5Pclose(splitter_config->wo_fapl_id) < 0) TEST_ERROR; - HDfree(splitter_config); + free(splitter_config); return ret_value; @@ -1275,7 +1275,7 @@ error: H5Pclose(ret_value); } H5E_END_TRY; - HDfree(splitter_config); + free(splitter_config); return H5I_INVALID_HID; } /* end create_mirroring_split_fapl() */ @@ -1302,7 +1302,7 @@ test_create_and_close(const struct mt_opts *opts) TESTING("File creation and immediate close"); - if (NULL == (names = HDmalloc(sizeof(struct mirrortest_filenames)))) + if (NULL == (names = malloc(sizeof(struct mirrortest_filenames)))) TEST_ERROR; /* Create FAPL for splitter[sec2|mirror] */ @@ -1317,13 +1317,13 @@ test_create_and_close(const struct mt_opts *opts) if (H5Pclose(fapl_id) < 0) TEST_ERROR; - HDfree(names); + free(names); PASSED(); return 0; error: - HDfree(names); + free(names); H5E_BEGIN_TRY { H5Fclose(file_id); @@ -1359,9 +1359,9 @@ create_datasets(hid_t file_id, unsigned min_dset, unsigned max_dset) hsize_t chunk_dims[2] = {CHUNK_DIM, CHUNK_DIM}; hsize_t dset_dims[2] = {DSET_DIM, DSET_DIM}; - HDassert(file_id >= 0); - HDassert(min_dset <= max_dset); - HDassert(max_dset <= MAX_DSET_COUNT); + assert(file_id >= 0); + assert(min_dset <= max_dset); + assert(max_dset <= MAX_DSET_COUNT); LOGPRINT(2, "create_dataset()\n"); @@ -1678,9 +1678,9 @@ verify_datasets(hid_t file_id, unsigned min_dset, unsigned max_dset) hid_t memspace_id = H5I_INVALID_HID; hsize_t chunk_dims[2] = {CHUNK_DIM, CHUNK_DIM}; - HDassert(file_id >= 0); - HDassert(min_dset <= max_dset); - HDassert(max_dset <= MAX_DSET_COUNT); + assert(file_id >= 0); + assert(min_dset <= max_dset); + assert(max_dset <= MAX_DSET_COUNT); LOGPRINT(2, "verify_datasets()\n"); @@ -1741,7 +1741,7 @@ test_basic_dataset_write(const struct mt_opts *opts) TESTING("Mirror open and dataset writing"); - if (NULL == (names = HDmalloc(sizeof(struct mirrortest_filenames)))) + if (NULL == (names = malloc(sizeof(struct mirrortest_filenames)))) TEST_ERROR; /* Create FAPL for Splitter[sec2|mirror] */ @@ -1749,7 +1749,7 @@ test_basic_dataset_write(const struct mt_opts *opts) TEST_ERROR; /* Prepare data to be written */ - if (NULL == (buf = HDmalloc(DATABUFFER_SIZE * DATABUFFER_SIZE * sizeof(int)))) + if (NULL == (buf = malloc(DATABUFFER_SIZE * DATABUFFER_SIZE * sizeof(int)))) TEST_ERROR; for (i = 0; i < DATABUFFER_SIZE; i++) { for (j = 0; j < DATABUFFER_SIZE; j++) { @@ -1798,15 +1798,15 @@ test_basic_dataset_write(const struct mt_opts *opts) if (h5_compare_file_bytes(names->rw, names->wo) < 0) TEST_ERROR; - HDfree(buf); - HDfree(names); + free(buf); + free(names); PASSED(); return 0; error: - HDfree(buf); - HDfree(names); + free(buf); + free(names); H5E_BEGIN_TRY { @@ -1841,7 +1841,7 @@ test_chunked_dataset_write(const struct mt_opts *opts) TESTING("Mirror open and dataset writing (chunked)"); - if (NULL == (names = HDmalloc(sizeof(struct mirrortest_filenames)))) + if (NULL == (names = malloc(sizeof(struct mirrortest_filenames)))) TEST_ERROR; /* Create FAPL for Splitter[sec2|mirror] */ @@ -1891,13 +1891,13 @@ test_chunked_dataset_write(const struct mt_opts *opts) TEST_ERROR; } - HDfree(names); + free(names); PASSED(); return 0; error: - HDfree(names); + free(names); H5E_BEGIN_TRY { H5Fclose(file_id); @@ -1931,7 +1931,7 @@ test_on_disk_zoo(const struct mt_opts *opts) TESTING("'Zoo' of on-disk structures"); - if (NULL == (names = HDmalloc(sizeof(struct mirrortest_filenames)))) + if (NULL == (names = malloc(sizeof(struct mirrortest_filenames)))) TEST_ERROR; /* Create FAPL for Splitter[sec2|mirror] */ @@ -1963,7 +1963,7 @@ test_on_disk_zoo(const struct mt_opts *opts) validate_zoo(file_id, grp_name, 0); /* sanity-check */ if (!pass) { - HDprintf("%s", failure_mssg); + printf("%s", failure_mssg); TEST_ERROR; } @@ -1982,13 +1982,13 @@ test_on_disk_zoo(const struct mt_opts *opts) if (h5_compare_file_bytes(names->rw, names->wo) < 0) TEST_ERROR; - HDfree(names); + free(names); PASSED(); return 0; error: - HDfree(names); + free(names); H5E_BEGIN_TRY { H5Fclose(file_id); @@ -2035,9 +2035,9 @@ test_vanishing_datasets(const struct mt_opts *opts) TESTING("Vanishing Datasets"); - if (NULL == (names = HDmalloc(sizeof(struct mirrortest_filenames)))) + if (NULL == (names = malloc(sizeof(struct mirrortest_filenames)))) TEST_ERROR; - if (NULL == (buf = HDcalloc(1, sizeof(*buf)))) + if (NULL == (buf = calloc(1, sizeof(*buf)))) TEST_ERROR; /* -------------------- */ @@ -2095,7 +2095,7 @@ test_vanishing_datasets(const struct mt_opts *opts) if (H5Gget_info(file_id, &group_info) < 0) TEST_ERROR; if (group_info.nlinks > 0) { - HDfprintf(stderr, "links in rw file: %" PRIuHSIZE "\n", group_info.nlinks); + fprintf(stderr, "links in rw file: %" PRIuHSIZE "\n", group_info.nlinks); TEST_ERROR; } if (H5Fclose(file_id) < 0) @@ -2105,7 +2105,7 @@ test_vanishing_datasets(const struct mt_opts *opts) if (H5Gget_info(file_id, &group_info) < 0) TEST_ERROR; if (group_info.nlinks > 0) { - HDfprintf(stderr, "links in wo file: %" PRIuHSIZE "\n", group_info.nlinks); + fprintf(stderr, "links in wo file: %" PRIuHSIZE "\n", group_info.nlinks); TEST_ERROR; } if (H5Fclose(file_id) < 0) @@ -2121,15 +2121,15 @@ test_vanishing_datasets(const struct mt_opts *opts) if (H5Pclose(fapl_id) < 0) TEST_ERROR; - HDfree(names); - HDfree(buf); + free(names); + free(buf); PASSED(); return 0; error: - HDfree(names); - HDfree(buf); + free(names); + free(buf); H5E_BEGIN_TRY { H5Pclose(fapl_id); @@ -2173,7 +2173,7 @@ test_concurrent_access(const struct mt_opts *opts) TESTING("Concurrent opened mirrored files"); - if (NULL == (bundle = HDmalloc(sizeof(struct file_bundle) * CONCURRENT_COUNT))) + if (NULL == (bundle = malloc(sizeof(struct file_bundle) * CONCURRENT_COUNT))) TEST_ERROR; /* Initialize bundle */ @@ -2198,7 +2198,7 @@ test_concurrent_access(const struct mt_opts *opts) } /* Prepare data to be written */ - if (NULL == (buf = HDmalloc(DATABUFFER_SIZE * DATABUFFER_SIZE * sizeof(int)))) + if (NULL == (buf = malloc(DATABUFFER_SIZE * DATABUFFER_SIZE * sizeof(int)))) TEST_ERROR; for (i = 0; i < DATABUFFER_SIZE; i++) { for (j = 0; j < DATABUFFER_SIZE; j++) { @@ -2258,8 +2258,8 @@ test_concurrent_access(const struct mt_opts *opts) if (h5_compare_file_bytes(bundle[i].names.rw, bundle[i].names.wo) < 0) TEST_ERROR; - HDfree(bundle); - HDfree(buf); + free(bundle); + free(buf); PASSED(); return 0; @@ -2275,8 +2275,8 @@ error: } } H5E_END_TRY; - HDfree(bundle); - HDfree(buf); + free(bundle); + free(buf); return -1; } /* end test_concurrent_access() */ @@ -2302,9 +2302,9 @@ parse_args(int argc, char **argv, struct mt_opts *opts) if (!HDstrncmp(argv[i], "--ip=", 5)) HDstrncpy(opts->ip, argv[i] + 5, H5FD_MIRROR_MAX_IP_LEN); else if (!HDstrncmp(argv[i], "--port=", 7)) - opts->portno = HDatoi(argv[i] + 7); + opts->portno = atoi(argv[i] + 7); else { - HDprintf("Unrecognized option: '%s'\n", argv[i]); + printf("Unrecognized option: '%s'\n", argv[i]); return -1; } } /* end for each argument from command line */ @@ -2334,37 +2334,37 @@ confirm_server(struct mt_opts *opts) live_socket = HDsocket(AF_INET, SOCK_STREAM, 0); if (live_socket < 0) { - HDprintf("ERROR socket()\n"); + printf("ERROR socket()\n"); return -1; } target_addr.sin_family = AF_INET; target_addr.sin_port = HDhtons((uint16_t)opts->portno); target_addr.sin_addr.s_addr = HDinet_addr(opts->ip); - HDmemset(target_addr.sin_zero, '\0', sizeof(target_addr.sin_zero)); + memset(target_addr.sin_zero, '\0', sizeof(target_addr.sin_zero)); while (1) { if (HDconnect(live_socket, (struct sockaddr *)&target_addr, (socklen_t)sizeof(target_addr)) < 0) { if (attempt > 10) { - HDprintf("ERROR connect() (%d)\n%s\n", errno, HDstrerror(errno)); + printf("ERROR connect() (%d)\n%s\n", errno, HDstrerror(errno)); return -1; } /* Close socket during sleep() */ if (HDclose(live_socket) < 0) { - HDprintf("ERROR close() can't close socket\n"); + printf("ERROR close() can't close socket\n"); return -1; } live_socket = -1; attempt++; HDsleep(1); - HDprintf("attempt #%u: ERROR connect() (%d)\n%s\n", attempt, errno, HDstrerror(errno)); + printf("attempt #%u: ERROR connect() (%d)\n%s\n", attempt, errno, HDstrerror(errno)); /* Re-open socket for retry */ live_socket = HDsocket(AF_INET, SOCK_STREAM, 0); if (live_socket < 0) { - HDprintf("ERROR socket()\n"); + printf("ERROR socket()\n"); return -1; } } @@ -2374,22 +2374,22 @@ confirm_server(struct mt_opts *opts) /* Request confirmation from the server */ if (HDwrite(live_socket, "CONFIRM", 8) == -1) { - HDprintf("ERROR write() (%d)\n%s\n", errno, HDstrerror(errno)); + printf("ERROR write() (%d)\n%s\n", errno, HDstrerror(errno)); return -1; } /* Read & verify response from port connection. */ if (HDread(live_socket, &mybuf, sizeof(mybuf)) == -1) { - HDprintf("ERROR read() can't receive data\n"); + printf("ERROR read() can't receive data\n"); return -1; } if (HDstrncmp("ALIVE", mybuf, 6)) { - HDprintf("ERROR read() didn't receive data from server\n"); + printf("ERROR read() didn't receive data from server\n"); return -1; } if (HDclose(live_socket) < 0) { - HDprintf("ERROR close() can't close socket\n"); + printf("ERROR close() can't close socket\n"); return -1; } @@ -2415,7 +2415,7 @@ main(int argc, char **argv) g_log_stream = stdout; /* default debug/logging output stream */ - HDprintf("Testing Mirror VFD functionality.\n"); + printf("Testing Mirror VFD functionality.\n"); /* SETUP */ @@ -2430,13 +2430,13 @@ main(int argc, char **argv) } if (parse_args(argc, argv, &opts) < 0) { - HDprintf("Unable to parse arguments\n"); - HDexit(EXIT_FAILURE); + printf("Unable to parse arguments\n"); + exit(EXIT_FAILURE); } if (confirm_server(&opts) < 0) { - HDprintf("Unable to confirm server is running\n"); - HDexit(EXIT_FAILURE); + printf("Unable to confirm server is running\n"); + exit(EXIT_FAILURE); } /* TESTS */ @@ -2477,11 +2477,11 @@ main(int argc, char **argv) } if (nerrors) { - HDprintf("***** %d Mirror VFD TEST%s FAILED! *****\n", nerrors, nerrors > 1 ? "S" : ""); + printf("***** %d Mirror VFD TEST%s FAILED! *****\n", nerrors, nerrors > 1 ? "S" : ""); return EXIT_FAILURE; } - HDprintf("All Mirror Virtual File Driver tests passed.\n"); + printf("All Mirror Virtual File Driver tests passed.\n"); return EXIT_SUCCESS; } /* end main() */ @@ -2490,8 +2490,8 @@ main(int argc, char **argv) int main(void) { - HDprintf("Testing Mirror VFD functionality.\n"); - HDprintf("SKIPPED - Mirror VFD not built.\n"); + printf("Testing Mirror VFD functionality.\n"); + printf("SKIPPED - Mirror VFD not built.\n"); return EXIT_SUCCESS; } diff --git a/test/mount.c b/test/mount.c index 6807f36..fd2d969 100644 --- a/test/mount.c +++ b/test/mount.c @@ -1015,7 +1015,7 @@ test_unlink(hid_t fapl) H5E_END_TRY; if (status >= 0) { H5_FAILED(); - HDprintf(" %d: Unmount by name should not have been allowed!\n", __LINE__); + printf(" %d: Unmount by name should not have been allowed!\n", __LINE__); TEST_ERROR; } /* end if */ H5E_BEGIN_TRY @@ -1025,7 +1025,7 @@ test_unlink(hid_t fapl) H5E_END_TRY; if (status >= 0) { H5_FAILED(); - HDprintf(" %d: Unmount by name should not have been allowed!\n", __LINE__); + printf(" %d: Unmount by name should not have been allowed!\n", __LINE__); TEST_ERROR; } /* end if */ if (H5Funmount(mnt, ".") < 0) diff --git a/test/mtime.c b/test/mtime.c index 882189e..2cebcd6 100644 --- a/test/mtime.c +++ b/test/mtime.c @@ -122,7 +122,7 @@ main(void) HDstrftime((char *)buf1, sizeof buf1, "%Y-%m-%d %H:%M:%S", tm); tm = HDlocaltime(&now); HDstrftime((char *)buf2, sizeof buf2, "%Y-%m-%d %H:%M:%S", tm); - HDprintf(" got: %s\n ans: %s\n", buf1, buf2); + printf(" got: %s\n ans: %s\n", buf1, buf2); goto error; } PASSED(); @@ -152,7 +152,7 @@ main(void) } else { H5_FAILED(); - HDprintf("***cannot open the pre-created old modification test file (%s)\n", testfile); + printf("***cannot open the pre-created old modification test file (%s)\n", testfile); goto error; } /* end else */ } @@ -182,7 +182,7 @@ main(void) } else { H5_FAILED(); - HDprintf("***cannot open the pre-created old modification test file (%s)\n", testfile); + printf("***cannot open the pre-created old modification test file (%s)\n", testfile); goto error; } /* end else */ } diff --git a/test/ntypes.c b/test/ntypes.c index 707c71d..e0e0779 100644 --- a/test/ntypes.c +++ b/test/ntypes.c @@ -82,9 +82,9 @@ test_atomic_dtype(hid_t file) TESTING("atomic datatype"); - if (NULL == (ipoints2 = HDcalloc(1, sizeof(*ipoints2)))) + if (NULL == (ipoints2 = calloc(1, sizeof(*ipoints2)))) TEST_ERROR; - if (NULL == (icheck2 = HDcalloc(1, sizeof(*icheck2)))) + if (NULL == (icheck2 = calloc(1, sizeof(*icheck2)))) TEST_ERROR; /* Initialize the dataset */ @@ -132,15 +132,15 @@ test_atomic_dtype(hid_t file) /* Read the dataset back. The temporary buffer is for special platforms * like Cray. */ - if (NULL == (tmp = HDmalloc((size_t)(DIM0 * DIM1 * H5Tget_size(native_type))))) + if (NULL == (tmp = malloc((size_t)(DIM0 * DIM1 * H5Tget_size(native_type))))) TEST_ERROR; if (H5Dread(dataset, native_type, H5S_ALL, H5S_ALL, H5P_DEFAULT, tmp) < 0) TEST_ERROR; /* Copy data from temporary buffer to destination buffer */ - HDmemcpy(icheck2, tmp, (size_t)(DIM0 * DIM1 * H5Tget_size(native_type))); - HDfree(tmp); + memcpy(icheck2, tmp, (size_t)(DIM0 * DIM1 * H5Tget_size(native_type))); + free(tmp); tmp = NULL; /* Convert to the integer type */ @@ -152,8 +152,8 @@ test_atomic_dtype(hid_t file) for (j = 0; j < DIM1; j++) if (ipoints2->arr[i][j] != icheck2->arr[i][j]) { H5_FAILED(); - HDprintf(" Read different values than written.\n"); - HDprintf(" At index %d,%d\n", i, j); + printf(" Read different values than written.\n"); + printf(" At index %d,%d\n", i, j); goto error; } /* end if */ @@ -274,8 +274,8 @@ test_atomic_dtype(hid_t file) if (H5Sclose(space) < 0) TEST_ERROR; - HDfree(ipoints2); - HDfree(icheck2); + free(ipoints2); + free(icheck2); PASSED(); @@ -283,7 +283,7 @@ test_atomic_dtype(hid_t file) error: if (tmp) - HDfree(tmp); + free(tmp); H5E_BEGIN_TRY { @@ -294,8 +294,8 @@ error: } H5E_END_TRY; - HDfree(ipoints2); - HDfree(icheck2); + free(ipoints2); + free(icheck2); return -1; } @@ -340,9 +340,9 @@ test_compound_dtype2(hid_t file) TESTING("nested compound datatype"); /* Allocate space for the points & check arrays */ - if (NULL == (points = (s1 *)HDmalloc(sizeof(s1) * DIM0 * DIM1))) + if (NULL == (points = (s1 *)malloc(sizeof(s1) * DIM0 * DIM1))) TEST_ERROR; - if (NULL == (check = (s1 *)HDcalloc(sizeof(s1), DIM0 * DIM1))) + if (NULL == (check = (s1 *)calloc(sizeof(s1), DIM0 * DIM1))) TEST_ERROR; /* Initialize the dataset */ @@ -538,22 +538,22 @@ test_compound_dtype2(hid_t file) /* Read the dataset back. Temporary buffer is for special platforms like * Cray */ - if (NULL == (tmp = HDmalloc(DIM0 * DIM1 * H5Tget_size(native_type)))) + if (NULL == (tmp = malloc(DIM0 * DIM1 * H5Tget_size(native_type)))) TEST_ERROR; - if (NULL == (bkg = HDcalloc(sizeof(s1), DIM0 * DIM1))) + if (NULL == (bkg = calloc(sizeof(s1), DIM0 * DIM1))) TEST_ERROR; if (H5Dread(dataset, native_type, H5S_ALL, H5S_ALL, H5P_DEFAULT, tmp) < 0) TEST_ERROR; - HDmemcpy(check, tmp, DIM0 * DIM1 * H5Tget_size(native_type)); - HDfree(tmp); + memcpy(check, tmp, DIM0 * DIM1 * H5Tget_size(native_type)); + free(tmp); tmp = NULL; if (H5Tconvert(native_type, tid_m, (DIM0 * DIM1), check, bkg, H5P_DEFAULT) < 0) TEST_ERROR; - HDfree(bkg); + free(bkg); bkg = NULL; /* Check that the values read are the same as the values written */ @@ -563,8 +563,8 @@ test_compound_dtype2(hid_t file) temp_point->st.c2 != temp_check->st.c2 || temp_point->st.l2 != temp_check->st.l2 || temp_point->st.ll2 != temp_check->st.ll2 || temp_point->l != temp_check->l) { H5_FAILED(); - HDprintf(" Read different values than written.\n"); - HDprintf(" At index %d,%d\n", i, j); + printf(" Read different values than written.\n"); + printf(" At index %d,%d\n", i, j); goto error; } /* end if */ } /* end for */ @@ -585,21 +585,21 @@ test_compound_dtype2(hid_t file) H5Tclose(tid_m); /* Free memory for test data */ - HDfree(points); - HDfree(check); + free(points); + free(check); PASSED(); return 0; error: if (tmp) - HDfree(tmp); + free(tmp); if (bkg) - HDfree(bkg); + free(bkg); if (points) - HDfree(points); + free(points); if (check) - HDfree(check); + free(check); H5E_BEGIN_TRY { @@ -655,9 +655,9 @@ test_compound_dtype(hid_t file) TESTING("compound datatype"); /* Allocate space for the points & check arrays */ - if (NULL == (points = (s1 *)HDmalloc(sizeof(s1) * DIM0 * DIM1))) + if (NULL == (points = (s1 *)malloc(sizeof(s1) * DIM0 * DIM1))) TEST_ERROR; - if (NULL == (check = (s1 *)HDcalloc(sizeof(s1), DIM0 * DIM1))) + if (NULL == (check = (s1 *)calloc(sizeof(s1), DIM0 * DIM1))) TEST_ERROR; /* Initialize the dataset */ @@ -759,22 +759,22 @@ test_compound_dtype(hid_t file) /* Read the dataset back. Temporary buffer is for special platforms like * Cray */ - if (NULL == (tmp = HDmalloc(DIM0 * DIM1 * H5Tget_size(native_type)))) + if (NULL == (tmp = malloc(DIM0 * DIM1 * H5Tget_size(native_type)))) TEST_ERROR; - if (NULL == (bkg = HDcalloc(sizeof(s1), DIM0 * DIM1))) + if (NULL == (bkg = calloc(sizeof(s1), DIM0 * DIM1))) TEST_ERROR; if (H5Dread(dataset, native_type, H5S_ALL, H5S_ALL, H5P_DEFAULT, tmp) < 0) TEST_ERROR; - HDmemcpy(check, tmp, DIM0 * DIM1 * H5Tget_size(native_type)); - HDfree(tmp); + memcpy(check, tmp, DIM0 * DIM1 * H5Tget_size(native_type)); + free(tmp); tmp = NULL; if (H5Tconvert(native_type, tid2, (DIM0 * DIM1), check, bkg, H5P_DEFAULT) < 0) TEST_ERROR; - HDfree(bkg); + free(bkg); bkg = NULL; /* Check that the values read are the same as the values written */ @@ -783,8 +783,8 @@ test_compound_dtype(hid_t file) if (temp_point->c != temp_check->c || temp_point->i != temp_check->i || temp_point->l != temp_check->l) { H5_FAILED(); - HDprintf(" Read different values than written.\n"); - HDprintf(" At index %d,%d\n", i, j); + printf(" Read different values than written.\n"); + printf(" At index %d,%d\n", i, j); goto error; } /* end if */ @@ -798,8 +798,8 @@ test_compound_dtype(hid_t file) H5Tclose(tid2); /* Free memory for test data */ - HDfree(points); - HDfree(check); + free(points); + free(check); PASSED(); return 0; @@ -807,13 +807,13 @@ test_compound_dtype(hid_t file) error: /* Free memory for test data */ if (tmp) - HDfree(tmp); + free(tmp); if (bkg) - HDfree(bkg); + free(bkg); if (points) - HDfree(points); + free(points); if (check) - HDfree(check); + free(check); H5E_BEGIN_TRY { @@ -865,9 +865,9 @@ test_compound_dtype3(hid_t file) TESTING("compound datatype with array as field"); /* Allocate space for the points & check arrays */ - if (NULL == (points = (s1 *)HDmalloc(sizeof(s1) * DIM0 * DIM1))) + if (NULL == (points = (s1 *)malloc(sizeof(s1) * DIM0 * DIM1))) TEST_ERROR; - if (NULL == (check = (s1 *)HDcalloc(sizeof(s1), DIM0 * DIM1))) + if (NULL == (check = (s1 *)calloc(sizeof(s1), DIM0 * DIM1))) TEST_ERROR; /* Initialize the dataset */ @@ -989,22 +989,22 @@ test_compound_dtype3(hid_t file) /* Read the dataset back. Temporary buffer is for special platforms like * Cray */ - if (NULL == (tmp = HDmalloc(DIM0 * DIM1 * H5Tget_size(native_type)))) + if (NULL == (tmp = malloc(DIM0 * DIM1 * H5Tget_size(native_type)))) TEST_ERROR; - if (NULL == (bkg = HDcalloc(sizeof(s1), DIM0 * DIM1))) + if (NULL == (bkg = calloc(sizeof(s1), DIM0 * DIM1))) TEST_ERROR; if (H5Dread(dataset, native_type, H5S_ALL, H5S_ALL, H5P_DEFAULT, tmp) < 0) TEST_ERROR; - HDmemcpy(check, tmp, DIM0 * DIM1 * H5Tget_size(native_type)); - HDfree(tmp); + memcpy(check, tmp, DIM0 * DIM1 * H5Tget_size(native_type)); + free(tmp); tmp = NULL; if (H5Tconvert(native_type, tid_m, (DIM0 * DIM1), check, bkg, H5P_DEFAULT) < 0) TEST_ERROR; - HDfree(bkg); + free(bkg); bkg = NULL; /* Check that the values read are the same as the values written */ @@ -1012,16 +1012,16 @@ test_compound_dtype3(hid_t file) for (j = 0; j < DIM1; j++, temp_point++, temp_check++) { if (temp_point->c != temp_check->c || temp_point->l != temp_check->l) { H5_FAILED(); - HDprintf(" Read different values than written.\n"); - HDprintf(" At index %d,%d\n", i, j); + printf(" Read different values than written.\n"); + printf(" At index %d,%d\n", i, j); goto error; } /* end if */ for (k = 0; k < 5; k++) { if (temp_point->a[k] != temp_check->a[k]) { H5_FAILED(); - HDprintf(" Read different values than written.\n"); - HDprintf(" At index %d,%d,%d\n", i, j, k); + printf(" Read different values than written.\n"); + printf(" At index %d,%d,%d\n", i, j, k); goto error; } /* end if */ } /* end for */ @@ -1034,8 +1034,8 @@ test_compound_dtype3(hid_t file) H5Tclose(tid_m2); /* Free memory for test data */ - HDfree(points); - HDfree(check); + free(points); + free(check); PASSED(); return 0; @@ -1043,13 +1043,13 @@ test_compound_dtype3(hid_t file) error: /* Free memory for test data */ if (tmp) - HDfree(tmp); + free(tmp); if (bkg) - HDfree(bkg); + free(bkg); if (points) - HDfree(points); + free(points); if (check) - HDfree(check); + free(check); H5E_BEGIN_TRY { @@ -1102,9 +1102,9 @@ test_compound_opaque(hid_t file) TESTING("compound datatype with opaque field"); /* Allocate space for the points & check arrays */ - if (NULL == (points = (s1 *)HDmalloc(sizeof(s1) * DIM0 * DIM1))) + if (NULL == (points = (s1 *)malloc(sizeof(s1) * DIM0 * DIM1))) TEST_ERROR; - if (NULL == (check = (s1 *)HDcalloc(sizeof(s1), DIM0 * DIM1))) + if (NULL == (check = (s1 *)calloc(sizeof(s1), DIM0 * DIM1))) TEST_ERROR; /* Initialize the dataset */ @@ -1217,22 +1217,22 @@ test_compound_opaque(hid_t file) /* Read the dataset back. Temporary buffer is for special platforms like * Cray */ - if (NULL == (tmp = HDmalloc(DIM0 * DIM1 * H5Tget_size(native_type)))) + if (NULL == (tmp = malloc(DIM0 * DIM1 * H5Tget_size(native_type)))) TEST_ERROR; - if (NULL == (bkg = HDcalloc(sizeof(s1), DIM0 * DIM1))) + if (NULL == (bkg = calloc(sizeof(s1), DIM0 * DIM1))) TEST_ERROR; if (H5Dread(dataset, native_type, H5S_ALL, H5S_ALL, H5P_DEFAULT, tmp) < 0) TEST_ERROR; - HDmemcpy(check, tmp, DIM0 * DIM1 * H5Tget_size(native_type)); - HDfree(tmp); + memcpy(check, tmp, DIM0 * DIM1 * H5Tget_size(native_type)); + free(tmp); tmp = NULL; if (H5Tconvert(native_type, tid_m, (DIM0 * DIM1), check, bkg, H5P_DEFAULT) < 0) TEST_ERROR; - HDfree(bkg); + free(bkg); bkg = NULL; /* Check that the values read are the same as the values written */ @@ -1240,16 +1240,16 @@ test_compound_opaque(hid_t file) for (j = 0; j < DIM1; j++, temp_point++, temp_check++) { if (temp_point->c != temp_check->c || temp_point->l != temp_check->l) { H5_FAILED(); - HDprintf(" Read different values than written.\n"); - HDprintf(" At index %d,%d\n", i, j); + printf(" Read different values than written.\n"); + printf(" At index %d,%d\n", i, j); goto error; } /* end if */ for (k = 0; k < 5; k++) { if (temp_point->o[k] != temp_check->o[k]) { H5_FAILED(); - HDprintf(" Read different values than written.\n"); - HDprintf(" At index %d,%d,%d\n", i, j, k); + printf(" Read different values than written.\n"); + printf(" At index %d,%d,%d\n", i, j, k); goto error; } /* end if */ } /* end for */ @@ -1261,8 +1261,8 @@ test_compound_opaque(hid_t file) H5Tclose(tid_m); /* Free memory for test data */ - HDfree(points); - HDfree(check); + free(points); + free(check); PASSED(); return 0; @@ -1270,13 +1270,13 @@ test_compound_opaque(hid_t file) error: /* Free memory for test data */ if (tmp) - HDfree(tmp); + free(tmp); if (bkg) - HDfree(bkg); + free(bkg); if (points) - HDfree(points); + free(points); if (check) - HDfree(check); + free(check); H5E_BEGIN_TRY { @@ -1328,9 +1328,9 @@ test_enum_dtype(hid_t file) TESTING("enum datatype"); - if (NULL == (spoints2 = HDcalloc(1, sizeof(*spoints2)))) + if (NULL == (spoints2 = calloc(1, sizeof(*spoints2)))) TEST_ERROR; - if (NULL == (scheck2 = HDcalloc(1, sizeof(*scheck2)))) + if (NULL == (scheck2 = calloc(1, sizeof(*scheck2)))) TEST_ERROR; /* Initialize the dataset */ @@ -1397,13 +1397,13 @@ test_enum_dtype(hid_t file) /* Read the dataset back. Temporary buffer is for special platforms like * Cray */ - if (NULL == (tmp = HDmalloc(DIM0 * DIM1 * H5Tget_size(native_type)))) + if (NULL == (tmp = malloc(DIM0 * DIM1 * H5Tget_size(native_type)))) TEST_ERROR; if (H5Dread(dataset, native_type, H5S_ALL, H5S_ALL, H5P_DEFAULT, tmp) < 0) TEST_ERROR; - HDmemcpy(scheck2, tmp, DIM0 * DIM1 * H5Tget_size(native_type)); + memcpy(scheck2, tmp, DIM0 * DIM1 * H5Tget_size(native_type)); if (H5Tconvert(native_type, tid_m, (DIM0 * DIM1), scheck2, NULL, H5P_DEFAULT) < 0) TEST_ERROR; @@ -1413,9 +1413,9 @@ test_enum_dtype(hid_t file) for (j = 0; j < DIM1; j++) if (spoints2->arr[i][j] != scheck2->arr[i][j]) { H5_FAILED(); - HDprintf(" Read different values than written.\n"); - HDprintf(" At index %d,%d\n", i, j); - HDprintf(" spoints2[i][j]=%hd, scheck2[i][j]=%hd\n", spoints2->arr[i][j], scheck2->arr[i][j]); + printf(" Read different values than written.\n"); + printf(" At index %d,%d\n", i, j); + printf(" spoints2[i][j]=%hd, scheck2[i][j]=%hd\n", spoints2->arr[i][j], scheck2->arr[i][j]); goto error; } /* end if */ @@ -1424,18 +1424,18 @@ test_enum_dtype(hid_t file) H5Tclose(native_type); H5Tclose(tid_m); - HDfree(tmp); - HDfree(spoints2); - HDfree(scheck2); + free(tmp); + free(spoints2); + free(scheck2); PASSED(); return 0; error: /* Free memory for test data */ - HDfree(tmp); - HDfree(spoints2); - HDfree(scheck2); + free(tmp); + free(spoints2); + free(scheck2); H5E_BEGIN_TRY { @@ -1484,9 +1484,9 @@ test_array_dtype(hid_t file) TESTING("array of compound datatype"); /* Allocate space for the points & check arrays */ - if (NULL == (points = (s1 *)HDmalloc(sizeof(s1) * DIM0 * DIM1 * 5))) + if (NULL == (points = (s1 *)malloc(sizeof(s1) * DIM0 * DIM1 * 5))) TEST_ERROR; - if (NULL == (check = (s1 *)HDcalloc(sizeof(s1), DIM0 * DIM1 * 5))) + if (NULL == (check = (s1 *)calloc(sizeof(s1), DIM0 * DIM1 * 5))) TEST_ERROR; /* Initialize the dataset */ @@ -1568,14 +1568,14 @@ test_array_dtype(hid_t file) /* Read the dataset back. Temporary buffer is for special platforms like * Cray */ - if (NULL == (tmp = HDmalloc(DIM0 * DIM1 * H5Tget_size(native_type)))) + if (NULL == (tmp = malloc(DIM0 * DIM1 * H5Tget_size(native_type)))) TEST_ERROR; if (H5Dread(dataset, native_type, H5S_ALL, H5S_ALL, H5P_DEFAULT, tmp) < 0) TEST_ERROR; - HDmemcpy(check, tmp, DIM0 * DIM1 * H5Tget_size(native_type)); - HDfree(tmp); + memcpy(check, tmp, DIM0 * DIM1 * H5Tget_size(native_type)); + free(tmp); tmp = NULL; if (H5Tconvert(native_type, tid_m, (DIM0 * DIM1), check, NULL, H5P_DEFAULT) < 0) @@ -1588,8 +1588,8 @@ test_array_dtype(hid_t file) if (temp_point->c != temp_check->c || temp_point->i != temp_check->i || temp_point->l != temp_check->l) { H5_FAILED(); - HDprintf(" Read different values than written.\n"); - HDprintf(" At index %d,%d\n", i, j); + printf(" Read different values than written.\n"); + printf(" At index %d,%d\n", i, j); goto error; } /* end if */ @@ -1606,8 +1606,8 @@ test_array_dtype(hid_t file) TEST_ERROR; /* Free memory for test data */ - HDfree(points); - HDfree(check); + free(points); + free(check); PASSED(); return 0; @@ -1615,11 +1615,11 @@ test_array_dtype(hid_t file) error: /* Free memory for test data */ if (tmp) - HDfree(tmp); + free(tmp); if (points) - HDfree(points); + free(points); if (check) - HDfree(check); + free(check); H5E_BEGIN_TRY { @@ -1668,9 +1668,9 @@ test_array_dtype2(hid_t file) TESTING("array of atomic datatype"); - if (NULL == (ipoints3 = HDcalloc(1, sizeof(*ipoints3)))) + if (NULL == (ipoints3 = calloc(1, sizeof(*ipoints3)))) goto error; - if (NULL == (icheck3 = HDcalloc(1, sizeof(*icheck3)))) + if (NULL == (icheck3 = calloc(1, sizeof(*icheck3)))) goto error; /* Initialize the dataset */ @@ -1725,14 +1725,14 @@ test_array_dtype2(hid_t file) /* Read the dataset back. Temporary buffer is for special platforms like * Cray */ - if (NULL == (tmp = HDmalloc(DIM0 * DIM1 * H5Tget_size(native_type)))) + if (NULL == (tmp = malloc(DIM0 * DIM1 * H5Tget_size(native_type)))) TEST_ERROR; if (H5Dread(dataset, native_type, H5S_ALL, H5S_ALL, H5P_DEFAULT, tmp) < 0) TEST_ERROR; - HDmemcpy(icheck3, tmp, DIM0 * DIM1 * H5Tget_size(native_type)); - HDfree(tmp); + memcpy(icheck3, tmp, DIM0 * DIM1 * H5Tget_size(native_type)); + free(tmp); tmp = NULL; if (H5Tconvert(native_type, tid_m, (DIM0 * DIM1), icheck3, NULL, H5P_DEFAULT) < 0) @@ -1744,8 +1744,8 @@ test_array_dtype2(hid_t file) for (k = 0; k < 5; k++) if (icheck3->arr[i][j][k] != ipoints3->arr[i][j][k]) { H5_FAILED(); - HDprintf(" Read different values than written.\n"); - HDprintf(" At index %d,%d\n", i, j); + printf(" Read different values than written.\n"); + printf(" At index %d,%d\n", i, j); goto error; } /* end if */ @@ -1759,8 +1759,8 @@ test_array_dtype2(hid_t file) if (H5Tclose(tid_m) < 0) TEST_ERROR; - HDfree(ipoints3); - HDfree(icheck3); + free(ipoints3); + free(icheck3); PASSED(); return 0; @@ -1768,7 +1768,7 @@ test_array_dtype2(hid_t file) error: /* Free memory for test data */ if (tmp) - HDfree(tmp); + free(tmp); H5E_BEGIN_TRY { @@ -1781,8 +1781,8 @@ error: } H5E_END_TRY; - HDfree(ipoints3); - HDfree(icheck3); + free(ipoints3); + free(icheck3); return -1; } @@ -1817,18 +1817,18 @@ test_vl_dtype(hid_t file) /* Allocate and initialize VL data to write */ for (i = 0; i < SPACE1_DIM1; i++) { - wdata[i].p = HDmalloc((i + 1) * sizeof(hvl_t)); + wdata[i].p = malloc((i + 1) * sizeof(hvl_t)); if (NULL == wdata[i].p) { H5_FAILED(); - HDprintf(" Cannot allocate memory for VL data! i=%u\n", (unsigned)i); + printf(" Cannot allocate memory for VL data! i=%u\n", (unsigned)i); goto error; } /* end if */ wdata[i].len = i + 1; for (t1 = (hvl_t *)wdata[i].p, j = 0; j < (i + 1); j++, t1++) { - t1->p = HDmalloc((j + 1) * sizeof(unsigned int)); + t1->p = malloc((j + 1) * sizeof(unsigned int)); if (NULL == t1->p) { H5_FAILED(); - HDprintf(" Cannot allocate memory for VL data! i=%u, j=%u\n", (unsigned)i, (unsigned)j); + printf(" Cannot allocate memory for VL data! i=%u, j=%u\n", (unsigned)i, (unsigned)j); goto error; } /* end if */ t1->len = j + 1; @@ -1900,23 +1900,23 @@ test_vl_dtype(hid_t file) for (i = 0; i < SPACE1_DIM1; i++) { if (wdata[i].len != rdata[i].len) { H5_FAILED(); - HDprintf(" VL data length don't match!, wdata[%d].len=%d, rdata[%d].len=%d\n", (int)i, - (int)wdata[i].len, (int)i, (int)rdata[i].len); + printf(" VL data length don't match!, wdata[%d].len=%d, rdata[%d].len=%d\n", (int)i, + (int)wdata[i].len, (int)i, (int)rdata[i].len); goto error; } /* end if */ for (t1 = (hvl_t *)wdata[i].p, t2 = (hvl_t *)rdata[i].p, j = 0; j < rdata[i].len; j++, t1++, t2++) { if (t1->len != t2->len) { H5_FAILED(); - HDprintf(" VL data length don't match!, wdata[%d].len=%d, rdata[%d].len=%d\n", (int)i, - (int)wdata[i].len, (int)i, (int)rdata[i].len); + printf(" VL data length don't match!, wdata[%d].len=%d, rdata[%d].len=%d\n", (int)i, + (int)wdata[i].len, (int)i, (int)rdata[i].len); goto error; } /* end if */ /* use temporary buffer to convert datatype. This is for special * platforms like Cray */ - if (NULL == (tmp = (void **)HDmalloc(t2->len * sizeof(unsigned int)))) + if (NULL == (tmp = (void **)malloc(t2->len * sizeof(unsigned int)))) TEST_ERROR; - HDmemcpy(tmp, t2->p, t2->len * H5Tget_size(nat_super_type)); + memcpy(tmp, t2->p, t2->len * H5Tget_size(nat_super_type)); if (H5Tconvert(nat_super_type, H5T_NATIVE_UINT, t2->len, tmp, NULL, H5P_DEFAULT) < 0) TEST_ERROR; @@ -1924,13 +1924,13 @@ test_vl_dtype(hid_t file) for (k = 0; k < t2->len; k++) { if (((unsigned int *)t1->p)[k] != ((unsigned int *)tmp)[k]) { H5_FAILED(); - HDprintf(" VL data don't match!, wdata[%u].p=%d, rdata[%u].p=%u\n", (unsigned)i, - ((unsigned int *)t1->p)[k], (unsigned)i, ((unsigned int *)tmp)[k]); + printf(" VL data don't match!, wdata[%u].p=%d, rdata[%u].p=%u\n", (unsigned)i, + ((unsigned int *)t1->p)[k], (unsigned)i, ((unsigned int *)tmp)[k]); goto error; } /* end if */ } /* end for */ - HDfree(tmp); + free(tmp); tmp = NULL; } /* end for */ } /* end for */ @@ -1968,7 +1968,7 @@ test_vl_dtype(hid_t file) error: /* Free memory for test data */ if (tmp) - HDfree(tmp); + free(tmp); H5E_BEGIN_TRY { @@ -2075,14 +2075,14 @@ test_vlstr_dtype(hid_t file) for (i = 0; i < SPACE1_DIM1; i++) { if (HDstrlen(wdata[i]) != HDstrlen(rdata[i])) { H5_FAILED(); - HDprintf(" VL data length don't match!, strlen(wdata[%d])=%d, strlen(rdata[%d])=%d\n", (int)i, - (int)HDstrlen(wdata[i]), (int)i, (int)HDstrlen(rdata[i])); + printf(" VL data length don't match!, strlen(wdata[%d])=%d, strlen(rdata[%d])=%d\n", (int)i, + (int)HDstrlen(wdata[i]), (int)i, (int)HDstrlen(rdata[i])); goto error; } /* end if */ if (HDstrcmp(wdata[i], rdata[i]) != 0) { H5_FAILED(); - HDprintf(" VL data values don't match!, wdata[%d]=%s, rdata[%d]=%s\n", (int)i, wdata[i], - (int)i, rdata[i]); + printf(" VL data values don't match!, wdata[%d]=%s, rdata[%d]=%s\n", (int)i, wdata[i], (int)i, + rdata[i]); goto error; } /* end if */ } /* end for */ @@ -2103,7 +2103,7 @@ test_vlstr_dtype(hid_t file) /* Free memory for rdata */ for (i = 0; i < SPACE1_DIM1; i++) - HDfree(rdata[i]); + free(rdata[i]); rdata_alloc = FALSE; PASSED(); @@ -2113,7 +2113,7 @@ error: if (rdata_alloc) { /* Free memory for rdata */ for (i = 0; i < SPACE1_DIM1; i++) - HDfree(rdata[i]); + free(rdata[i]); } /* end if */ H5E_BEGIN_TRY @@ -2206,14 +2206,14 @@ test_str_dtype(hid_t file) for (i = 0; i < SPACE1_DIM1; i++) { if (HDstrlen(wdata[i]) != HDstrlen(rdata[i])) { H5_FAILED(); - HDprintf(" data length don't match!, strlen(wdata[%d])=%d, strlen(rdata[%d])=%d\n", (int)i, - (int)HDstrlen(wdata[i]), (int)i, (int)HDstrlen(rdata[i])); + printf(" data length don't match!, strlen(wdata[%d])=%d, strlen(rdata[%d])=%d\n", (int)i, + (int)HDstrlen(wdata[i]), (int)i, (int)HDstrlen(rdata[i])); goto error; } /* end if */ if (HDstrcmp(wdata[i], rdata[i]) != 0) { H5_FAILED(); - HDprintf(" data values don't match!, wdata[%d]=%s, rdata[%d]=%s\n", (int)i, wdata[i], (int)i, - rdata[i]); + printf(" data values don't match!, wdata[%d]=%s, rdata[%d]=%s\n", (int)i, wdata[i], (int)i, + rdata[i]); goto error; } /* end if */ } /* end for */ @@ -2286,9 +2286,9 @@ test_refer_dtype(hid_t file) TESTING("reference datatype"); /* Allocate write & read buffers */ - if (NULL == (wbuf = (hobj_ref_t *)HDmalloc(MAX(sizeof(unsigned), sizeof(hobj_ref_t))))) + if (NULL == (wbuf = (hobj_ref_t *)malloc(MAX(sizeof(unsigned), sizeof(hobj_ref_t))))) TEST_ERROR; - if (NULL == (rbuf = (hobj_ref_t *)HDmalloc(MAX(sizeof(unsigned), sizeof(hobj_ref_t))))) + if (NULL == (rbuf = (hobj_ref_t *)malloc(MAX(sizeof(unsigned), sizeof(hobj_ref_t))))) TEST_ERROR; /* Create dataspace for datasets */ @@ -2393,8 +2393,8 @@ test_refer_dtype(hid_t file) TEST_ERROR; /* Free memory buffers */ - HDfree(wbuf); - HDfree(rbuf); + free(wbuf); + free(rbuf); PASSED(); @@ -2402,9 +2402,9 @@ test_refer_dtype(hid_t file) error: if (wbuf) - HDfree(wbuf); + free(wbuf); if (rbuf) - HDfree(rbuf); + free(rbuf); H5E_BEGIN_TRY { @@ -2459,9 +2459,9 @@ test_refer_dtype2(hid_t file) TESTING("dataset region reference"); /* Allocate write & read buffers */ - if (NULL == (dwbuf = (uint8_t *)HDmalloc(sizeof(uint8_t) * SPACE2_DIM1 * SPACE2_DIM2))) + if (NULL == (dwbuf = (uint8_t *)malloc(sizeof(uint8_t) * SPACE2_DIM1 * SPACE2_DIM2))) TEST_ERROR; - if (NULL == (drbuf = (uint8_t *)HDcalloc(sizeof(uint8_t), SPACE2_DIM1 * SPACE2_DIM2))) + if (NULL == (drbuf = (uint8_t *)calloc(sizeof(uint8_t), SPACE2_DIM1 * SPACE2_DIM2))) TEST_ERROR; /* Create dataspace for datasets */ @@ -2605,8 +2605,8 @@ test_refer_dtype2(hid_t file) TEST_ERROR; /* Free memory buffers */ - HDfree(dwbuf); - HDfree(drbuf); + free(dwbuf); + free(drbuf); PASSED(); return 0; @@ -2614,9 +2614,9 @@ test_refer_dtype2(hid_t file) error: /* Free memory buffers */ if (dwbuf) - HDfree(dwbuf); + free(dwbuf); if (drbuf) - HDfree(drbuf); + free(drbuf); H5E_BEGIN_TRY { @@ -2697,8 +2697,8 @@ test_opaque_dtype(hid_t file) for (i = 0; i < sizeof(rbuf); i++) if (rbuf[i] != wbuf[i]) { H5_FAILED(); - HDprintf(" Read different values than written.\n"); - HDprintf(" At index %u\n", (unsigned)i); + printf(" Read different values than written.\n"); + printf(" At index %u\n", (unsigned)i); goto error; } /* end if */ @@ -2807,7 +2807,7 @@ test_bitfield_dtype(hid_t file) if ((ntype_size = H5Tget_size(native_type)) == 0) TEST_ERROR; - rbuf = HDmalloc((size_t)nelmts * ntype_size); + rbuf = malloc((size_t)nelmts * ntype_size); /* Read the data and compare them */ if (H5Dread(dataset1, native_type, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf) < 0) @@ -2817,8 +2817,8 @@ test_bitfield_dtype(hid_t file) for (i = 0; i < BITFIELD_ENUMB * 4; i++) { if (*p != wbuf[i]) { H5_FAILED(); - HDprintf(" Read different values than written.\n"); - HDprintf(" At index %zu\n", i); + printf(" Read different values than written.\n"); + printf(" At index %zu\n", i); TEST_ERROR; } p++; @@ -2831,7 +2831,7 @@ test_bitfield_dtype(hid_t file) if (H5Dclose(dataset1) < 0) TEST_ERROR; if (rbuf) - HDfree(rbuf); + free(rbuf); /* Open dataset2 again to check H5Tget_native_type */ if ((dataset2 = H5Dopen2(file, DSET2_BITFIELD_NAME, H5P_DEFAULT)) < 0) @@ -2850,8 +2850,8 @@ test_bitfield_dtype(hid_t file) for (i = 0; i < BITFIELD_ENUMB; i++) { if (intr[i] != intw[i]) { H5_FAILED(); - HDprintf(" Read different values than written.\n"); - HDprintf(" At index %zu\n", i); + printf(" Read different values than written.\n"); + printf(" At index %zu\n", i); TEST_ERROR; } } @@ -2991,7 +2991,7 @@ test_ninteger(void) /* get rank */ if ((rank = H5Sget_simple_extent_ndims(sid1)) < 0) FAIL_STACK_ERROR; - HDmemset(dims, 0, sizeof dims); + memset(dims, 0, sizeof dims); /* get dimension */ if (H5Sget_simple_extent_dims(sid1, dims, NULL) < 0) @@ -3027,13 +3027,13 @@ test_ninteger(void) /* check */ if (H5Tget_precision(nid1) != H5Tget_precision(nid2)) { - HDprintf(" Precision differ.\n"); + printf(" Precision differ.\n"); TEST_ERROR; } /* end if */ /* compare dataset creation property lists */ if (H5Pequal(dcpl1, dcpl2) <= 0) { - HDprintf(" Property lists differ.\n"); + printf(" Property lists differ.\n"); TEST_ERROR; } /* end if */ @@ -3041,8 +3041,8 @@ test_ninteger(void) for (i = 0; i < DIM3; i++) if (buf[i] != chk[i]) { H5_FAILED(); - HDprintf(" Read different values than written.\n"); - HDprintf(" At index %d\n", i); + printf(" Read different values than written.\n"); + printf(" At index %d\n", i); TEST_ERROR; } /* end if */ @@ -3155,7 +3155,7 @@ main(void) if (nerrors) goto error; - HDprintf("All native datatype tests passed.\n"); + printf("All native datatype tests passed.\n"); h5_cleanup(FILENAME, fapl); return 0; @@ -3169,7 +3169,7 @@ error: H5E_END_TRY; nerrors = MAX(1, nerrors); - HDprintf("***** %d DATASET TEST%s FAILED! *****\n", nerrors, 1 == nerrors ? "" : "S"); + printf("***** %d DATASET TEST%s FAILED! *****\n", nerrors, 1 == nerrors ? "" : "S"); return 1; } diff --git a/test/objcopy.c b/test/objcopy.c index eac99e0..459eff2 100644 --- a/test/objcopy.c +++ b/test/objcopy.c @@ -197,7 +197,7 @@ token_insert(H5O_info2_t *oi) /* Extend the table */ if (idtab_g.nobjs >= idtab_g.nalloc) { idtab_g.nalloc = MAX(256, 2 * idtab_g.nalloc); - idtab_g.obj = (H5O_token_t *)HDrealloc(idtab_g.obj, idtab_g.nalloc * sizeof(idtab_g.obj[0])); + idtab_g.obj = (H5O_token_t *)realloc(idtab_g.obj, idtab_g.nalloc * sizeof(idtab_g.obj[0])); } /* end if */ /* Insert the entry */ @@ -253,7 +253,7 @@ static void token_reset(void) { if (idtab_g.obj) - HDfree(idtab_g.obj); + free(idtab_g.obj); idtab_g.obj = NULL; idtab_g.nalloc = idtab_g.nobjs = 0; } /* end token_reset() */ @@ -585,7 +585,7 @@ test_copy_attach_attribute_vl(hid_t loc_id) for (i = 0; i < 4; i++) { buf[i].len = i * 3 + 1; - buf[i].p = (int *)HDmalloc(buf[i].len * sizeof(int)); + buf[i].p = (int *)malloc(buf[i].len * sizeof(int)); for (j = 0; j < buf[i].len; j++) ((int *)buf[i].p)[j] = (int)(j + 1); } /* end for */ @@ -851,9 +851,9 @@ compare_attribute(hid_t aid, hid_t aid2, hid_t pid, const void *wbuf, hid_t obj_ /* Check the raw data is equal */ /* Allocate & initialize space for the raw data buffers */ - if ((rbuf = HDcalloc(elmt_size, (size_t)nelmts)) == NULL) + if ((rbuf = calloc(elmt_size, (size_t)nelmts)) == NULL) TEST_ERROR; - if ((rbuf2 = HDcalloc(elmt_size, (size_t)nelmts)) == NULL) + if ((rbuf2 = calloc(elmt_size, (size_t)nelmts)) == NULL) TEST_ERROR; /* Read data from the source attribute */ @@ -884,9 +884,9 @@ compare_attribute(hid_t aid, hid_t aid2, hid_t pid, const void *wbuf, hid_t obj_ TEST_ERROR; /* Release raw data buffers */ - HDfree(rbuf); + free(rbuf); rbuf = NULL; - HDfree(rbuf2); + free(rbuf2); rbuf2 = NULL; /* close the source dataspace */ @@ -909,9 +909,9 @@ compare_attribute(hid_t aid, hid_t aid2, hid_t pid, const void *wbuf, hid_t obj_ error: if (rbuf) - HDfree(rbuf); + free(rbuf); if (rbuf2) - HDfree(rbuf2); + free(rbuf2); H5E_BEGIN_TRY { H5Sclose(sid2); @@ -1098,11 +1098,11 @@ compare_data(hid_t parent1, hid_t parent2, hid_t pid, hid_t tid, size_t nelmts, else { /* vlens cannot currently be nested below the top layer of a * compound */ - HDassert(H5Tdetect_class(memb_id, H5T_VLEN) == FALSE); + assert(H5Tdetect_class(memb_id, H5T_VLEN) == FALSE); /* Iterate over all elements, calling memcmp() for each */ for (elmt = 0; elmt < nelmts; elmt++) { - if (HDmemcmp(memb1, memb2, memb_size) != 0) + if (memcmp(memb1, memb2, memb_size) != 0) TEST_ERROR; /* Update member pointers */ @@ -1324,7 +1324,7 @@ compare_data(hid_t parent1, hid_t parent2, hid_t pid, hid_t tid, size_t nelmts, else TEST_ERROR; } /* end else */ - else if (HDmemcmp(buf1, buf2, (elmt_size * nelmts)) != 0) + else if (memcmp(buf1, buf2, (elmt_size * nelmts)) != 0) TEST_ERROR; /* Data should be the same. :-) */ @@ -1460,9 +1460,9 @@ compare_datasets(hid_t did, hid_t did2, hid_t pid, const void *wbuf) /* Check the raw data is equal */ /* Allocate & initialize space for the raw data buffers */ - if ((rbuf = HDcalloc(elmt_size, (size_t)nelmts)) == NULL) + if ((rbuf = calloc(elmt_size, (size_t)nelmts)) == NULL) TEST_ERROR; - if ((rbuf2 = HDcalloc(elmt_size, (size_t)nelmts)) == NULL) + if ((rbuf2 = calloc(elmt_size, (size_t)nelmts)) == NULL) TEST_ERROR; /* Read data from datasets */ @@ -1491,9 +1491,9 @@ compare_datasets(hid_t did, hid_t did2, hid_t pid, const void *wbuf) TEST_ERROR; /* Release raw data buffers */ - HDfree(rbuf); + free(rbuf); rbuf = NULL; - HDfree(rbuf2); + free(rbuf2); rbuf2 = NULL; /* close the source dataspace */ @@ -1523,9 +1523,9 @@ error: H5E_BEGIN_TRY { if (rbuf) - HDfree(rbuf); + free(rbuf); if (rbuf2) - HDfree(rbuf2); + free(rbuf2); H5Pclose(dcpl2); H5Pclose(dcpl); H5Sclose(sid2); @@ -1675,7 +1675,7 @@ compare_groups(hid_t gid, hid_t gid2, hid_t pid, int depth, unsigned copy_flags) break; case H5O_TYPE_MAP: - HDassert(0 && "maps not supported in native VOL connector"); + assert(0 && "maps not supported in native VOL connector"); /* clang complains about implicit fallthrough here and * our usual attributes and fall-through comments don't @@ -1685,7 +1685,7 @@ compare_groups(hid_t gid, hid_t gid2, hid_t pid, int depth, unsigned copy_flags) case H5O_TYPE_UNKNOWN: case H5O_TYPE_NTYPES: default: - HDassert(0 && "Unknown type of object"); + assert(0 && "Unknown type of object"); break; H5_CLANG_DIAG_ON("implicit-fallthrough") } /* end switch */ @@ -1708,18 +1708,18 @@ compare_groups(hid_t gid, hid_t gid2, hid_t pid, int depth, unsigned copy_flags) char linkval2[NAME_BUF_SIZE]; /* Link value */ /* Get link values */ - HDassert(linfo.u.val_size <= NAME_BUF_SIZE); + assert(linfo.u.val_size <= NAME_BUF_SIZE); if (H5Lget_val(gid, objname, linkval, (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR; if (H5Lget_val(gid2, objname2, linkval2, (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR; /* Compare link data */ - if (HDmemcmp(linkval, linkval2, linfo.u.val_size) != 0) + if (memcmp(linkval, linkval2, linfo.u.val_size) != 0) TEST_ERROR; } /* end else-if */ else { - HDassert(0 && "Unknown type of link"); + assert(0 && "Unknown type of link"); } /* end else */ } /* end else */ } /* end for */ @@ -2938,7 +2938,7 @@ test_copy_dataset_compound(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t TESTING("H5Ocopy(): compound dataset"); - HDmemset(buf, 0, sizeof(buf)); + memset(buf, 0, sizeof(buf)); for (i = 0; i < DIM_SIZE_1; i++) { buf[i].a = i; buf[i].d = 1.0 / (double)(i + 1); @@ -5271,7 +5271,7 @@ test_copy_dataset_external(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t buf[i] = i; /* create an empty external file */ - HDfclose(HDfopen(FILE_EXT, "w")); + HDfclose(fopen(FILE_EXT, "w")); /* Initialize the filenames */ h5_fixname(FILENAME[0], src_fapl, src_filename, sizeof src_filename); @@ -6248,7 +6248,7 @@ test_copy_dataset_contig_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_ /* set initial data values */ for (i = 0; i < DIM_SIZE_1; i++) { buf[i].len = i + 1; - buf[i].p = (int *)HDmalloc(buf[i].len * sizeof(int)); + buf[i].p = (int *)malloc(buf[i].len * sizeof(int)); for (j = 0; j < buf[i].len; j++) ((int *)buf[i].p)[j] = (int)(i * 10 + j); } /* end for */ @@ -6410,7 +6410,7 @@ test_copy_dataset_chunked_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid /* set initial data values */ for (i = 0; i < DIM_SIZE_1; i++) { buf[i].len = i + 1; - buf[i].p = (int *)HDmalloc(buf[i].len * sizeof(int)); + buf[i].p = (int *)malloc(buf[i].len * sizeof(int)); for (j = 0; j < buf[i].len; j++) ((int *)buf[i].p)[j] = (int)(i * 10 + j); } /* end for */ @@ -6626,7 +6626,7 @@ test_copy_dataset_compact_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid /* set initial data values */ for (i = 0; i < DIM_SIZE_1; i++) { buf[i].len = i + 1; - buf[i].p = (int *)HDmalloc(buf[i].len * sizeof(int)); + buf[i].p = (int *)malloc(buf[i].len * sizeof(int)); for (j = 0; j < buf[i].len; j++) ((int *)buf[i].p)[j] = (int)(i * 10 + j); } /* end for */ @@ -6961,7 +6961,7 @@ attach_attribute_compound_vlstr(hid_t loc_id) /* Write to the attribute */ len = HDstrlen(ATTR_CMPD_STRING) + 1; buf.i = 9; - if (NULL == (buf.v = (char *)HDcalloc(len, sizeof(char)))) + if (NULL == (buf.v = (char *)calloc(len, sizeof(char)))) goto done; HDstrncpy(buf.v, ATTR_CMPD_STRING, len); if (H5Awrite(aid, cmpd_tid, &buf) < 0) @@ -6981,7 +6981,7 @@ done: if (aid > 0) H5Aclose(aid); - HDfree(buf.v); + free(buf.v); return ret_value; } /* attach_attribute_compound_vlstr */ @@ -7043,7 +7043,7 @@ compare_attribute_compound_vlstr(hid_t loc, hid_t loc2) FAIL_STACK_ERROR; if (HDstrlen(rbuf.v) != HDstrlen(rbuf2.v)) FAIL_STACK_ERROR; - if (HDmemcmp(rbuf.v, rbuf2.v, HDstrlen(rbuf.v)) != 0) + if (memcmp(rbuf.v, rbuf2.v, HDstrlen(rbuf.v)) != 0) FAIL_STACK_ERROR; /* Reclaim vlen buffer */ @@ -7301,7 +7301,7 @@ test_copy_dataset_compressed_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, for (i = 0; i < DIM_SIZE_1; i++) { for (j = 0; j < DIM_SIZE_2; j++) { buf[i][j].len = (size_t)(j + 1); - buf[i][j].p = (int *)HDmalloc(buf[i][j].len * sizeof(int)); + buf[i][j].p = (int *)malloc(buf[i][j].len * sizeof(int)); for (k = 0; k < (int)buf[i][j].len; k++) ((int *)buf[i][j].p)[k] = i * 10000 + j * 100 + k; } @@ -9500,7 +9500,7 @@ test_copy_dataset_compact_named_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fap /* set initial data values */ for (i = 0; i < DIM_SIZE_1; i++) { buf[i].len = i + 1; - buf[i].p = (int *)HDmalloc(buf[i].len * sizeof(int)); + buf[i].p = (int *)malloc(buf[i].len * sizeof(int)); for (j = 0; j < buf[i].len; j++) ((int *)buf[i].p)[j] = (int)(i * 10 + j); } /* end for */ @@ -9684,7 +9684,7 @@ test_copy_dataset_contig_named_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl /* set initial data values */ for (i = 0; i < DIM_SIZE_1; i++) { buf[i].len = i + 1; - buf[i].p = (int *)HDmalloc(buf[i].len * sizeof(int)); + buf[i].p = (int *)malloc(buf[i].len * sizeof(int)); for (j = 0; j < buf[i].len; j++) ((int *)buf[i].p)[j] = (int)(i * 10 + j); } /* end for */ @@ -9868,7 +9868,7 @@ test_copy_dataset_chunked_named_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fap /* set initial data values */ for (i = 0; i < DIM_SIZE_1; i++) { buf[i].len = i + 1; - buf[i].p = (int *)HDmalloc(buf[i].len * sizeof(int)); + buf[i].p = (int *)malloc(buf[i].len * sizeof(int)); for (j = 0; j < buf[i].len; j++) ((int *)buf[i].p)[j] = (int)(i * 10 + j); } /* end for */ @@ -10059,7 +10059,7 @@ test_copy_dataset_compressed_named_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_ /* set initial data values */ for (i = 0; i < DIM_SIZE_1; i++) { buf[i].len = i + 1; - buf[i].p = (int *)HDmalloc(buf[i].len * sizeof(int)); + buf[i].p = (int *)malloc(buf[i].len * sizeof(int)); for (j = 0; j < buf[i].len; j++) ((int *)buf[i].p)[j] = (int)(i * 10 + j); } /* end for */ @@ -10246,14 +10246,14 @@ test_copy_dataset_compact_vl_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, /* set initial data values */ for (i = 0; i < DIM_SIZE_1; i++) { - buf[i].p = HDmalloc((i + 1) * sizeof(hvl_t)); + buf[i].p = malloc((i + 1) * sizeof(hvl_t)); if (buf[i].p == NULL) { TestErrPrintf("Cannot allocate memory for VL data! i=%u\n", i); return 1; } /* end if */ buf[i].len = i + 1; for (tvl = (hvl_t *)buf[i].p, j = 0; j < (i + 1); j++, tvl++) { - tvl->p = HDmalloc((j + 1) * sizeof(unsigned int)); + tvl->p = malloc((j + 1) * sizeof(unsigned int)); if (tvl->p == NULL) { TestErrPrintf("Cannot allocate memory for VL data! i=%u, j=%u\n", i, j); return 1; @@ -10447,14 +10447,14 @@ test_copy_dataset_contig_vl_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, h /* set initial data values */ for (i = 0; i < DIM_SIZE_1; i++) { - buf[i].p = HDmalloc((i + 1) * sizeof(hvl_t)); + buf[i].p = malloc((i + 1) * sizeof(hvl_t)); if (buf[i].p == NULL) { TestErrPrintf("Cannot allocate memory for VL data! i=%u\n", i); TEST_ERROR; } /* end if */ buf[i].len = i + 1; for (tvl = (hvl_t *)buf[i].p, j = 0; j < (i + 1); j++, tvl++) { - tvl->p = HDmalloc((j + 1) * sizeof(unsigned int)); + tvl->p = malloc((j + 1) * sizeof(unsigned int)); if (tvl->p == NULL) { TestErrPrintf("Cannot allocate memory for VL data! i=%u, j=%u\n", i, j); TEST_ERROR; @@ -10642,14 +10642,14 @@ test_copy_dataset_chunked_vl_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, /* set initial data values */ for (i = 0; i < DIM_SIZE_1; i++) { - buf[i].p = HDmalloc((i + 1) * sizeof(hvl_t)); + buf[i].p = malloc((i + 1) * sizeof(hvl_t)); if (buf[i].p == NULL) { TestErrPrintf("Cannot allocate memory for VL data! i=%u\n", i); TEST_ERROR; } /* end if */ buf[i].len = i + 1; for (tvl = (hvl_t *)buf[i].p, j = 0; j < (i + 1); j++, tvl++) { - tvl->p = HDmalloc((j + 1) * sizeof(unsigned int)); + tvl->p = malloc((j + 1) * sizeof(unsigned int)); if (tvl->p == NULL) { TestErrPrintf("Cannot allocate memory for VL data! i=%u, j=%u\n", i, j); TEST_ERROR; @@ -10886,14 +10886,14 @@ test_copy_dataset_compressed_vl_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fap /* set initial data values */ for (i = 0; i < DIM_SIZE_1; i++) { - buf[i].p = HDmalloc((i + 1) * sizeof(hvl_t)); + buf[i].p = malloc((i + 1) * sizeof(hvl_t)); if (buf[i].p == NULL) { TestErrPrintf("Cannot allocate memory for VL data! i=%u\n", i); TEST_ERROR; } /* end if */ buf[i].len = i + 1; for (tvl = (hvl_t *)buf[i].p, j = 0; j < (i + 1); j++, tvl++) { - tvl->p = HDmalloc((j + 1) * sizeof(unsigned int)); + tvl->p = malloc((j + 1) * sizeof(unsigned int)); if (tvl->p == NULL) { TestErrPrintf("Cannot allocate memory for VL data! i=%u, j=%u\n", i, j); TEST_ERROR; @@ -11094,7 +11094,7 @@ test_copy_dataset_contig_cmpd_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, for (i = 0; i < DIM_SIZE_1; i++) { buf[i].a = (int)(i * (i - 1)); buf[i].b.len = i + 1; - buf[i].b.p = (int *)HDmalloc(buf[i].b.len * sizeof(int)); + buf[i].b.p = (int *)malloc(buf[i].b.len * sizeof(int)); for (j = 0; j < buf[i].b.len; j++) ((int *)buf[i].b.p)[j] = (int)(i * 10 + j); buf[i].c = 1.0 / ((double)i + 1.0); @@ -11270,7 +11270,7 @@ test_copy_dataset_chunked_cmpd_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl for (i = 0; i < DIM_SIZE_1; i++) { buf[i].a = (int)(i * (i - 1)); buf[i].b.len = i + 1; - buf[i].b.p = (int *)HDmalloc(buf[i].b.len * sizeof(int)); + buf[i].b.p = (int *)malloc(buf[i].b.len * sizeof(int)); for (j = 0; j < buf[i].b.len; j++) ((int *)buf[i].b.p)[j] = (int)(i * 10 + j); buf[i].c = 1.0 / ((double)i + 1.0); @@ -11455,7 +11455,7 @@ test_copy_dataset_compact_cmpd_vl(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl for (i = 0; i < DIM_SIZE_1; i++) { buf[i].a = (int)(i * (i - 1)); buf[i].b.len = i + 1; - buf[i].b.p = (int *)HDmalloc(buf[i].b.len * sizeof(int)); + buf[i].b.p = (int *)malloc(buf[i].b.len * sizeof(int)); for (j = 0; j < buf[i].b.len; j++) ((int *)buf[i].b.p)[j] = (int)(i * 10 + j); buf[i].c = 1.0 / ((double)i + 1.0); @@ -11641,7 +11641,7 @@ test_copy_null_ref(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fap TESTING("H5Ocopy(): NULL references"); /* Initialize "zeros" array */ - HDmemset(zeros, 0, sizeof(zeros)); + memset(zeros, 0, sizeof(zeros)); /* Initialize the filenames */ h5_fixname(FILENAME[0], src_fapl, src_filename, sizeof src_filename); @@ -11717,9 +11717,9 @@ test_copy_null_ref(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fap TEST_ERROR; /* Verify that the references contain only "0" bytes */ - if (HDmemcmp(obj_buf, zeros, sizeof(obj_buf)) != 0) + if (memcmp(obj_buf, zeros, sizeof(obj_buf)) != 0) TEST_ERROR; - if (HDmemcmp(reg_buf, zeros, sizeof(reg_buf)) != 0) + if (memcmp(reg_buf, zeros, sizeof(reg_buf)) != 0) TEST_ERROR; /* Close datasets */ @@ -11762,9 +11762,9 @@ test_copy_null_ref(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fap TEST_ERROR; /* Verify that the references contain only "0" bytes */ - if (HDmemcmp(obj_buf, zeros, sizeof(obj_buf)) != 0) + if (memcmp(obj_buf, zeros, sizeof(obj_buf)) != 0) TEST_ERROR; - if (HDmemcmp(reg_buf, zeros, sizeof(reg_buf)) != 0) + if (memcmp(reg_buf, zeros, sizeof(reg_buf)) != 0) TEST_ERROR; /* Close */ @@ -11839,7 +11839,7 @@ test_copy_null_ref_open(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t ds TESTING("H5Ocopy(): NULL references for opened datasets"); /* Initialize "zeros" array */ - HDmemset(zeros, 0, sizeof(zeros)); + memset(zeros, 0, sizeof(zeros)); /* Initialize the filenames */ h5_fixname(FILENAME[0], src_fapl, src_filename, sizeof src_filename); @@ -11924,9 +11924,9 @@ test_copy_null_ref_open(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t ds TEST_ERROR; /* Verify that the references contain only "0" bytes */ - if (HDmemcmp(obj_buf, zeros, sizeof(obj_buf)) != 0) + if (memcmp(obj_buf, zeros, sizeof(obj_buf)) != 0) TEST_ERROR; - if (HDmemcmp(reg_buf, zeros, sizeof(reg_buf)) != 0) + if (memcmp(reg_buf, zeros, sizeof(reg_buf)) != 0) TEST_ERROR; /* Create destination file */ @@ -11969,9 +11969,9 @@ test_copy_null_ref_open(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t ds TEST_ERROR; /* Verify that the references contain only "0" bytes */ - if (HDmemcmp(obj_buf, zeros, sizeof(obj_buf)) != 0) + if (memcmp(obj_buf, zeros, sizeof(obj_buf)) != 0) TEST_ERROR; - if (HDmemcmp(reg_buf, zeros, sizeof(reg_buf)) != 0) + if (memcmp(reg_buf, zeros, sizeof(reg_buf)) != 0) TEST_ERROR; /* Close */ @@ -12320,7 +12320,7 @@ test_copy_committed_datatype_merge(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fap TEST_ERROR; if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) TEST_ERROR; - HDmemcpy(&exp_token, &oinfo.token, sizeof(exp_token)); + memcpy(&exp_token, &oinfo.token, sizeof(exp_token)); if (H5Tclose(tid) < 0) TEST_ERROR; @@ -12408,7 +12408,7 @@ test_copy_committed_datatype_merge(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fap TEST_ERROR; if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) TEST_ERROR; - HDmemcpy(&exp_token, &oinfo.token, sizeof(exp_token)); + memcpy(&exp_token, &oinfo.token, sizeof(exp_token)); if (H5Tclose(tid) < 0) TEST_ERROR; if (H5Dclose(did) < 0) @@ -12636,7 +12636,7 @@ test_copy_committed_datatype_merge_same_file(hid_t fcpl, hid_t fapl, hbool_t reo TEST_ERROR; if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) TEST_ERROR; - HDmemcpy(&exp_token, &oinfo.token, sizeof(exp_token)); + memcpy(&exp_token, &oinfo.token, sizeof(exp_token)); if (H5Tclose(tid) < 0) TEST_ERROR; @@ -12694,7 +12694,7 @@ test_copy_committed_datatype_merge_same_file(hid_t fcpl, hid_t fapl, hbool_t reo TEST_ERROR; if (!token_cmp) TEST_ERROR; - HDmemcpy(&exp_token, &oinfo.token, sizeof(exp_token)); + memcpy(&exp_token, &oinfo.token, sizeof(exp_token)); if (H5Tclose(tid) < 0) TEST_ERROR; @@ -12777,7 +12777,7 @@ test_copy_committed_datatype_merge_same_file(hid_t fcpl, hid_t fapl, hbool_t reo TEST_ERROR; if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) TEST_ERROR; - HDmemcpy(&exp_token, &oinfo.token, sizeof(exp_token)); + memcpy(&exp_token, &oinfo.token, sizeof(exp_token)); if (H5Tclose(tid) < 0) TEST_ERROR; if (H5Dclose(did) < 0) @@ -12811,7 +12811,7 @@ test_copy_committed_datatype_merge_same_file(hid_t fcpl, hid_t fapl, hbool_t reo TEST_ERROR; if (!token_cmp) TEST_ERROR; - HDmemcpy(&exp_token, &oinfo.token, sizeof(exp_token)); + memcpy(&exp_token, &oinfo.token, sizeof(exp_token)); if (H5Tclose(tid) < 0) TEST_ERROR; if (H5Dclose(did) < 0) @@ -13026,7 +13026,7 @@ test_copy_committed_dt_merge_sugg(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl TEST_ERROR; if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) TEST_ERROR; - HDmemcpy(&exp_token, &oinfo.token, sizeof(exp_token)); + memcpy(&exp_token, &oinfo.token, sizeof(exp_token)); if (H5Tclose(tid) < 0) TEST_ERROR; @@ -13081,7 +13081,7 @@ test_copy_committed_dt_merge_sugg(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl TEST_ERROR; if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) TEST_ERROR; - HDmemcpy(&exp_token, &oinfo.token, sizeof(exp_token)); + memcpy(&exp_token, &oinfo.token, sizeof(exp_token)); if (H5Tclose(tid) < 0) TEST_ERROR; @@ -13106,7 +13106,7 @@ test_copy_committed_dt_merge_sugg(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl TEST_ERROR; if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) TEST_ERROR; - HDmemcpy(&exp_token, &oinfo.token, sizeof(exp_token)); + memcpy(&exp_token, &oinfo.token, sizeof(exp_token)); if (H5Tclose(tid) < 0) TEST_ERROR; @@ -13332,7 +13332,7 @@ test_copy_committed_dt_merge_attr(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl TEST_ERROR; if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) TEST_ERROR; - HDmemcpy(&exp_token, &oinfo.token, sizeof(exp_token)); + memcpy(&exp_token, &oinfo.token, sizeof(exp_token)); if (H5Tclose(tid) < 0) TEST_ERROR; if (H5Aclose(aid) < 0) @@ -13648,7 +13648,7 @@ test_copy_cdt_hier_merge(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t d TEST_ERROR; if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) TEST_ERROR; - HDmemcpy(&exp_token_int, &oinfo.token, sizeof(exp_token_int)); + memcpy(&exp_token_int, &oinfo.token, sizeof(exp_token_int)); if (H5Tclose(tid) < 0) TEST_ERROR; @@ -13657,7 +13657,7 @@ test_copy_cdt_hier_merge(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t d TEST_ERROR; if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) TEST_ERROR; - HDmemcpy(&exp_token_short, &oinfo.token, sizeof(exp_token_short)); + memcpy(&exp_token_short, &oinfo.token, sizeof(exp_token_short)); if (H5Tclose(tid) < 0) TEST_ERROR; @@ -14106,7 +14106,7 @@ test_copy_cdt_merge_cdt(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t ds TEST_ERROR; if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) TEST_ERROR; - HDmemcpy(&exp_token, &oinfo.token, sizeof(exp_token)); + memcpy(&exp_token, &oinfo.token, sizeof(exp_token)); if (H5Tclose(tid) < 0) TEST_ERROR; @@ -14127,7 +14127,7 @@ test_copy_cdt_merge_cdt(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t ds TEST_ERROR; if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) TEST_ERROR; - HDmemcpy(&exp_token, &oinfo.token, sizeof(exp_token)); + memcpy(&exp_token, &oinfo.token, sizeof(exp_token)); if (H5Tclose(tid) < 0) TEST_ERROR; @@ -14148,7 +14148,7 @@ test_copy_cdt_merge_cdt(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t ds TEST_ERROR; if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) TEST_ERROR; - HDmemcpy(&exp_token, &oinfo.token, sizeof(exp_token)); + memcpy(&exp_token, &oinfo.token, sizeof(exp_token)); if (H5Tclose(tid) < 0) TEST_ERROR; @@ -14169,7 +14169,7 @@ test_copy_cdt_merge_cdt(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t ds TEST_ERROR; if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) TEST_ERROR; - HDmemcpy(&exp_token, &oinfo.token, sizeof(exp_token)); + memcpy(&exp_token, &oinfo.token, sizeof(exp_token)); if (H5Tclose(tid) < 0) TEST_ERROR; @@ -14341,7 +14341,7 @@ test_copy_cdt_merge_suggs(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t TEST_ERROR; if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) TEST_ERROR; - HDmemcpy(&exp_token, &oinfo.token, sizeof(exp_token)); + memcpy(&exp_token, &oinfo.token, sizeof(exp_token)); if (H5Tclose(tid) < 0) TEST_ERROR; @@ -14389,7 +14389,7 @@ test_copy_cdt_merge_suggs(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t TEST_ERROR; if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) TEST_ERROR; - HDmemcpy(&exp_token, &oinfo.token, sizeof(exp_token)); + memcpy(&exp_token, &oinfo.token, sizeof(exp_token)); if (H5Tclose(tid) < 0) TEST_ERROR; @@ -14444,7 +14444,7 @@ test_copy_cdt_merge_suggs(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t TEST_ERROR; if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) TEST_ERROR; - HDmemcpy(&exp_token, &oinfo.token, sizeof(exp_token)); + memcpy(&exp_token, &oinfo.token, sizeof(exp_token)); if (H5Tclose(tid) < 0) TEST_ERROR; @@ -14494,7 +14494,7 @@ test_copy_cdt_merge_suggs(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t TEST_ERROR; if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) TEST_ERROR; - HDmemcpy(&exp_token, &oinfo.token, sizeof(exp_token)); + memcpy(&exp_token, &oinfo.token, sizeof(exp_token)); if (H5Tclose(tid) < 0) TEST_ERROR; @@ -14687,7 +14687,7 @@ test_copy_cdt_merge_dset_suggs(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, h TEST_ERROR; if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) TEST_ERROR; - HDmemcpy(&exp_token, &oinfo.token, sizeof(exp_token)); + memcpy(&exp_token, &oinfo.token, sizeof(exp_token)); if (H5Tclose(tid) < 0) TEST_ERROR; @@ -14741,7 +14741,7 @@ test_copy_cdt_merge_dset_suggs(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, h TEST_ERROR; if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) TEST_ERROR; - HDmemcpy(&exp_token, &oinfo.token, sizeof(exp_token)); + memcpy(&exp_token, &oinfo.token, sizeof(exp_token)); if (H5Tclose(tid) < 0) TEST_ERROR; if (H5Dclose(did) < 0) @@ -14804,7 +14804,7 @@ test_copy_cdt_merge_dset_suggs(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, h TEST_ERROR; if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) TEST_ERROR; - HDmemcpy(&exp_token, &oinfo.token, sizeof(exp_token)); + memcpy(&exp_token, &oinfo.token, sizeof(exp_token)); if (H5Tclose(tid) < 0) TEST_ERROR; if (H5Dclose(did) < 0) @@ -14862,7 +14862,7 @@ test_copy_cdt_merge_dset_suggs(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, h TEST_ERROR; if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) TEST_ERROR; - HDmemcpy(&exp_token, &oinfo.token, sizeof(exp_token)); + memcpy(&exp_token, &oinfo.token, sizeof(exp_token)); if (H5Tclose(tid) < 0) TEST_ERROR; if (H5Dclose(did) < 0) @@ -15724,7 +15724,7 @@ test_copy_set_mcdt_search_cb(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid TEST_ERROR; if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) TEST_ERROR; - HDmemcpy(&exp_token, &oinfo.token, sizeof(exp_token)); + memcpy(&exp_token, &oinfo.token, sizeof(exp_token)); if (H5Tclose(tid) < 0) TEST_ERROR; @@ -15791,7 +15791,7 @@ test_copy_set_mcdt_search_cb(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid TEST_ERROR; if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) TEST_ERROR; - HDmemcpy(&exp_token, &oinfo.token, sizeof(exp_token)); + memcpy(&exp_token, &oinfo.token, sizeof(exp_token)); if (H5Tclose(tid) < 0) TEST_ERROR; @@ -15846,7 +15846,7 @@ test_copy_set_mcdt_search_cb(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid TEST_ERROR; if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) TEST_ERROR; - HDmemcpy(&exp_token, &oinfo.token, sizeof(exp_token)); + memcpy(&exp_token, &oinfo.token, sizeof(exp_token)); if (H5Tclose(tid) < 0) TEST_ERROR; @@ -15871,7 +15871,7 @@ test_copy_set_mcdt_search_cb(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid TEST_ERROR; if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) TEST_ERROR; - HDmemcpy(&exp_token, &oinfo.token, sizeof(exp_token)); + memcpy(&exp_token, &oinfo.token, sizeof(exp_token)); if (H5Tclose(tid) < 0) TEST_ERROR; @@ -15935,7 +15935,7 @@ test_copy_set_mcdt_search_cb(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid TEST_ERROR; if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) TEST_ERROR; - HDmemcpy(&exp_token, &oinfo.token, sizeof(exp_token)); + memcpy(&exp_token, &oinfo.token, sizeof(exp_token)); if (H5Tclose(tid) < 0) TEST_ERROR; @@ -15960,7 +15960,7 @@ test_copy_set_mcdt_search_cb(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid TEST_ERROR; if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) TEST_ERROR; - HDmemcpy(&exp_token, &oinfo.token, sizeof(exp_token)); + memcpy(&exp_token, &oinfo.token, sizeof(exp_token)); if (H5Tclose(tid) < 0) TEST_ERROR; @@ -17395,7 +17395,7 @@ main(void) ExpressMode = GetTestExpress(); if (ExpressMode > 1) - HDprintf("***Express test mode on. Some tests may be skipped\n"); + printf("***Express test mode on. Some tests may be skipped\n"); /* Copy the file access property list */ if ((fapl2 = H5Pcopy(fapl)) < 0) @@ -17657,8 +17657,8 @@ main(void) /* Results */ if (nerrors) { - HDprintf("***** %d OBJECT COPY TEST%s FAILED! *****\n", nerrors, (1 == nerrors ? "" : "S")); - HDexit(EXIT_FAILURE); + printf("***** %d OBJECT COPY TEST%s FAILED! *****\n", nerrors, (1 == nerrors ? "" : "S")); + exit(EXIT_FAILURE); } /* end if */ HDputs("All object copying tests passed."); @@ -17688,8 +17688,8 @@ main(void) h5_cleanup(FILENAME, fapl); - HDexit(EXIT_SUCCESS); + exit(EXIT_SUCCESS); error: - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); } /* main */ diff --git a/test/objcopy_ref.c b/test/objcopy_ref.c index ebce96b..98098a8 100644 --- a/test/objcopy_ref.c +++ b/test/objcopy_ref.c @@ -105,7 +105,7 @@ token_insert(H5O_info2_t *oinfo) /* Extend the table */ if (idtab_g.nobjs >= idtab_g.nalloc) { idtab_g.nalloc = MAX(256, 2 * idtab_g.nalloc); - idtab_g.obj = (H5O_token_t *)HDrealloc(idtab_g.obj, idtab_g.nalloc * sizeof(idtab_g.obj[0])); + idtab_g.obj = (H5O_token_t *)realloc(idtab_g.obj, idtab_g.nalloc * sizeof(idtab_g.obj[0])); } /* Insert the entry */ @@ -161,7 +161,7 @@ static void token_reset(void) { if (idtab_g.obj) - HDfree(idtab_g.obj); + free(idtab_g.obj); idtab_g.obj = NULL; idtab_g.nalloc = idtab_g.nobjs = 0; } /* end token_reset() */ @@ -635,9 +635,9 @@ compare_attribute(hid_t aid, hid_t aid2, hid_t pid, const void *wbuf, hid_t obj_ /* Check the raw data is equal */ /* Allocate & initialize space for the raw data buffers */ - if ((rbuf = HDcalloc(elmt_size, (size_t)nelmts)) == NULL) + if ((rbuf = calloc(elmt_size, (size_t)nelmts)) == NULL) TEST_ERROR; - if ((rbuf2 = HDcalloc(elmt_size, (size_t)nelmts)) == NULL) + if ((rbuf2 = calloc(elmt_size, (size_t)nelmts)) == NULL) TEST_ERROR; /* Read data from the source attribute */ @@ -668,9 +668,9 @@ compare_attribute(hid_t aid, hid_t aid2, hid_t pid, const void *wbuf, hid_t obj_ TEST_ERROR; /* Release raw data buffers */ - HDfree(rbuf); + free(rbuf); rbuf = NULL; - HDfree(rbuf2); + free(rbuf2); rbuf2 = NULL; /* close the source dataspace */ @@ -693,9 +693,9 @@ compare_attribute(hid_t aid, hid_t aid2, hid_t pid, const void *wbuf, hid_t obj_ error: if (rbuf) - HDfree(rbuf); + free(rbuf); if (rbuf2) - HDfree(rbuf2); + free(rbuf2); H5E_BEGIN_TRY { H5Sclose(sid2); @@ -882,11 +882,11 @@ compare_data(hid_t parent1, hid_t parent2, hid_t pid, hid_t tid, size_t nelmts, else { /* vlens cannot currently be nested below the top layer of a * compound */ - HDassert(H5Tdetect_class(memb_id, H5T_VLEN) == FALSE); + assert(H5Tdetect_class(memb_id, H5T_VLEN) == FALSE); /* Iterate over all elements, calling memcmp() for each */ for (elmt = 0; elmt < nelmts; elmt++) { - if (HDmemcmp(memb1, memb2, memb_size) != 0) + if (memcmp(memb1, memb2, memb_size) != 0) TEST_ERROR; /* Update member pointers */ @@ -1036,7 +1036,7 @@ compare_data(hid_t parent1, hid_t parent2, hid_t pid, hid_t tid, size_t nelmts, else TEST_ERROR; } /* end else */ - else if (HDmemcmp(buf1, buf2, (elmt_size * nelmts)) != 0) + else if (memcmp(buf1, buf2, (elmt_size * nelmts)) != 0) TEST_ERROR; /* Data should be the same. :-) */ @@ -1172,9 +1172,9 @@ compare_datasets(hid_t did, hid_t did2, hid_t pid, const void *wbuf) /* Check the raw data is equal */ /* Allocate & initialize space for the raw data buffers */ - if ((rbuf = HDcalloc(elmt_size, (size_t)nelmts)) == NULL) + if ((rbuf = calloc(elmt_size, (size_t)nelmts)) == NULL) TEST_ERROR; - if ((rbuf2 = HDcalloc(elmt_size, (size_t)nelmts)) == NULL) + if ((rbuf2 = calloc(elmt_size, (size_t)nelmts)) == NULL) TEST_ERROR; /* Read data from datasets */ @@ -1203,9 +1203,9 @@ compare_datasets(hid_t did, hid_t did2, hid_t pid, const void *wbuf) TEST_ERROR; /* Release raw data buffers */ - HDfree(rbuf); + free(rbuf); rbuf = NULL; - HDfree(rbuf2); + free(rbuf2); rbuf2 = NULL; /* close the source dataspace */ @@ -1235,9 +1235,9 @@ error: H5E_BEGIN_TRY { if (rbuf) - HDfree(rbuf); + free(rbuf); if (rbuf2) - HDfree(rbuf2); + free(rbuf2); H5Pclose(dcpl2); H5Pclose(dcpl); H5Sclose(sid2); @@ -1387,7 +1387,7 @@ compare_groups(hid_t gid, hid_t gid2, hid_t pid, int depth, unsigned copy_flags) break; case H5O_TYPE_MAP: - HDassert(0 && "maps not supported in native VOL connector"); + assert(0 && "maps not supported in native VOL connector"); /* clang complains about implicit fallthrough here and * our usual attributes and fall-through comments don't @@ -1397,7 +1397,7 @@ compare_groups(hid_t gid, hid_t gid2, hid_t pid, int depth, unsigned copy_flags) case H5O_TYPE_UNKNOWN: case H5O_TYPE_NTYPES: default: - HDassert(0 && "Unknown type of object"); + assert(0 && "Unknown type of object"); break; H5_CLANG_DIAG_ON("implicit-fallthrough") } /* end switch */ @@ -1420,18 +1420,18 @@ compare_groups(hid_t gid, hid_t gid2, hid_t pid, int depth, unsigned copy_flags) char linkval2[NAME_BUF_SIZE]; /* Link value */ /* Get link values */ - HDassert(linfo.u.val_size <= NAME_BUF_SIZE); + assert(linfo.u.val_size <= NAME_BUF_SIZE); if (H5Lget_val(gid, objname, linkval, (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR; if (H5Lget_val(gid2, objname2, linkval2, (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR; /* Compare link data */ - if (HDmemcmp(linkval, linkval2, linfo.u.val_size) != 0) + if (memcmp(linkval, linkval2, linfo.u.val_size) != 0) TEST_ERROR; } /* end else-if */ else { - HDassert(0 && "Unknown type of link"); + assert(0 && "Unknown type of link"); } /* end else */ } /* end else */ } /* end for */ @@ -1867,7 +1867,7 @@ main(void) ExpressMode = GetTestExpress(); if (ExpressMode > 1) - HDprintf("***Express test mode on. Some tests may be skipped\n"); + printf("***Express test mode on. Some tests may be skipped\n"); /* Copy the file access property list */ if ((fapl2 = H5Pcopy(fapl)) < 0) @@ -1971,8 +1971,8 @@ main(void) /* Results */ if (nerrors) { - HDprintf("***** %d OBJECT COPY TEST%s FAILED! *****\n", nerrors, (1 == nerrors ? "" : "S")); - HDexit(EXIT_FAILURE); + printf("***** %d OBJECT COPY TEST%s FAILED! *****\n", nerrors, (1 == nerrors ? "" : "S")); + exit(EXIT_FAILURE); } /* end if */ HDputs("All object copying tests passed."); @@ -2002,8 +2002,8 @@ main(void) h5_cleanup(FILENAME, fapl); - HDexit(EXIT_SUCCESS); + exit(EXIT_SUCCESS); error: - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); } /* main */ diff --git a/test/ohdr.c b/test/ohdr.c index 85e10a2..8277e83 100644 --- a/test/ohdr.c +++ b/test/ohdr.c @@ -82,8 +82,8 @@ test_cont(char *filename, hid_t fapl) TESTING("object header continuation block"); - HDmemset(&oh_locA, 0, sizeof(oh_locA)); - HDmemset(&oh_locB, 0, sizeof(oh_locB)); + memset(&oh_locA, 0, sizeof(oh_locA)); + memset(&oh_locB, 0, sizeof(oh_locB)); /* Create the file to operate on */ if ((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) @@ -230,7 +230,7 @@ test_ohdr_cache(char *filename, hid_t fapl) FAIL_STACK_ERROR; /* Create an object header */ - HDmemset(&oh_loc, 0, sizeof(oh_loc)); + memset(&oh_loc, 0, sizeof(oh_loc)); if (H5O_create(f, (size_t)2048, (size_t)1, H5P_GROUP_CREATE_DEFAULT, &oh_loc /*out*/) < 0) FAIL_STACK_ERROR; @@ -360,7 +360,7 @@ test_ohdr_swmr(hbool_t new_format) } /* end else */ /* Initialize data */ - wbuf = (int *)HDcalloc(compact_size, sizeof(int)); + wbuf = (int *)calloc(compact_size, sizeof(int)); n = 0; for (u = 0; u < compact_size; u++) wbuf[u] = n++; @@ -440,7 +440,7 @@ test_ohdr_swmr(hbool_t new_format) FAIL_STACK_ERROR; /* Free the buffer */ - HDfree(wbuf); + free(wbuf); PASSED(); @@ -455,7 +455,7 @@ error: H5Pclose(plist); H5Pclose(fapl); HDremove(FILE_OHDR_SWMR); - HDfree(wbuf); + free(wbuf); } H5E_END_TRY; @@ -949,9 +949,9 @@ test_minimized_dset_ohdr_attribute_addition(hid_t fapl_id) **********************************************/ buf_size = HDstrlen(ATTR_LONG) + 1; - if (NULL == (in_buf = (char *)HDcalloc(buf_size, sizeof(char)))) + if (NULL == (in_buf = (char *)calloc(buf_size, sizeof(char)))) TEST_ERROR; - if (NULL == (out_buf = (char *)HDcalloc(buf_size, sizeof(char)))) + if (NULL == (out_buf = (char *)calloc(buf_size, sizeof(char)))) TEST_ERROR; /* Create a string attribute on the dataset @@ -982,7 +982,7 @@ test_minimized_dset_ohdr_attribute_addition(hid_t fapl_id) TEST_ERROR; /* modify the string attribute */ - HDmemset(in_buf, 0, buf_size); + memset(in_buf, 0, buf_size); HDstrcpy(in_buf, ATTR_LONG); if (H5Awrite(aid, H5T_NATIVE_CHAR, in_buf) < 0) TEST_ERROR; @@ -1052,8 +1052,8 @@ test_minimized_dset_ohdr_attribute_addition(hid_t fapl_id) TEST_ERROR; /* Free memory */ - HDfree(in_buf); - HDfree(out_buf); + free(in_buf); + free(out_buf); PASSED(); return SUCCEED; @@ -1069,8 +1069,8 @@ error: } H5E_END_TRY; - HDfree(in_buf); - HDfree(out_buf); + free(in_buf); + free(out_buf); return FAIL; } /* test_minimized_dset_ohdr_attribute_addition */ @@ -1905,7 +1905,7 @@ main(void) * (using default group creation property list only because it's convenient) */ TESTING("object header creation"); - HDmemset(&oh_loc, 0, sizeof(oh_loc)); + memset(&oh_loc, 0, sizeof(oh_loc)); if (H5O_create(f, (size_t)64, (size_t)0, H5P_GROUP_CREATE_DEFAULT, &oh_loc /*out*/) < 0) FAIL_STACK_ERROR; PASSED(); diff --git a/test/onion.c b/test/onion.c index 1063b67..88faf2b 100644 --- a/test/onion.c +++ b/test/onion.c @@ -111,21 +111,21 @@ onion_filepaths_init(const char *basename) { struct onion_filepaths *paths = NULL; - if (NULL == (paths = HDmalloc(sizeof(struct onion_filepaths)))) + if (NULL == (paths = malloc(sizeof(struct onion_filepaths)))) TEST_ERROR; paths->canon = NULL; paths->onion = NULL; paths->recovery = NULL; - if (NULL == (paths->canon = HDmalloc(sizeof(char) * ONION_TEST_FIXNAME_SIZE))) + if (NULL == (paths->canon = malloc(sizeof(char) * ONION_TEST_FIXNAME_SIZE))) TEST_ERROR; HDsnprintf(paths->canon, ONION_TEST_FIXNAME_SIZE, "%s", basename); - if (NULL == (paths->onion = HDmalloc(sizeof(char) * ONION_TEST_FIXNAME_SIZE))) + if (NULL == (paths->onion = malloc(sizeof(char) * ONION_TEST_FIXNAME_SIZE))) TEST_ERROR; HDsnprintf(paths->onion, ONION_TEST_FIXNAME_SIZE, "%s.onion", paths->canon); - if (NULL == (paths->recovery = HDmalloc(sizeof(char) * ONION_TEST_FIXNAME_SIZE))) + if (NULL == (paths->recovery = malloc(sizeof(char) * ONION_TEST_FIXNAME_SIZE))) TEST_ERROR; HDsnprintf(paths->recovery, ONION_TEST_FIXNAME_SIZE, "%s.onion.recovery", paths->canon); @@ -133,11 +133,11 @@ onion_filepaths_init(const char *basename) error: if (paths != NULL) { - HDfree(paths->canon); - HDfree(paths->onion); - HDfree(paths->recovery); + free(paths->canon); + free(paths->onion); + free(paths->recovery); } - HDfree(paths); + free(paths); return NULL; } @@ -146,10 +146,10 @@ error: static void onion_filepaths_destroy(struct onion_filepaths *paths) { - HDfree(paths->canon); - HDfree(paths->onion); - HDfree(paths->recovery); - HDfree(paths); + free(paths->canon); + free(paths->onion); + free(paths->recovery); + free(paths); } /*----------------------------------------------------------------------------- @@ -925,7 +925,7 @@ test_header_encode_decode(void) for (i = 0; i < H5FD_ONION_ENCODED_SIZE_HEADER; i++) { if (exp[i] != buf[i]) { - HDprintf("first mismatched byte at %zu: %02x %02x\n", i, exp[i], buf[i]); + printf("first mismatched byte at %zu: %02x %02x\n", i, exp[i], buf[i]); TEST_ERROR; } } @@ -1043,7 +1043,7 @@ test_history_encode_decode_empty(void) TEST_ERROR; for (i = 0; i < 20; i++) { if (exp[i] != buf[i]) { - HDprintf("first mismatched byte at %zu: %02x %02x\n", i, exp[i], buf[i]); + printf("first mismatched byte at %zu: %02x %02x\n", i, exp[i], buf[i]); TEST_ERROR; } } @@ -1154,7 +1154,7 @@ test_history_encode_decode(void) if (80 != exp_size) TEST_ERROR; - history.record_locs = HDcalloc(history.n_revisions, sizeof(H5FD_onion_record_loc_t)); + history.record_locs = calloc(history.n_revisions, sizeof(H5FD_onion_record_loc_t)); if (NULL == history.record_locs) TEST_ERROR; @@ -1183,7 +1183,7 @@ test_history_encode_decode(void) buf_p = exp + exp_size - 4; UINT32ENCODE(buf_p, history.checksum); - if (NULL == (buf = HDmalloc(exp_size))) + if (NULL == (buf = malloc(exp_size))) TEST_ERROR; if (H5FD__onion_history_encode(&history, buf, &checksum_out) != exp_size) @@ -1210,7 +1210,7 @@ test_history_encode_decode(void) /* True decode requires allocating space for record pointers */ - history_out.record_locs = HDcalloc(history_out.n_revisions, sizeof(H5FD_onion_record_loc_t)); + history_out.record_locs = calloc(history_out.n_revisions, sizeof(H5FD_onion_record_loc_t)); if (NULL == history_out.record_locs) TEST_ERROR; @@ -1236,17 +1236,17 @@ test_history_encode_decode(void) TEST_ERROR; } - HDfree(history_out.record_locs); - HDfree(buf); - HDfree(history.record_locs); + free(history_out.record_locs); + free(buf); + free(history.record_locs); PASSED(); return 0; error: - HDfree(history_out.record_locs); - HDfree(buf); - HDfree(history.record_locs); + free(history_out.record_locs); + free(buf); + free(history.record_locs); return -1; } /* end test_history_encode_decode() */ @@ -1334,8 +1334,8 @@ test_revision_record_encode_decode(void) TESTING("encode/decode revision record"); - HDmemcpy(record.time_of_creation, "19411207T190643Z", 16); - record.archival_index.list = HDcalloc(record.archival_index.n_entries, sizeof(H5FD_onion_index_entry_t)); + memcpy(record.time_of_creation, "19411207T190643Z", 16); + record.archival_index.list = calloc(record.archival_index.n_entries, sizeof(H5FD_onion_index_entry_t)); if (NULL == record.archival_index.list) TEST_ERROR; @@ -1375,7 +1375,7 @@ test_revision_record_encode_decode(void) r_out.archival_index.n_entries = 0; r_out.archival_index.list = NULL; - if (NULL == (buf = HDmalloc(sizeof(unsigned char) * exp_size))) + if (NULL == (buf = malloc(sizeof(unsigned char) * exp_size))) TEST_ERROR; /* Test encode */ @@ -1386,26 +1386,26 @@ test_revision_record_encode_decode(void) for (i = 0; i < exp_size; i++) { if (exp[i] != buf[i]) { badness = TRUE; - HDprintf("Bad encoded record - Index %zu: expected 0x%02X but got 0x%02X\n", i, - (unsigned int)exp[i], (unsigned int)buf[i]); + printf("Bad encoded record - Index %zu: expected 0x%02X but got 0x%02X\n", i, + (unsigned int)exp[i], (unsigned int)buf[i]); } } if (badness) { /* If this fragile test breaks, this information is helpful... */ - HDprintf("INDEX\n"); + printf("INDEX\n"); for (i = 0; i < exp_size; i++) - HDprintf("%4zu ", i); - HDprintf("\n"); + printf("%4zu ", i); + printf("\n"); - HDprintf("EXPECTED\n"); + printf("EXPECTED\n"); for (i = 0; i < exp_size; i++) - HDprintf("0x%02X ", (unsigned int)exp[i]); - HDprintf("\n"); + printf("0x%02X ", (unsigned int)exp[i]); + printf("\n"); - HDprintf("ACTUAL\n"); + printf("ACTUAL\n"); for (i = 0; i < exp_size; i++) - HDprintf("0x%02X ", (unsigned int)buf[i]); - HDprintf("\n"); + printf("0x%02X ", (unsigned int)buf[i]); + printf("\n"); } if (badness) TEST_ERROR; @@ -1457,10 +1457,10 @@ test_revision_record_encode_decode(void) TEST_ERROR; /* Allocate variable-length components */ - r_out.comment = HDcalloc(r_out.comment_size, sizeof(char)); + r_out.comment = calloc(r_out.comment_size, sizeof(char)); if (NULL == r_out.comment) TEST_ERROR; - r_out.archival_index.list = HDcalloc(r_out.archival_index.n_entries, sizeof(H5FD_onion_index_entry_t)); + r_out.archival_index.list = calloc(r_out.archival_index.n_entries, sizeof(H5FD_onion_index_entry_t)); if (NULL == r_out.archival_index.list) TEST_ERROR; @@ -1506,19 +1506,19 @@ test_revision_record_encode_decode(void) /* Cleanup */ - HDfree(r_out.archival_index.list); - HDfree(r_out.comment); - HDfree(buf); - HDfree(record.archival_index.list); + free(r_out.archival_index.list); + free(r_out.comment); + free(buf); + free(record.archival_index.list); PASSED(); return 0; error: - HDfree(r_out.archival_index.list); - HDfree(r_out.comment); - HDfree(buf); - HDfree(record.archival_index.list); + free(r_out.archival_index.list); + free(r_out.comment); + free(buf); + free(record.archival_index.list); return -1; } /* end test_revision_record_encode_decode() */ @@ -1543,11 +1543,11 @@ compare_file_bytes_exactly(const char *filepath, hid_t fapl_id, size_t nbytes, c /* filesize is wrong w/ stdio - it's zero instead of 40 or whatnot */ filesize = (uint64_t)H5FDget_eof(raw_vfile, H5FD_MEM_DRAW); if ((uint64_t)nbytes != filesize) { - HDfprintf(stderr, "\nSizes not the same - nbytes: %zu, filesize: %" PRIu64 "\n", nbytes, filesize); + fprintf(stderr, "\nSizes not the same - nbytes: %zu, filesize: %" PRIu64 "\n", nbytes, filesize); TEST_ERROR; } - if (NULL == (act_buf = HDmalloc(nbytes))) + if (NULL == (act_buf = malloc(nbytes))) TEST_ERROR; /* Fill buffer with bogus UCHAR_MAX values */ for (size_t i = 0; i < nbytes; i++) @@ -1560,21 +1560,21 @@ compare_file_bytes_exactly(const char *filepath, hid_t fapl_id, size_t nbytes, c /* Compare raw bytes data */ for (size_t i = 0; i < nbytes; i++) { if (exp[i] != act_buf[i]) { - HDprintf("first mismatched byte %zu: expected 0x%02X was 0x%02X\n", i, exp[i], act_buf[i]); + printf("first mismatched byte %zu: expected 0x%02X was 0x%02X\n", i, exp[i], act_buf[i]); TEST_ERROR; } } if (H5FDclose(raw_vfile) < 0) TEST_ERROR; - HDfree(act_buf); + free(act_buf); return 0; error: if (raw_vfile != NULL) H5FDclose(raw_vfile); - HDfree(act_buf); + free(act_buf); return -1; } /* end compare_file_bytes_exactly() */ @@ -1600,8 +1600,8 @@ verify_history_as_expected_onion(H5FD_t *raw_file, struct expected_history *filt uint32_t buf_checksum = 0; /* memset to avoid bad frees on errors */ - HDmemset(&rev_out, 0, sizeof(H5FD_onion_revision_record_t)); - HDmemset(&history_out, 0, sizeof(H5FD_onion_history_t)); + memset(&rev_out, 0, sizeof(H5FD_onion_revision_record_t)); + memset(&history_out, 0, sizeof(H5FD_onion_history_t)); hdr_out.version = H5FD_ONION_HEADER_VERSION_CURR; @@ -1619,7 +1619,7 @@ verify_history_as_expected_onion(H5FD_t *raw_file, struct expected_history *filt /* Ingest onion header */ readsize = MIN(filesize, H5FD_ONION_ENCODED_SIZE_HEADER); - if (NULL == (buf = HDmalloc(readsize * sizeof(unsigned char)))) + if (NULL == (buf = malloc(readsize * sizeof(unsigned char)))) TEST_ERROR; if (H5FDread(raw_file, H5FD_MEM_DRAW, H5P_DEFAULT, 0, readsize, buf) < 0) TEST_ERROR; @@ -1643,13 +1643,13 @@ verify_history_as_expected_onion(H5FD_t *raw_file, struct expected_history *filt if (filter->origin_eof != hdr_out.origin_eof) TEST_ERROR; - HDfree(buf); + free(buf); buf = NULL; /* Ingest history */ readsize = hdr_out.history_size; - if (NULL == (buf = HDmalloc(readsize * sizeof(unsigned char)))) + if (NULL == (buf = malloc(readsize * sizeof(unsigned char)))) TEST_ERROR; if (H5FDread(raw_file, H5FD_MEM_DRAW, H5P_DEFAULT, hdr_out.history_addr, readsize, buf) < 0) TEST_ERROR; @@ -1671,14 +1671,14 @@ verify_history_as_expected_onion(H5FD_t *raw_file, struct expected_history *filt TEST_ERROR; /* Final read, populate pointers to revision records */ - history_out.record_locs = HDcalloc(history_out.n_revisions, sizeof(H5FD_onion_record_loc_t)); + history_out.record_locs = calloc(history_out.n_revisions, sizeof(H5FD_onion_record_loc_t)); if (NULL == history_out.record_locs) TEST_ERROR; if (H5FD__onion_history_decode(buf, &history_out) != readsize) TEST_ERROR; /* Re-use buffer space to sanity-check checksum for record pointer(s). */ - HDassert(readsize >= sizeof(H5FD_onion_record_loc_t)); + assert(readsize >= sizeof(H5FD_onion_record_loc_t)); for (size_t i = 0; i < history_out.n_revisions; i++) { uint64_t phys_addr; @@ -1704,7 +1704,7 @@ verify_history_as_expected_onion(H5FD_t *raw_file, struct expected_history *filt TEST_ERROR; } - HDfree(buf); + free(buf); buf = NULL; /* Ingest revision(s) */ @@ -1720,7 +1720,7 @@ verify_history_as_expected_onion(H5FD_t *raw_file, struct expected_history *filt rev_out.comment = NULL; readsize = rpp->record_size; - if (NULL == (buf = HDmalloc((size_t)rpp->record_size))) + if (NULL == (buf = malloc((size_t)rpp->record_size))) TEST_ERROR; if (H5FDread(raw_file, H5FD_MEM_DRAW, H5P_DEFAULT, rpp->phys_addr, rpp->record_size, buf) < 0) TEST_ERROR; @@ -1748,10 +1748,10 @@ verify_history_as_expected_onion(H5FD_t *raw_file, struct expected_history *filt TEST_ERROR; /* Final read, get variable-length data */ - if (NULL == (rev_out.comment = HDmalloc((size_t)rev_out.comment_size))) + if (NULL == (rev_out.comment = malloc((size_t)rev_out.comment_size))) TEST_ERROR; rev_out.archival_index.list = - HDcalloc(rev_out.archival_index.n_entries, sizeof(H5FD_onion_index_entry_t)); + calloc(rev_out.archival_index.n_entries, sizeof(H5FD_onion_index_entry_t)); if (NULL == rev_out.archival_index.list) TEST_ERROR; @@ -1774,21 +1774,21 @@ verify_history_as_expected_onion(H5FD_t *raw_file, struct expected_history *filt erp->n_index_entries != rev_out.archival_index.n_entries) TEST_ERROR; - HDfree(buf); - HDfree(rev_out.comment); - HDfree(rev_out.archival_index.list); + free(buf); + free(rev_out.comment); + free(rev_out.archival_index.list); } - HDfree(history_out.record_locs); + free(history_out.record_locs); history_out.record_locs = NULL; return 0; error: - HDfree(buf); - HDfree(rev_out.comment); - HDfree(rev_out.archival_index.list); - HDfree(history_out.record_locs); + free(buf); + free(rev_out.comment); + free(rev_out.archival_index.list); + free(history_out.record_locs); return -1; @@ -1849,7 +1849,7 @@ verify_stored_onion_create_0_open(struct onion_filepaths *paths, H5FD_onion_fapl TEST_ERROR; /* Size here is arbitrary */ - if (NULL == (act_buf = HDcalloc(1, 8))) + if (NULL == (act_buf = calloc(1, 8))) TEST_ERROR; /* Should fail when reading from an empty file */ @@ -1861,7 +1861,7 @@ verify_stored_onion_create_0_open(struct onion_filepaths *paths, H5FD_onion_fapl if (err_ret != FAIL) TEST_ERROR; - HDfree(act_buf); + free(act_buf); act_buf = NULL; if (H5FDclose(file) < 0) @@ -1885,7 +1885,7 @@ verify_stored_onion_create_0_open(struct onion_filepaths *paths, H5FD_onion_fapl error: if (file != NULL) (void)H5FDclose(file); - HDfree(act_buf); + free(act_buf); return -1; } /* end verify_stored_onion_create_0_open() */ @@ -2030,13 +2030,13 @@ test_create_oniontarget(hbool_t truncate_canonical, hbool_t with_initial_data) } /* Verify logical file contents. */ - if (NULL == (buf = HDmalloc(4 * sizeof(char)))) + if (NULL == (buf = malloc(4 * sizeof(char)))) TEST_ERROR; if (H5FDread(vfile_rw, H5FD_MEM_DRAW, H5P_DEFAULT, 0, 4, buf) < 0) TEST_ERROR; - if (HDmemcmp(a_list_s, buf, 4) != 0) + if (memcmp(a_list_s, buf, 4) != 0) TEST_ERROR; - HDfree(buf); + free(buf); buf = NULL; /* Write the latter half of buffer at addr 0 (more than one page) */ @@ -2050,13 +2050,13 @@ test_create_oniontarget(hbool_t truncate_canonical, hbool_t with_initial_data) TEST_ERROR; /* Verify logical file contents. */ - if (NULL == (buf = HDmalloc(buf_size * sizeof(char)))) + if (NULL == (buf = malloc(buf_size * sizeof(char)))) TEST_ERROR; if (H5FDread(vfile_rw, H5FD_MEM_DRAW, H5P_DEFAULT, 0, buf_size, buf) < 0) TEST_ERROR; - if (HDmemcmp(a_list_s + half_size, buf, buf_size) != 0) + if (memcmp(a_list_s + half_size, buf, buf_size) != 0) TEST_ERROR; - HDfree(buf); + free(buf); buf = NULL; /* Overwrite existing data with entire buffer at addr 0 */ @@ -2066,13 +2066,13 @@ test_create_oniontarget(hbool_t truncate_canonical, hbool_t with_initial_data) TEST_ERROR; /* Verify logical file contents. */ - if (NULL == (buf = HDmalloc(a_list_size_s * sizeof(char)))) + if (NULL == (buf = malloc(a_list_size_s * sizeof(char)))) TEST_ERROR; if (H5FDread(vfile_rw, H5FD_MEM_DRAW, H5P_DEFAULT, 0, a_list_size_s, buf) < 0) TEST_ERROR; - if (HDmemcmp(a_list_s, buf, a_list_size_s) != 0) + if (memcmp(a_list_s, buf, a_list_size_s) != 0) TEST_ERROR; - HDfree(buf); + free(buf); buf = NULL; } /* end if writing data to logical file */ @@ -2133,13 +2133,13 @@ test_create_oniontarget(hbool_t truncate_canonical, hbool_t with_initial_data) TEST_ERROR; if (H5FDset_eoa(vfile_ro, H5FD_MEM_DRAW, a_list_size_s) < 0) TEST_ERROR; - if (NULL == (buf = HDmalloc(a_list_size_s * 64 * sizeof(char)))) + if (NULL == (buf = malloc(a_list_size_s * 64 * sizeof(char)))) TEST_ERROR; if (H5FDread(vfile_ro, H5FD_MEM_DRAW, H5P_DEFAULT, 0, a_list_size_s, buf) < 0) TEST_ERROR; - if (HDmemcmp(a_list_s, buf, a_list_size_s) != 0) + if (memcmp(a_list_s, buf, a_list_size_s) != 0) TEST_ERROR; - HDfree(buf); + free(buf); buf = NULL; } else { @@ -2178,7 +2178,7 @@ error: onion_filepaths_destroy(paths); } - HDfree(buf); + free(buf); if (vfile_raw != NULL) (void)H5FDclose(vfile_raw); @@ -2307,7 +2307,7 @@ test_several_revisions_with_logical_gaps(void) if (NULL == file) TEST_ERROR; if (8 != H5FDget_eof(file, H5FD_MEM_DRAW)) { - HDprintf("\nEOF is not zero, it is: %" PRIuHADDR "\n", H5FDget_eof(file, H5FD_MEM_DRAW)); + printf("\nEOF is not zero, it is: %" PRIuHADDR "\n", H5FDget_eof(file, H5FD_MEM_DRAW)); TEST_ERROR; } if (H5FDclose(file) < 0) @@ -2328,7 +2328,7 @@ test_several_revisions_with_logical_gaps(void) if (NULL == file) TEST_ERROR; if (0 != H5FDget_eof(file, H5FD_MEM_DRAW)) { - HDprintf("\nEOF is not zero, it is: %" PRIuHADDR "\n", H5FDget_eof(file, H5FD_MEM_DRAW)); + printf("\nEOF is not zero, it is: %" PRIuHADDR "\n", H5FDget_eof(file, H5FD_MEM_DRAW)); TEST_ERROR; } if (H5FDclose(file) < 0) @@ -2350,11 +2350,11 @@ test_several_revisions_with_logical_gaps(void) TEST_ERROR; size = a_off + a_list_size_s; if (size != H5FDget_eof(file, H5FD_MEM_DRAW)) { - HDprintf("\nEOF is not %" PRIuHADDR ", it is: %" PRIuHADDR "\n", size, - H5FDget_eof(file, H5FD_MEM_DRAW)); + printf("\nEOF is not %" PRIuHADDR ", it is: %" PRIuHADDR "\n", size, + H5FDget_eof(file, H5FD_MEM_DRAW)); TEST_ERROR; } - if (NULL == (buf = HDmalloc(size * sizeof(unsigned char)))) + if (NULL == (buf = malloc(size * sizeof(unsigned char)))) TEST_ERROR; if (H5FDset_eoa(file, H5FD_MEM_DRAW, size) < 0) TEST_ERROR; @@ -2364,12 +2364,12 @@ test_several_revisions_with_logical_gaps(void) if (0 != buf[i]) TEST_ERROR; } - if (HDmemcmp(buf + a_off, a_list_s, a_list_size_s) != 0) + if (memcmp(buf + a_off, a_list_s, a_list_size_s) != 0) TEST_ERROR; - HDfree(buf); + free(buf); buf = NULL; /* Repeat read at page offset; test possible read offset error */ - if (NULL == (buf = HDmalloc(ONION_TEST_PAGE_SIZE_5 * sizeof(unsigned char)))) + if (NULL == (buf = malloc(ONION_TEST_PAGE_SIZE_5 * sizeof(unsigned char)))) TEST_ERROR; if (H5FDread(file, H5FD_MEM_DRAW, H5P_DEFAULT, ONION_TEST_PAGE_SIZE_5, ONION_TEST_PAGE_SIZE_5, buf) < 0) TEST_ERROR; @@ -2378,9 +2378,9 @@ test_several_revisions_with_logical_gaps(void) if (0 != buf[i]) TEST_ERROR; } - if (HDmemcmp(buf + size, a_list_s, ONION_TEST_PAGE_SIZE_5 - size) != 0) + if (memcmp(buf + size, a_list_s, ONION_TEST_PAGE_SIZE_5 - size) != 0) TEST_ERROR; - HDfree(buf); + free(buf); buf = NULL; if (H5FDclose(file) < 0) TEST_ERROR; @@ -2402,7 +2402,7 @@ test_several_revisions_with_logical_gaps(void) size = b_off + b_list_size_s; if (size != H5FDget_eof(file, H5FD_MEM_DRAW)) TEST_ERROR; - if (NULL == (buf = HDmalloc(size * sizeof(unsigned char)))) + if (NULL == (buf = malloc(size * sizeof(unsigned char)))) TEST_ERROR; if (H5FDset_eoa(file, H5FD_MEM_DRAW, size) < 0) TEST_ERROR; @@ -2412,15 +2412,15 @@ test_several_revisions_with_logical_gaps(void) if (0 != buf[i]) TEST_ERROR; } - if (HDmemcmp(buf + a_off, a_list_s, a_list_size_s) != 0) + if (memcmp(buf + a_off, a_list_s, a_list_size_s) != 0) TEST_ERROR; for (i = a_off + a_list_size_s; i < b_off; i++) { if (0 != buf[i]) TEST_ERROR; } - if (HDmemcmp(buf + b_off, b_list_s, b_list_size_s) != 0) + if (memcmp(buf + b_off, b_list_s, b_list_size_s) != 0) TEST_ERROR; - HDfree(buf); + free(buf); buf = NULL; if (H5FDclose(file) < 0) TEST_ERROR; @@ -2442,24 +2442,24 @@ test_several_revisions_with_logical_gaps(void) size = b_off + b_list_size_s; if (size != H5FDget_eof(file, H5FD_MEM_DRAW)) TEST_ERROR; - buf = (unsigned char *)HDmalloc(sizeof(unsigned char) * size); + buf = (unsigned char *)malloc(sizeof(unsigned char) * size); if (NULL == buf) TEST_ERROR; if (H5FDset_eoa(file, H5FD_MEM_DRAW, size) < 0) TEST_ERROR; if (H5FDread(file, H5FD_MEM_DRAW, H5P_DEFAULT, 0, size, buf) < 0) TEST_ERROR; - if (HDmemcmp(buf, a_list_s, a_list_size_s) != 0) + if (memcmp(buf, a_list_s, a_list_size_s) != 0) TEST_ERROR; - if (HDmemcmp(buf + a_list_size_s, a_list_s + a_list_size_s - a_off, a_off) != 0) + if (memcmp(buf + a_list_size_s, a_list_s + a_list_size_s - a_off, a_off) != 0) TEST_ERROR; for (i = a_off + a_list_size_s; i < b_off; i++) { if (0 != buf[i]) TEST_ERROR; } - if (HDmemcmp(buf + b_off, b_list_s, b_list_size_s) != 0) + if (memcmp(buf + b_off, b_list_s, b_list_size_s) != 0) TEST_ERROR; - HDfree(buf); + free(buf); buf = NULL; if (H5FDclose(file) < 0) TEST_ERROR; @@ -2534,8 +2534,8 @@ error: onion_filepaths_destroy(paths); } - HDfree(history_out.record_locs); - HDfree(buf); + free(history_out.record_locs); + free(buf); if (file != NULL) (void)H5FDclose(file); @@ -2585,7 +2585,7 @@ do_onion_open_and_writes(const char *filename, H5FD_onion_fapl_info_t *onion_inf onion_info_p->revision_num = about[i].revision_num; if (about[i].comment != NULL) { j = MIN(HDstrlen(about[i].comment), H5FD_ONION_FAPL_INFO_COMMENT_MAX_LEN); - HDmemcpy(onion_info_p->comment, about[i].comment, j); + memcpy(onion_info_p->comment, about[i].comment, j); } onion_info_p->comment[j] = '\0'; fapl_id = H5Pcreate(H5P_FILE_ACCESS); @@ -2607,20 +2607,20 @@ do_onion_open_and_writes(const char *filename, H5FD_onion_fapl_info_t *onion_inf if (H5FDwrite(file, H5FD_MEM_DRAW, H5P_DEFAULT, wi->offset, wi->size, wi->buf) < 0) TEST_ERROR; /* Verify write as expected */ - if (NULL == (buf_vfy = HDmalloc(wi->size * sizeof(unsigned char)))) + if (NULL == (buf_vfy = malloc(wi->size * sizeof(unsigned char)))) TEST_ERROR; if (H5FDread(file, H5FD_MEM_DRAW, H5P_DEFAULT, wi->offset, wi->size, buf_vfy) < 0) TEST_ERROR; - if (HDmemcmp(buf_vfy, wi->buf, wi->size) != 0) { + if (memcmp(buf_vfy, wi->buf, wi->size) != 0) { const unsigned char *_buf = wi->buf; size_t z = 0; HDputs("i exp act"); for (z = 0; z < wi->size; z++) - HDprintf("%02zx %c %c\n", z, _buf[z], buf_vfy[z]); - HDfflush(stdout); + printf("%02zx %c %c\n", z, _buf[z], buf_vfy[z]); + fflush(stdout); TEST_ERROR; } - HDfree(buf_vfy); + free(buf_vfy); buf_vfy = NULL; } /* end for each write */ @@ -2644,7 +2644,7 @@ error: } H5E_END_TRY; - HDfree(buf_vfy); + free(buf_vfy); return -1; } /* end do_onion_open_and_writes() */ @@ -2731,7 +2731,7 @@ test_page_aligned_history_create(void) TEST_ERROR; /* Inspect logical file */ - if (NULL == (buf = HDmalloc(b_list_size_s * sizeof(unsigned char)))) + if (NULL == (buf = malloc(b_list_size_s * sizeof(unsigned char)))) TEST_ERROR; file = H5FDopen(paths->canon, H5F_ACC_RDONLY, fapl_id, HADDR_UNDEF); if (NULL == file) @@ -2742,30 +2742,30 @@ test_page_aligned_history_create(void) TEST_ERROR; if (H5FDread(file, H5FD_MEM_DRAW, H5P_DEFAULT, 0, b_list_size_s, buf) < 0) TEST_ERROR; - if (HDmemcmp(a_list_s, buf + a_off, a_list_size_s) != 0) { + if (memcmp(a_list_s, buf + a_off, a_list_size_s) != 0) { size_t k; - HDprintf("aoff: %" PRIu64 "\n", a_off); + printf("aoff: %" PRIu64 "\n", a_off); HDputs("i exp act"); for (k = 0; k < b_list_size_s; k++) { - HDprintf("%3zu:: %c : %c\n", k, (k < a_off) ? ' ' : a_list_s[k - a_off], buf[k]); + printf("%3zu:: %c : %c\n", k, (k < a_off) ? ' ' : a_list_s[k - a_off], buf[k]); } - HDfflush(stdout); + fflush(stdout); TEST_ERROR; } - if (HDmemcmp(b_list_s, buf, a_off) != 0) { + if (memcmp(b_list_s, buf, a_off) != 0) { size_t k; - HDprintf("aoff: %" PRIu64 "\n", a_off); + printf("aoff: %" PRIu64 "\n", a_off); HDputs("i exp act"); for (k = 0; k < b_list_size_s; k++) { - HDprintf("%3zu:: %c : %c\n", k, (k < a_off) ? b_list_s[k] : ' ', buf[k]); + printf("%3zu:: %c : %c\n", k, (k < a_off) ? b_list_s[k] : ' ', buf[k]); } - HDfflush(stdout); + fflush(stdout); TEST_ERROR; } if (H5FDclose(file) < 0) TEST_ERROR; file = NULL; - HDfree(buf); + free(buf); buf = NULL; /* Inspect history construction */ @@ -2775,7 +2775,7 @@ test_page_aligned_history_create(void) if (H5FDset_eoa(file, H5FD_MEM_DRAW, H5FDget_eof(file, H5FD_MEM_DRAW)) < 0) TEST_ERROR; - if (NULL == (buf = HDmalloc(H5FD_ONION_ENCODED_SIZE_HEADER))) + if (NULL == (buf = malloc(H5FD_ONION_ENCODED_SIZE_HEADER))) TEST_ERROR; if (H5FDread(file, H5FD_MEM_DRAW, H5P_DEFAULT, 0, H5FD_ONION_ENCODED_SIZE_HEADER, buf) < 0) TEST_ERROR; @@ -2783,10 +2783,10 @@ test_page_aligned_history_create(void) TEST_ERROR; if (hdr_out.history_addr & ((1 << 5) - 1)) /* 5::PAGE_SIZE_5 */ TEST_ERROR; - HDfree(buf); + free(buf); buf = NULL; - if (NULL == (buf = HDmalloc(hdr_out.history_size))) + if (NULL == (buf = malloc(hdr_out.history_size))) TEST_ERROR; if (H5FDread(file, H5FD_MEM_DRAW, H5P_DEFAULT, hdr_out.history_addr, hdr_out.history_size, buf) < 0) TEST_ERROR; @@ -2794,12 +2794,12 @@ test_page_aligned_history_create(void) TEST_ERROR; if (history_out.n_revisions != 2) TEST_ERROR; - history_out.record_locs = HDcalloc(history_out.n_revisions, sizeof(H5FD_onion_record_loc_t)); + history_out.record_locs = calloc(history_out.n_revisions, sizeof(H5FD_onion_record_loc_t)); if (NULL == history_out.record_locs) TEST_ERROR; if (H5FD__onion_history_decode(buf, &history_out) != hdr_out.history_size) TEST_ERROR; - HDfree(buf); + free(buf); buf = NULL; for (i = 0; i < history_out.n_revisions; i++) { @@ -2809,7 +2809,7 @@ test_page_aligned_history_create(void) /* TODO: check phys_addr of each page entry? */ } - HDfree(history_out.record_locs); + free(history_out.record_locs); history_out.record_locs = NULL; if (H5FDclose(file) < 0) @@ -2828,7 +2828,7 @@ test_page_aligned_history_create(void) HDremove(paths->recovery); onion_filepaths_destroy(paths); - HDfree(buf); + free(buf); PASSED(); return 0; @@ -2842,8 +2842,8 @@ error: onion_filepaths_destroy(paths); } - HDfree(history_out.record_locs); - HDfree(buf); + free(history_out.record_locs); + free(buf); if (file != NULL) (void)H5FDclose(file); @@ -2906,11 +2906,11 @@ test_integration_create(void) /* SETUP */ - if (NULL == (wdata = HDcalloc(1, sizeof(*wdata)))) + if (NULL == (wdata = calloc(1, sizeof(*wdata)))) TEST_ERROR; - if (NULL == (rdata = HDcalloc(1, sizeof(*rdata)))) + if (NULL == (rdata = calloc(1, sizeof(*rdata)))) TEST_ERROR; - if (NULL == (dset_data = HDcalloc(1, sizeof(*dset_data)))) + if (NULL == (dset_data = calloc(1, sizeof(*dset_data)))) TEST_ERROR; if ((onion_info.backing_fapl_id = H5Pcreate(H5P_FILE_ACCESS)) < 0) @@ -3064,8 +3064,8 @@ test_integration_create(void) for (int j = 0; j < 256; j++) { int expected = i * j - j; if (rdata->arr[i][j] != expected) { - HDprintf("ERROR!!! Expected: %d, Got: %d\n", expected, rdata->arr[i][j]); - HDfflush(stdout); + printf("ERROR!!! Expected: %d, Got: %d\n", expected, rdata->arr[i][j]); + fflush(stdout); TEST_ERROR; } } @@ -3102,8 +3102,8 @@ test_integration_create(void) for (int j = 0; j < 256; j++) { int expected = i * 6 + j + 1; if (rdata->arr[i][j] != expected) { - HDprintf("ERROR!!! Expected: %d, Got: %d\n", expected, rdata->arr[i][j]); - HDfflush(stdout); + printf("ERROR!!! Expected: %d, Got: %d\n", expected, rdata->arr[i][j]); + fflush(stdout); TEST_ERROR; } } @@ -3141,12 +3141,12 @@ test_integration_create(void) for (int j = 0; j < 256; j++) { int expected = i * 3 + j + 5; if (rdata->arr[i][j] != expected) { - HDprintf("ERROR!!! Expected: %d, Got: %d\n", expected, rdata->arr[i][j]); - HDfflush(stdout); + printf("ERROR!!! Expected: %d, Got: %d\n", expected, rdata->arr[i][j]); + fflush(stdout); TEST_ERROR; } else { - HDfflush(stdout); + fflush(stdout); } } } @@ -3166,9 +3166,9 @@ test_integration_create(void) HDremove(paths->recovery); onion_filepaths_destroy(paths); - HDfree(wdata); - HDfree(rdata); - HDfree(dset_data); + free(wdata); + free(rdata); + free(dset_data); PASSED(); return 0; @@ -3191,9 +3191,9 @@ error: } H5E_END_TRY; - HDfree(wdata); - HDfree(rdata); - HDfree(dset_data); + free(wdata); + free(rdata); + free(dset_data); return -1; } /* end test_integration_create() */ @@ -3235,11 +3235,11 @@ test_integration_create_simple(void) TESTING("onion-created one-dimensional HDF5 file with revisions"); /* Setup */ - if (NULL == (wdata = HDcalloc(1, sizeof(*wdata)))) + if (NULL == (wdata = calloc(1, sizeof(*wdata)))) TEST_ERROR; - if (NULL == (rdata = HDcalloc(1, sizeof(*rdata)))) + if (NULL == (rdata = calloc(1, sizeof(*rdata)))) TEST_ERROR; - if (NULL == (dset_data = HDcalloc(1, sizeof(*dset_data)))) + if (NULL == (dset_data = calloc(1, sizeof(*dset_data)))) TEST_ERROR; if ((onion_info.backing_fapl_id = H5Pcreate(H5P_FILE_ACCESS)) < 0) @@ -3405,7 +3405,7 @@ test_integration_create_simple(void) for (int i = 0; i < ONE_DIM_SIZE; i += 20) { int expected = i + 2048; if (rdata->arr[i] != expected) { - HDprintf("ERROR!!! Expected: %d, Got: %d\n", expected, rdata->arr[i]); + printf("ERROR!!! Expected: %d, Got: %d\n", expected, rdata->arr[i]); TEST_ERROR; } } @@ -3425,9 +3425,9 @@ test_integration_create_simple(void) HDremove(paths->recovery); onion_filepaths_destroy(paths); - HDfree(wdata); - HDfree(rdata); - HDfree(dset_data); + free(wdata); + free(rdata); + free(dset_data); PASSED(); return 0; @@ -3450,9 +3450,9 @@ error: } H5E_END_TRY; - HDfree(wdata); - HDfree(rdata); - HDfree(dset_data); + free(wdata); + free(rdata); + free(dset_data); return -1; } /* end test_integration_create_simple() */ @@ -4437,7 +4437,7 @@ test_integration_reference(void) /* Verify the number of selection */ if ((nelmts = H5Sget_select_npoints(space)) != 8) { - HDprintf("Number of selected elements is supposed to be 8, but got %" PRIuHSIZE "\n", nelmts); + printf("Number of selected elements is supposed to be 8, but got %" PRIuHSIZE "\n", nelmts); TEST_ERROR; } @@ -4524,7 +4524,7 @@ test_integration_reference(void) for (int j = 0; j < 4; j++) { int expected = i + j; if (rdata[i][j] != expected) { - HDprintf("ERROR!!! Expected: %d, Got: %d\n", expected, rdata[i][j]); + printf("ERROR!!! Expected: %d, Got: %d\n", expected, rdata[i][j]); TEST_ERROR; } } @@ -4580,7 +4580,7 @@ test_integration_reference(void) TEST_ERROR; if ((nelmts = H5Sget_select_npoints(space2)) != 8) { - HDprintf("Number of selected elements is supposed to be 8, but got %" PRIuHSIZE "\n", nelmts); + printf("Number of selected elements is supposed to be 8, but got %" PRIuHSIZE "\n", nelmts); TEST_ERROR; } @@ -4593,7 +4593,7 @@ test_integration_reference(void) TEST_ERROR; if ((nelmts = H5Sget_select_npoints(space2)) != 4) { - HDprintf("Number of selected elements is supposed to be 4, but got %" PRIuHSIZE "\n", nelmts); + printf("Number of selected elements is supposed to be 4, but got %" PRIuHSIZE "\n", nelmts); TEST_ERROR; } @@ -4679,11 +4679,11 @@ test_integration_create_by_name(void) TESTING("H5Pset_driver_by_name"); /* Setup */ - if (NULL == (wdata = HDcalloc(1, sizeof(*wdata)))) + if (NULL == (wdata = calloc(1, sizeof(*wdata)))) TEST_ERROR; - if (NULL == (rdata = HDcalloc(1, sizeof(*rdata)))) + if (NULL == (rdata = calloc(1, sizeof(*rdata)))) TEST_ERROR; - if (NULL == (dset_data = HDcalloc(1, sizeof(*dset_data)))) + if (NULL == (dset_data = calloc(1, sizeof(*dset_data)))) TEST_ERROR; if ((fapl_id = H5Pcreate(H5P_FILE_ACCESS)) < 0) @@ -4847,7 +4847,7 @@ test_integration_create_by_name(void) for (int i = 0; i < ONE_DIM_SIZE; i += 20) { int expected = i + 2048; if (rdata->arr[i] != expected) { - HDprintf("ERROR!!! Expected: %d, Got: %d\n", expected, rdata->arr[i]); + printf("ERROR!!! Expected: %d, Got: %d\n", expected, rdata->arr[i]); TEST_ERROR; } } @@ -4865,9 +4865,9 @@ test_integration_create_by_name(void) HDremove(paths->recovery); onion_filepaths_destroy(paths); - HDfree(wdata); - HDfree(rdata); - HDfree(dset_data); + free(wdata); + free(rdata); + free(dset_data); PASSED(); return 0; @@ -4889,9 +4889,9 @@ error: } H5E_END_TRY; - HDfree(wdata); - HDfree(rdata); - HDfree(dset_data); + free(wdata); + free(rdata); + free(dset_data); return -1; } /* end test_integration_create_simple() */ @@ -4910,7 +4910,7 @@ main(void) const char *env_h5_drvr = NULL; /* VFD value from environment */ int nerrors = 0; - HDprintf("Testing Onion VFD functionality.\n"); + printf("Testing Onion VFD functionality.\n"); h5_reset(); @@ -4923,7 +4923,7 @@ main(void) if ((0 != HDstrcmp(env_h5_drvr, "nomatch")) && (0 != HDstrcmp(env_h5_drvr, "sec2"))) { SKIPPED(); HDputs("Onion VFD test skipped due to non-sec2 default VFD"); - HDexit(EXIT_SUCCESS); + exit(EXIT_SUCCESS); } /* Initialize */ @@ -4955,11 +4955,11 @@ main(void) nerrors -= test_integration_create_by_name(); if (nerrors > 0) { - HDprintf("***** %d Onion TEST%s FAILED! *****\n", nerrors, nerrors > 1 ? "S" : ""); + printf("***** %d Onion TEST%s FAILED! *****\n", nerrors, nerrors > 1 ? "S" : ""); return EXIT_FAILURE; } - HDprintf("All Onion tests passed.\n"); + printf("All Onion tests passed.\n"); return EXIT_SUCCESS; } /* end main() */ diff --git a/test/page_buffer.c b/test/page_buffer.c index a6f7f0a..aed35ef 100644 --- a/test/page_buffer.c +++ b/test/page_buffer.c @@ -104,7 +104,7 @@ create_file(char *filename, hid_t fcpl, hid_t fapl) FAIL_STACK_ERROR; num_elements = NX * NY; - if ((data = (int *)HDcalloc((size_t)num_elements, sizeof(int))) == NULL) + if ((data = (int *)calloc((size_t)num_elements, sizeof(int))) == NULL) TEST_ERROR; for (i = 0; i < (int)num_elements; i++) data[i] = i; @@ -150,7 +150,7 @@ create_file(char *filename, hid_t fcpl, hid_t fapl) if (H5Dclose(dset_id) < 0) FAIL_STACK_ERROR; - HDmemset(data, 0, (size_t)num_elements * sizeof(int)); + memset(data, 0, (size_t)num_elements * sizeof(int)); if ((dset_id = H5Dopen2(grp_id, dset_name, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR; if (H5Dread(dset_id, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, data) < 0) @@ -160,7 +160,7 @@ create_file(char *filename, hid_t fcpl, hid_t fapl) for (j = 0; j < num_elements; j++) { if (data[j] != j) { - HDfprintf(stderr, "Read different values than written\n"); + fprintf(stderr, "Read different values than written\n"); FAIL_STACK_ERROR; } } @@ -185,7 +185,7 @@ create_file(char *filename, hid_t fcpl, hid_t fapl) if (H5Sclose(filespace) < 0) FAIL_STACK_ERROR; - HDfree(data); + free(data); return 0; error: @@ -196,7 +196,7 @@ error: H5Gclose(grp_id); H5Fclose(file_id); if (data) - HDfree(data); + free(data); } H5E_END_TRY; return (1); @@ -253,7 +253,7 @@ open_file(char *filename, hid_t fapl, hsize_t page_size, size_t page_buffer_size FAIL_STACK_ERROR; num_elements = NX * NY; - if ((data = (int *)HDcalloc((size_t)num_elements, sizeof(int))) == NULL) + if ((data = (int *)calloc((size_t)num_elements, sizeof(int))) == NULL) TEST_ERROR; for (i = 0; i < NUM_DSETS; i++) { @@ -270,7 +270,7 @@ open_file(char *filename, hid_t fapl, hsize_t page_size, size_t page_buffer_size for (j = 0; j < num_elements; j++) { if (data[j] != j) { - HDfprintf(stderr, "Read different values than written\n"); + fprintf(stderr, "Read different values than written\n"); FAIL_STACK_ERROR; } } @@ -280,7 +280,7 @@ open_file(char *filename, hid_t fapl, hsize_t page_size, size_t page_buffer_size FAIL_STACK_ERROR; if (H5Fclose(file_id) < 0) FAIL_STACK_ERROR; - HDfree(data); + free(data); return 0; @@ -290,7 +290,7 @@ error: H5Gclose(grp_id); H5Fclose(file_id); if (data) - HDfree(data); + free(data); } H5E_END_TRY; return 1; @@ -324,7 +324,7 @@ set_multi_split(const char *env_h5_drvr, hid_t fapl, hsize_t pagesize) if (split || multi) { - HDmemset(memb_name, 0, sizeof memb_name); + memset(memb_name, 0, sizeof memb_name); /* Get current split settings */ if (H5Pget_fapl_multi(fapl, memb_map, memb_fapl_arr, memb_name, memb_addr, &relax) < 0) @@ -348,7 +348,7 @@ set_multi_split(const char *env_h5_drvr, hid_t fapl, hsize_t pagesize) /* Free memb_name */ for (mt = H5FD_MEM_DEFAULT; mt < H5FD_MEM_NTYPES; mt++) - HDfree(memb_name[mt]); + free(memb_name[mt]); } /* end if */ @@ -580,7 +580,7 @@ test_raw_data_handling(hid_t orig_fapl, const char *env_h5_drvr) if (set_multi_split(env_h5_drvr, fapl, sizeof(int) * 200) != 0) TEST_ERROR; - if ((data = (int *)HDcalloc((size_t)num_elements, sizeof(int))) == NULL) + if ((data = (int *)calloc((size_t)num_elements, sizeof(int))) == NULL) TEST_ERROR; if ((fcpl = H5Pcreate(H5P_FILE_CREATE)) < 0) @@ -673,7 +673,7 @@ test_raw_data_handling(hid_t orig_fapl, const char *env_h5_drvr) FAIL_STACK_ERROR; for (i = 0; i < 400; i++) { if (data[i] != -1) { - HDfprintf(stderr, "Read different values than written\n"); + fprintf(stderr, "Read different values than written\n"); FAIL_STACK_ERROR; } } @@ -687,7 +687,7 @@ test_raw_data_handling(hid_t orig_fapl, const char *env_h5_drvr) FAIL_STACK_ERROR; for (i = 0; i < 1; i++) { if (data[i] != -1) { - HDfprintf(stderr, "Read different values than written\n"); + fprintf(stderr, "Read different values than written\n"); TEST_ERROR; } } @@ -702,7 +702,7 @@ test_raw_data_handling(hid_t orig_fapl, const char *env_h5_drvr) FAIL_STACK_ERROR; for (i = 0; i < 100; i++) { if (data[i] != i + 350) { - HDfprintf(stderr, "Read different values than written\n"); + fprintf(stderr, "Read different values than written\n"); TEST_ERROR; } } @@ -717,13 +717,13 @@ test_raw_data_handling(hid_t orig_fapl, const char *env_h5_drvr) while (i < 800) { if ((i >= 100 && i < 300) || (i >= 600)) { if (data[i] != i) { - HDfprintf(stderr, "Read different values than written\n"); + fprintf(stderr, "Read different values than written\n"); TEST_ERROR; } } else { if (data[i] != -1) { - HDfprintf(stderr, "Read different values than written\n"); + fprintf(stderr, "Read different values than written\n"); TEST_ERROR; } } @@ -739,7 +739,7 @@ test_raw_data_handling(hid_t orig_fapl, const char *env_h5_drvr) TEST_ERROR; for (i = 0; i < 800; i++) { if (data[i] != i) { - HDfprintf(stderr, "Read different values than written\n"); + fprintf(stderr, "Read different values than written\n"); TEST_ERROR; } } @@ -765,13 +765,13 @@ test_raw_data_handling(hid_t orig_fapl, const char *env_h5_drvr) while (i < 1000) { if (i < 400) { if (data[i] != i) { - HDfprintf(stderr, "Read different values than written\n"); + fprintf(stderr, "Read different values than written\n"); TEST_ERROR; } } else { if (data[i] != 0) { - HDfprintf(stderr, "Read different values than written\n"); + fprintf(stderr, "Read different values than written\n"); TEST_ERROR; } } @@ -786,7 +786,7 @@ test_raw_data_handling(hid_t orig_fapl, const char *env_h5_drvr) FAIL_STACK_ERROR; if (H5Pclose(fapl) < 0) FAIL_STACK_ERROR; - HDfree(data); + free(data); PASSED(); return 0; @@ -798,7 +798,7 @@ error: H5Pclose(fcpl); H5Fclose(file_id); if (data) - HDfree(data); + free(data); } H5E_END_TRY; return 1; @@ -848,7 +848,7 @@ test_lru_processing(hid_t orig_fapl, const char *env_h5_drvr) if (set_multi_split(env_h5_drvr, fapl, sizeof(int) * 200) != 0) TEST_ERROR; - if ((data = (int *)HDcalloc((size_t)num_elements, sizeof(int))) == NULL) + if ((data = (int *)calloc((size_t)num_elements, sizeof(int))) == NULL) TEST_ERROR; if ((fcpl = H5Pcreate(H5P_FILE_CREATE)) < 0) @@ -952,7 +952,7 @@ test_lru_processing(hid_t orig_fapl, const char *env_h5_drvr) FAIL_STACK_ERROR; for (i = 0; i < 1; i++) { if (data[i] != -1) { - HDfprintf(stderr, "Read different values than written\n"); + fprintf(stderr, "Read different values than written\n"); TEST_ERROR; } /* end if */ } /* end for */ @@ -979,7 +979,7 @@ test_lru_processing(hid_t orig_fapl, const char *env_h5_drvr) FAIL_STACK_ERROR; for (i = 0; i < 100; i++) { if (data[i] != i + 350) { - HDfprintf(stderr, "Read different values than written\n"); + fprintf(stderr, "Read different values than written\n"); TEST_ERROR; } /* end if */ } /* end for */ @@ -1028,7 +1028,7 @@ test_lru_processing(hid_t orig_fapl, const char *env_h5_drvr) FAIL_STACK_ERROR; if (H5Pclose(fapl) < 0) FAIL_STACK_ERROR; - HDfree(data); + free(data); PASSED(); return 0; @@ -1040,7 +1040,7 @@ error: H5Pclose(fcpl); H5Fclose(file_id); if (data) - HDfree(data); + free(data); } H5E_END_TRY; return 1; @@ -1083,7 +1083,7 @@ test_min_threshold(hid_t orig_fapl, const char *env_h5_drvr) H5F_t *f = NULL; TESTING("Minimum Metadata threshold Processing"); - HDprintf("\n"); + printf("\n"); h5_fixname(FILENAME[0], orig_fapl, filename, sizeof(filename)); if ((fapl = H5Pcopy(orig_fapl)) < 0) @@ -1092,7 +1092,7 @@ test_min_threshold(hid_t orig_fapl, const char *env_h5_drvr) if (set_multi_split(env_h5_drvr, fapl, sizeof(int) * 200) != 0) TEST_ERROR; - if ((data = (int *)HDcalloc((size_t)num_elements, sizeof(int))) == NULL) + if ((data = (int *)calloc((size_t)num_elements, sizeof(int))) == NULL) TEST_ERROR; if ((fcpl = H5Pcreate(H5P_FILE_CREATE)) < 0) @@ -1104,7 +1104,7 @@ test_min_threshold(hid_t orig_fapl, const char *env_h5_drvr) if (H5Pset_file_space_page_size(fcpl, sizeof(int) * 200) < 0) FAIL_STACK_ERROR; - HDprintf("\tMinimum metadata threshold = 100%%\n"); + printf("\tMinimum metadata threshold = 100%%\n"); /* keep 5 pages at max in the page buffer and 5 meta page minimum */ if (H5Pset_page_buffer_size(fapl, sizeof(int) * 1000, 100, 0) < 0) @@ -1121,9 +1121,9 @@ test_min_threshold(hid_t orig_fapl, const char *env_h5_drvr) /* opening the file inserts one or more pages into the page buffer. * Get the raw and meta counts now, so we can adjust tests accordingly. */ - HDassert(f); - HDassert(f->shared); - HDassert(f->shared->page_buf); + assert(f); + assert(f->shared); + assert(f->shared->page_buf); base_raw_cnt = f->shared->page_buf->raw_count; base_meta_cnt = f->shared->page_buf->meta_count; @@ -1235,7 +1235,7 @@ test_min_threshold(hid_t orig_fapl, const char *env_h5_drvr) if (H5Fclose(file_id) < 0) FAIL_STACK_ERROR; - HDprintf("\tMinimum raw data threshold = 100%%\n"); + printf("\tMinimum raw data threshold = 100%%\n"); page_count = 0; @@ -1255,9 +1255,9 @@ test_min_threshold(hid_t orig_fapl, const char *env_h5_drvr) /* opening the file inserts one or more pages into the page buffer. * Get the raw and meta counts now, so we can adjust tests accordingly. */ - HDassert(f); - HDassert(f->shared); - HDassert(f->shared->page_buf); + assert(f); + assert(f->shared); + assert(f->shared->page_buf); base_raw_cnt = f->shared->page_buf->raw_count; base_meta_cnt = f->shared->page_buf->meta_count; @@ -1365,7 +1365,7 @@ test_min_threshold(hid_t orig_fapl, const char *env_h5_drvr) if (H5Fclose(file_id) < 0) FAIL_STACK_ERROR; - HDprintf("\tMinimum metadata threshold = 40%%, Minimum rawdata threshold = 40%%\n"); + printf("\tMinimum metadata threshold = 40%%, Minimum rawdata threshold = 40%%\n"); page_count = 0; /* keep 5 pages at max in the page buffer 2 meta pages, 2 raw pages * minimum @@ -1510,7 +1510,7 @@ test_min_threshold(hid_t orig_fapl, const char *env_h5_drvr) if (H5Fclose(file_id) < 0) FAIL_STACK_ERROR; - HDprintf("\tMinimum metadata threshold = 20%%\n"); + printf("\tMinimum metadata threshold = 20%%\n"); page_count = 0; /* keep 5 pages at max in the page buffer and 1 meta page minimum */ if (H5Pset_page_buffer_size(fapl, sizeof(int) * 1000, 39, 0) < 0) @@ -1646,7 +1646,7 @@ test_min_threshold(hid_t orig_fapl, const char *env_h5_drvr) if (H5Pclose(fapl) < 0) FAIL_STACK_ERROR; - HDfree(data); + free(data); PASSED(); @@ -1660,7 +1660,7 @@ error: H5Pclose(fcpl); H5Fclose(file_id); if (data) - HDfree(data); + free(data); } H5E_END_TRY; @@ -1711,7 +1711,7 @@ test_stats_collection(hid_t orig_fapl, const char *env_h5_drvr) if (set_multi_split(env_h5_drvr, fapl, sizeof(int) * 200) != 0) TEST_ERROR; - if ((data = (int *)HDcalloc((size_t)num_elements, sizeof(int))) == NULL) + if ((data = (int *)calloc((size_t)num_elements, sizeof(int))) == NULL) TEST_ERROR; if ((fcpl = H5Pcreate(H5P_FILE_CREATE)) < 0) @@ -1738,9 +1738,9 @@ test_stats_collection(hid_t orig_fapl, const char *env_h5_drvr) * Get the raw and meta counts now, so we can adjust the expected * statistics accordingly. */ - HDassert(f); - HDassert(f->shared); - HDassert(f->shared->page_buf); + assert(f); + assert(f->shared); + assert(f->shared->page_buf); base_raw_cnt = f->shared->page_buf->raw_count; base_meta_cnt = f->shared->page_buf->meta_count; @@ -1938,7 +1938,7 @@ test_stats_collection(hid_t orig_fapl, const char *env_h5_drvr) FAIL_STACK_ERROR; if (H5Pclose(fapl) < 0) FAIL_STACK_ERROR; - HDfree(data); + free(data); PASSED(); return 0; @@ -1950,7 +1950,7 @@ error: H5Pclose(fcpl); H5Fclose(file_id); if (data) - HDfree(data); + free(data); } H5E_END_TRY; @@ -2111,7 +2111,7 @@ main(void) SKIPPED(); HDputs("Skip page buffering test because paged aggregation is disabled for multi/split drivers"); - HDexit(EXIT_SUCCESS); + exit(EXIT_SUCCESS); } /* end if */ if ((fapl = h5_fileaccess()) < 0) { @@ -2151,10 +2151,10 @@ main(void) HDputs("All Page Buffering tests passed."); - HDexit(EXIT_SUCCESS); + exit(EXIT_SUCCESS); error: - HDprintf("***** %d Page Buffering TEST%s FAILED! *****\n", nerrors, nerrors > 1 ? "S" : ""); + printf("***** %d Page Buffering TEST%s FAILED! *****\n", nerrors, nerrors > 1 ? "S" : ""); H5E_BEGIN_TRY { @@ -2165,5 +2165,5 @@ error: if (api_ctx_pushed) H5CX_pop(FALSE); - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); } /* main() */ diff --git a/test/reserved.c b/test/reserved.c index a820344..2e2b431 100644 --- a/test/reserved.c +++ b/test/reserved.c @@ -491,7 +491,7 @@ main(void) num_errs += rsrv_vlen(); if (num_errs > 0) - HDprintf("**** %d FAILURE%s! ****\n", num_errs, num_errs == 1 ? "" : "S"); + printf("**** %d FAILURE%s! ****\n", num_errs, num_errs == 1 ? "" : "S"); else HDputs("All address space reservation tests passed."); diff --git a/test/ros3.c b/test/ros3.c index bc9eb86..99f9f52 100644 --- a/test/ros3.c +++ b/test/ros3.c @@ -106,7 +106,7 @@ */ #define JSFAILED_AT() \ { \ - HDprintf("*FAILED* at %s:%d in %s()...\n", __FILE__, __LINE__, __func__); \ + printf("*FAILED* at %s:%d in %s()...\n", __FILE__, __LINE__, __func__); \ } /*---------------------------------------------------------------------------- @@ -197,10 +197,10 @@ static inline void jserr_long(long expected, long actual, const char *reason) { if (reason != NULL) { - HDprintf("%s\n", reason); + printf("%s\n", reason); } else { - HDprintf(" ! Expected %ld\n ! Actual %ld\n", expected, actual); + printf(" ! Expected %ld\n ! Actual %ld\n", expected, actual); } } @@ -242,10 +242,10 @@ static inline void jserr_str(const char *expected, const char *actual, const char *reason) { if (reason != NULL) { - HDprintf("%s\n", reason); + printf("%s\n", reason); } else { - HDprintf("!!! Expected:\n%s\n!!!Actual:\n%s\n", expected, actual); + printf("!!! Expected:\n%s\n!!!Actual:\n%s\n", expected, actual); } } @@ -561,7 +561,7 @@ test_fapl_config_validation(void) if (FALSE == s3_test_bucket_defined) { SKIPPED(); HDputs(" environment variable HDF5_ROS3_TEST_BUCKET_URL not defined"); - HDfflush(stdout); + fflush(stdout); return 0; } @@ -842,7 +842,7 @@ test_vfd_open(void) if (FALSE == s3_test_bucket_defined) { SKIPPED(); HDputs(" environment variable HDF5_ROS3_TEST_BUCKET_URL not defined"); - HDfflush(stdout); + fflush(stdout); return 0; } @@ -985,14 +985,14 @@ test_eof_eoa(void) if (s3_test_credentials_loaded == 0) { SKIPPED(); HDputs(" s3 credentials are not loaded"); - HDfflush(stdout); + fflush(stdout); return 0; } if (FALSE == s3_test_bucket_defined) { SKIPPED(); HDputs(" environment variable HDF5_ROS3_TEST_BUCKET_URL not defined"); - HDfflush(stdout); + fflush(stdout); return 0; } @@ -1096,14 +1096,14 @@ test_H5FDread_without_eoa_set_fails(void) if (s3_test_credentials_loaded == 0) { SKIPPED(); HDputs(" s3 credentials are not loaded"); - HDfflush(stdout); + fflush(stdout); return 0; } if (FALSE == s3_test_bucket_defined) { SKIPPED(); HDputs(" environment variable HDF5_ROS3_TEST_BUCKET_URL not defined"); - HDfflush(stdout); + fflush(stdout); return 0; } @@ -1270,14 +1270,14 @@ test_read(void) if (s3_test_credentials_loaded == 0) { SKIPPED(); HDputs(" s3 credentials are not loaded"); - HDfflush(stdout); + fflush(stdout); return 0; } if (FALSE == s3_test_bucket_defined) { SKIPPED(); HDputs(" environment variable HDF5_ROS3_TEST_BUCKET_URL not defined"); - HDfflush(stdout); + fflush(stdout); return 0; } @@ -1414,7 +1414,7 @@ test_noops_and_autofails(void) if (FALSE == s3_test_bucket_defined) { SKIPPED(); HDputs(" environment variable HDF5_ROS3_TEST_BUCKET_URL not defined"); - HDfflush(stdout); + fflush(stdout); return 0; } @@ -1534,14 +1534,14 @@ test_cmp(void) if (s3_test_credentials_loaded == 0) { SKIPPED(); HDputs(" s3 credentials are not loaded"); - HDfflush(stdout); + fflush(stdout); return 0; } if (FALSE == s3_test_bucket_defined) { SKIPPED(); HDputs(" environment variable HDF5_ROS3_TEST_BUCKET_URL not defined"); - HDfflush(stdout); + fflush(stdout); return 0; } @@ -1658,14 +1658,14 @@ test_H5F_integration(void) if (s3_test_credentials_loaded == 0) { SKIPPED(); HDputs(" s3 credentials are not loaded"); - HDfflush(stdout); + fflush(stdout); return 0; } if (FALSE == s3_test_bucket_defined) { SKIPPED(); HDputs(" environment variable HDF5_ROS3_TEST_BUCKET_URL not defined"); - HDfflush(stdout); + fflush(stdout); return 0; } @@ -1711,8 +1711,8 @@ error: /*********** * CLEANUP * ***********/ - HDprintf("\nerror!"); - HDfflush(stdout); + printf("\nerror!"); + fflush(stdout); if (fapl_id >= 0) { H5E_BEGIN_TRY @@ -1753,7 +1753,7 @@ main(void) #endif /* H5_HAVE_ROS3_VFD */ - HDprintf("Testing ros3 VFD functionality.\n"); + printf("Testing ros3 VFD functionality.\n"); #ifdef H5_HAVE_ROS3_VFD @@ -1763,8 +1763,8 @@ main(void) bucket_url_env = HDgetenv("HDF5_ROS3_TEST_BUCKET_URL"); if (bucket_url_env == NULL || bucket_url_env[0] == '\0') { - HDprintf("WARNING: S3 bucket url is not defined in environment " - "variable 'HDF5_ROS3_TEST_BUCKET_URL'!\n"); + printf("WARNING: S3 bucket url is not defined in environment " + "variable 'HDF5_ROS3_TEST_BUCKET_URL'!\n"); } else { HDstrncpy(s3_test_bucket_url, bucket_url_env, S3_TEST_MAX_URL_SIZE); @@ -1774,25 +1774,25 @@ main(void) if (S3_TEST_MAX_URL_SIZE < HDsnprintf(url_text_restricted, (size_t)S3_TEST_MAX_URL_SIZE, "%s/%s", (const char *)s3_test_bucket_url, (const char *)S3_TEST_RESOURCE_TEXT_RESTRICTED)) { - HDprintf("* ros3 setup failed (text_restricted) ! *\n"); + printf("* ros3 setup failed (text_restricted) ! *\n"); return 1; } if (S3_TEST_MAX_URL_SIZE < HDsnprintf(url_text_public, (size_t)S3_TEST_MAX_URL_SIZE, "%s/%s", (const char *)s3_test_bucket_url, (const char *)S3_TEST_RESOURCE_TEXT_PUBLIC)) { - HDprintf("* ros3 setup failed (text_public) ! *\n"); + printf("* ros3 setup failed (text_public) ! *\n"); return 1; } if (S3_TEST_MAX_URL_SIZE < HDsnprintf(url_h5_public, (size_t)S3_TEST_MAX_URL_SIZE, "%s/%s", (const char *)s3_test_bucket_url, (const char *)S3_TEST_RESOURCE_H5_PUBLIC)) { - HDprintf("* ros3 setup failed (h5_public) ! *\n"); + printf("* ros3 setup failed (h5_public) ! *\n"); return 1; } if (S3_TEST_MAX_URL_SIZE < HDsnprintf(url_missing, S3_TEST_MAX_URL_SIZE, "%s/%s", (const char *)s3_test_bucket_url, (const char *)S3_TEST_RESOURCE_MISSING)) { - HDprintf("* ros3 setup failed (missing) ! *\n"); + printf("* ros3 setup failed (missing) ! *\n"); return 1; } @@ -1836,17 +1836,17 @@ main(void) nerrors += test_H5F_integration(); if (nerrors > 0) { - HDprintf("***** %d ros3 TEST%s FAILED! *****\n", nerrors, nerrors > 1 ? "S" : ""); + printf("***** %d ros3 TEST%s FAILED! *****\n", nerrors, nerrors > 1 ? "S" : ""); nerrors = 1; } else { - HDprintf("All ros3 tests passed.\n"); + printf("All ros3 tests passed.\n"); } return nerrors; /* 0 if no errors, 1 if any errors */ #else - HDprintf("SKIPPED - read-only S3 VFD not built\n"); + printf("SKIPPED - read-only S3 VFD not built\n"); return EXIT_SUCCESS; #endif /* H5_HAVE_ROS3_VFD */ diff --git a/test/s3comms.c b/test/s3comms.c index 45978fb..f3181db 100644 --- a/test/s3comms.c +++ b/test/s3comms.c @@ -96,7 +96,7 @@ */ #define JSFAILED_AT() \ { \ - HDprintf("*FAILED* at %s:%d in %s()...\n", __FILE__, __LINE__, __func__); \ + printf("*FAILED* at %s:%d in %s()...\n", __FILE__, __LINE__, __func__); \ } /*---------------------------------------------------------------------------- @@ -185,10 +185,10 @@ static inline void jserr_long(long expected, long actual, const char *reason) { if (reason != NULL) { - HDprintf("%s\n", reason); + printf("%s\n", reason); } else { - HDprintf(" ! Expected %ld\n ! Actual %ld\n", expected, actual); + printf(" ! Expected %ld\n ! Actual %ld\n", expected, actual); } } @@ -230,10 +230,10 @@ static inline void jserr_str(const char *expected, const char *actual, const char *reason) { if (reason != NULL) { - HDprintf("%s\n", reason); + printf("%s\n", reason); } else { - HDprintf("!!! Expected:\n%s\n!!!Actual:\n%s\n", expected, actual); + printf("!!! Expected:\n%s\n!!!Actual:\n%s\n", expected, actual); } } @@ -535,7 +535,7 @@ test_aws_canonical_request(void) /* create HTTP request object with given verb, resource/path */ hrb = H5FD_s3comms_hrb_init_request(C->verb, C->resource, "HTTP/1.1"); - HDassert(hrb->body == NULL); + assert(hrb->body == NULL); /* Create headers list from test case input */ @@ -557,9 +557,9 @@ test_aws_canonical_request(void) while (node != NULL) { FAIL_IF(FAIL == H5FD_s3comms_hrb_node_set(&node, node->name, NULL)); } - HDassert(NULL == node); + assert(NULL == node); FAIL_IF(FAIL == H5FD_s3comms_hrb_destroy(&hrb)); - HDassert(NULL == hrb); + assert(NULL == hrb); } /* for each test case */ @@ -580,7 +580,7 @@ test_aws_canonical_request(void) "signed headers destination cannot be null") FAIL_IF(FAIL == H5FD_s3comms_hrb_destroy(&hrb)) - HDassert(NULL == hrb); + assert(NULL == hrb); PASSED(); return 0; @@ -590,7 +590,7 @@ error: if (node != NULL) { while (node != NULL) (void)H5FD_s3comms_hrb_node_set(&node, node->name, NULL); - HDassert(node == NULL); + assert(node == NULL); } if (hrb != NULL) { (void)H5FD_s3comms_hrb_destroy(&hrb); @@ -1271,8 +1271,8 @@ test_HMAC_SHA256(void) dest = NULL; } else { - dest = (char *)HDmalloc(sizeof(char) * cases[i].dest_size); - HDassert(dest != NULL); + dest = (char *)malloc(sizeof(char) * cases[i].dest_size); + assert(dest != NULL); } JSVERIFY( @@ -1284,10 +1284,10 @@ test_HMAC_SHA256(void) if (0 != HDstrncmp(cases[i].exp, dest, HDstrlen(cases[i].exp))) { /* print out how wrong things are, and then fail */ - dest = (char *)HDrealloc(dest, cases[i].dest_size + 1); - HDassert(dest != NULL); + dest = (char *)realloc(dest, cases[i].dest_size + 1); + assert(dest != NULL); dest[cases[i].dest_size] = 0; - HDfprintf(stdout, "ERROR:\n!!! \"%s\"\n != \"%s\"\n", cases[i].exp, dest); + fprintf(stdout, "ERROR:\n!!! \"%s\"\n != \"%s\"\n", cases[i].exp, dest); TEST_ERROR; } #else /* VERBOSE not defined */ @@ -1296,14 +1296,14 @@ test_HMAC_SHA256(void) JSVERIFY(0, HDstrncmp(cases[i].exp, dest, HDstrlen(cases[i].exp)), NULL); #endif /* VERBOSE */ } - HDfree(dest); + free(dest); } PASSED(); return 0; error: - HDfree(dest); + free(dest); return -1; } /* end test_HMAC_SHA256() */ @@ -1365,13 +1365,13 @@ test_nlowercase(void) TESTING("nlowercase"); for (i = 0; i < n_cases; i++) { - dest = (char *)HDmalloc(sizeof(char) * 16); + dest = (char *)malloc(sizeof(char) * 16); JSVERIFY(SUCCEED, H5FD_s3comms_nlowercase(dest, cases[i].in, cases[i].len), cases[i].in) if (cases[i].len > 0) { JSVERIFY(0, HDstrncmp(dest, cases[i].exp, cases[i].len), NULL) } - HDfree(dest); + free(dest); } /* end for each testcase */ JSVERIFY(FAIL, H5FD_s3comms_nlowercase(NULL, cases[0].in, cases[0].len), "null destination should fail") @@ -1380,7 +1380,7 @@ test_nlowercase(void) return 0; error: - HDfree(dest); + free(dest); return -1; } /* end test_nlowercase() */ @@ -1606,7 +1606,7 @@ test_parse_url(void) *********/ for (i = 0; i < ncases; i++) { - HDassert(purl == NULL); + assert(purl == NULL); JSVERIFY(cases[i].exp_ret, H5FD_s3comms_parse_url(cases[i].url, &purl), cases[i].msg) @@ -1779,7 +1779,7 @@ test_s3r_get_filesize(void) if (FALSE == s3_test_bucket_defined) { SKIPPED(); HDputs(" environment variable HDF5_ROS3_TEST_BUCKET_URL not defined"); - HDfflush(stdout); + fflush(stdout); return 0; } @@ -1837,13 +1837,13 @@ test_s3r_open(void) if (s3_test_credentials_loaded == 0) { SKIPPED(); HDputs(" s3 credentials are not loaded"); - HDfflush(stdout); + fflush(stdout); return 0; } if (FALSE == s3_test_bucket_defined) { SKIPPED(); HDputs(" environment variable HDF5_ROS3_TEST_BUCKET_URL not defined"); - HDfflush(stdout); + fflush(stdout); return 0; } @@ -1913,7 +1913,7 @@ test_s3r_open(void) *************************/ #if S3_TEST_RUN_TIMEOUT - HDprintf("Opening on inactive port may hang for a minute; waiting for timeout\n"); + printf("Opening on inactive port may hang for a minute; waiting for timeout\n"); handle = H5FD_s3comms_s3r_open(url_raven_badport, NULL, NULL, NULL); FAIL_IF(handle != NULL); #endif @@ -2041,7 +2041,7 @@ test_s3r_read(void) if (FALSE == s3_test_bucket_defined) { SKIPPED(); HDputs(" environment variable HDF5_ROS3_TEST_BUCKET_URL not defined"); - HDfflush(stdout); + fflush(stdout); return 0; } @@ -2219,8 +2219,8 @@ test_signing_key(void) TESTING("signing_key"); for (i = 0; i < ncases; i++) { - key = (unsigned char *)HDmalloc(sizeof(unsigned char) * SHA256_DIGEST_LENGTH); - HDassert(key != NULL); + key = (unsigned char *)malloc(sizeof(unsigned char) * SHA256_DIGEST_LENGTH); + assert(key != NULL); JSVERIFY(SUCCEED, H5FD_s3comms_signing_key(key, cases[i].secret_key, cases[i].region, cases[i].when), NULL) @@ -2228,7 +2228,7 @@ test_signing_key(void) JSVERIFY(0, HDstrncmp((const char *)cases[i].exp, (const char *)key, SHA256_DIGEST_LENGTH), (const char *)cases[i].exp) - HDfree(key); + free(key); key = NULL; } @@ -2236,8 +2236,8 @@ test_signing_key(void) * ERROR CASES * ***************/ - key = (unsigned char *)HDmalloc(sizeof(unsigned char) * SHA256_DIGEST_LENGTH); - HDassert(key != NULL); + key = (unsigned char *)malloc(sizeof(unsigned char) * SHA256_DIGEST_LENGTH); + assert(key != NULL); JSVERIFY(FAIL, H5FD_s3comms_signing_key(NULL, cases[0].secret_key, cases[0].region, cases[0].when), "destination cannot be NULL") @@ -2251,7 +2251,7 @@ test_signing_key(void) JSVERIFY(FAIL, H5FD_s3comms_signing_key(key, cases[0].secret_key, cases[0].region, NULL), "time string cannot be NULL") - HDfree(key); + free(key); key = NULL; PASSED(); @@ -2259,7 +2259,7 @@ test_signing_key(void) error: if (key != NULL) { - HDfree(key); + free(key); } return -1; @@ -2399,9 +2399,9 @@ test_trim(void) TESTING("s3comms trim"); for (i = 0; i < n_cases; i++) { - HDassert(str == NULL); - str = (char *)HDmalloc(sizeof(char) * cases[i].in_len); - HDassert(str != NULL); + assert(str == NULL); + str = (char *)malloc(sizeof(char) * cases[i].in_len); + assert(str != NULL); HDstrncpy(str, cases[i].in, cases[i].in_len); JSVERIFY(SUCCEED, H5FD_s3comms_trim(dest, str, cases[i].in_len, &dest_len), NULL) @@ -2409,7 +2409,7 @@ test_trim(void) if (dest_len > 0) { JSVERIFY(0, HDstrncmp(cases[i].exp, dest, dest_len), cases[i].exp) } - HDfree(str); + free(str); str = NULL; } /* end for each testcase */ @@ -2417,12 +2417,12 @@ test_trim(void) "should not fail when trimming a null string"); JSVERIFY(0, dest_len, "trimming NULL string writes 0 characters") - HDassert(str == NULL); - str = (char *)HDmalloc(sizeof(char *) * 11); - HDassert(str != NULL); - HDmemcpy(str, "some text ", 11); /* string with null terminator */ + assert(str == NULL); + str = (char *)malloc(sizeof(char *) * 11); + assert(str != NULL); + memcpy(str, "some text ", 11); /* string with null terminator */ JSVERIFY(FAIL, H5FD_s3comms_trim(NULL, str, 10, &dest_len), "destination for trim cannot be NULL"); - HDfree(str); + free(str); str = NULL; PASSED(); @@ -2430,7 +2430,7 @@ test_trim(void) error: if (str != NULL) { - HDfree(str); + free(str); } return -1; @@ -2514,7 +2514,7 @@ test_uriencode(void) for (i = 0; i < ncases; i++) { str_len = cases[i].s_len; - dest = (char *)HDmalloc(sizeof(char) * str_len * 3 + 1); + dest = (char *)malloc(sizeof(char) * str_len * 3 + 1); FAIL_IF(dest == NULL) JSVERIFY(SUCCEED, @@ -2523,7 +2523,7 @@ test_uriencode(void) JSVERIFY(HDstrlen(cases[i].expected), dest_written, NULL) JSVERIFY(0, HDstrncmp(dest, cases[i].expected, dest_written), cases[i].expected); - HDfree(dest); + free(dest); dest = NULL; } /* end for each testcase */ @@ -2531,15 +2531,15 @@ test_uriencode(void) * ERROR CASES * ***************/ - dest = (char *)HDmalloc(sizeof(char) * 15); - HDassert(dest != NULL); + dest = (char *)malloc(sizeof(char) * 15); + assert(dest != NULL); JSVERIFY(FAIL, H5FD_s3comms_uriencode(NULL, "word$", 5, FALSE, &dest_written), "destination cannot be NULL"); JSVERIFY(FAIL, H5FD_s3comms_uriencode(dest, NULL, 5, FALSE, &dest_written), "source string cannot be NULL"); - HDfree(dest); + free(dest); dest = NULL; PASSED(); @@ -2547,7 +2547,7 @@ test_uriencode(void) error: if (dest != NULL) { - HDfree(dest); + free(dest); } return -1; @@ -2583,7 +2583,7 @@ main(void) #endif /* H5_HAVE_ROS3_VFD */ - HDprintf("Testing S3Communications functionality.\n"); + printf("Testing S3Communications functionality.\n"); #ifdef H5_HAVE_ROS3_VFD @@ -2606,8 +2606,8 @@ main(void) bucket_url_env = HDgetenv("HDF5_ROS3_TEST_BUCKET_URL"); if (bucket_url_env == NULL || bucket_url_env[0] == '\0') { - HDprintf("WARNING: S3 bucket url is not defined in environment " - "variable 'HDF5_ROS3_TEST_BUCKET_URL'!\n"); + printf("WARNING: S3 bucket url is not defined in environment " + "variable 'HDF5_ROS3_TEST_BUCKET_URL'!\n"); } else { HDstrncpy(s3_test_bucket_url, bucket_url_env, S3_TEST_MAX_URL_SIZE); @@ -2633,17 +2633,17 @@ main(void) nerrors += test_s3r_read() < 0 ? 1 : 0; if (nerrors) { - HDprintf("***** %d S3comms TEST%s FAILED! *****\n", nerrors, nerrors > 1 ? "S" : ""); + printf("***** %d S3comms TEST%s FAILED! *****\n", nerrors, nerrors > 1 ? "S" : ""); return 1; } - HDprintf("All S3comms tests passed.\n"); + printf("All S3comms tests passed.\n"); return 0; #else - HDprintf("SKIPPED - read-only S3 VFD not built\n"); + printf("SKIPPED - read-only S3 VFD not built\n"); return EXIT_SUCCESS; #endif /* H5_HAVE_ROS3_VFD */ diff --git a/test/select_io_dset.c b/test/select_io_dset.c index 0724365..29e6987 100644 --- a/test/select_io_dset.c +++ b/test/select_io_dset.c @@ -178,7 +178,7 @@ test_no_type_conv(hid_t fid, unsigned chunked, unsigned dtrans, unsigned mwbuf) /* Copy wbuf if the library will be modifying it */ if (mwbuf) - HDmemcpy(wbuf_bak, wbuf, sizeof(wbuf)); + memcpy(wbuf_bak, wbuf, sizeof(wbuf)); /* Write data to the dataset with/without data transform */ if (H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, dxpl, wbuf) < 0) @@ -186,7 +186,7 @@ test_no_type_conv(hid_t fid, unsigned chunked, unsigned dtrans, unsigned mwbuf) /* Restore wbuf from backup if the library modified it */ if (mwbuf) - HDmemcpy(wbuf, wbuf_bak, sizeof(wbuf)); + memcpy(wbuf, wbuf_bak, sizeof(wbuf)); /* Read data from the dataset without data transform set in dxpl */ if (H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, ntrans_dxpl, rbuf) < 0) @@ -196,8 +196,8 @@ test_no_type_conv(hid_t fid, unsigned chunked, unsigned dtrans, unsigned mwbuf) for (i = 0; i < DSET_SELECT_DIM; i++) if (rbuf[i] != (dtrans ? trans_wbuf[i] : wbuf[i])) { H5_FAILED(); - HDprintf(" Read different values than written.\n"); - HDprintf(" At index %d\n", i); + printf(" Read different values than written.\n"); + printf(" At index %d\n", i); TEST_ERROR; } @@ -211,8 +211,8 @@ test_no_type_conv(hid_t fid, unsigned chunked, unsigned dtrans, unsigned mwbuf) for (i = 0; i < DSET_SELECT_DIM; i++) if (rbuf[i] != (2 * trans_wbuf[i])) { H5_FAILED(); - HDprintf(" Read different values than written.\n"); - HDprintf(" At index %d\n", i); + printf(" Read different values than written.\n"); + printf(" At index %d\n", i); TEST_ERROR; } } @@ -268,11 +268,11 @@ test_no_size_change_no_bkg(hid_t fid, unsigned chunked, unsigned mwbuf) char *rbuf = NULL; char dset_name[DSET_NAME_LEN]; - if ((wbuf = (char *)HDmalloc((size_t)(4 * DSET_SELECT_DIM))) == NULL) + if ((wbuf = (char *)malloc((size_t)(4 * DSET_SELECT_DIM))) == NULL) FAIL_STACK_ERROR; - if (mwbuf && (wbuf_bak = (char *)HDmalloc((size_t)(4 * DSET_SELECT_DIM))) == NULL) + if (mwbuf && (wbuf_bak = (char *)malloc((size_t)(4 * DSET_SELECT_DIM))) == NULL) FAIL_STACK_ERROR; - if ((rbuf = (char *)HDmalloc((size_t)(4 * DSET_SELECT_DIM))) == NULL) + if ((rbuf = (char *)malloc((size_t)(4 * DSET_SELECT_DIM))) == NULL) FAIL_STACK_ERROR; /* Create dataset transfer property list */ @@ -318,7 +318,7 @@ test_no_size_change_no_bkg(hid_t fid, unsigned chunked, unsigned mwbuf) /* Copy wbuf if the library will be modifying it */ if (mwbuf) - HDmemcpy(wbuf_bak, wbuf, (size_t)(4 * DSET_SELECT_DIM)); + memcpy(wbuf_bak, wbuf, (size_t)(4 * DSET_SELECT_DIM)); /* Write the data to the dataset with little endian */ if (H5Dwrite(did, H5T_STD_I32LE, H5S_ALL, H5S_ALL, dxpl, wbuf) < 0) @@ -326,7 +326,7 @@ test_no_size_change_no_bkg(hid_t fid, unsigned chunked, unsigned mwbuf) /* Restore wbuf from backup if the library modified it */ if (mwbuf) - HDmemcpy(wbuf, wbuf_bak, (size_t)(4 * DSET_SELECT_DIM)); + memcpy(wbuf, wbuf_bak, (size_t)(4 * DSET_SELECT_DIM)); /* Read the data from the dataset with little endian */ if (H5Dread(did, H5T_STD_I32LE, H5S_ALL, H5S_ALL, dxpl, rbuf) < 0) @@ -337,8 +337,8 @@ test_no_size_change_no_bkg(hid_t fid, unsigned chunked, unsigned mwbuf) if (rbuf[4 * i + 0] != wbuf[4 * i + 0] || rbuf[4 * i + 1] != wbuf[4 * i + 1] || rbuf[4 * i + 2] != wbuf[4 * i + 2] || rbuf[4 * i + 3] != wbuf[4 * i + 3]) { H5_FAILED(); - HDprintf(" Read different values than written.\n"); - HDprintf(" At index %d\n", i); + printf(" Read different values than written.\n"); + printf(" At index %d\n", i); TEST_ERROR; } @@ -351,8 +351,8 @@ test_no_size_change_no_bkg(hid_t fid, unsigned chunked, unsigned mwbuf) if (rbuf[4 * i + 0] != wbuf[4 * i + 3] || rbuf[4 * i + 1] != wbuf[4 * i + 2] || rbuf[4 * i + 2] != wbuf[4 * i + 1] || rbuf[4 * i + 3] != wbuf[4 * i + 0]) { H5_FAILED(); - HDprintf(" Read different values than written.\n"); - HDprintf(" At index %d\n", i); + printf(" Read different values than written.\n"); + printf(" At index %d\n", i); TEST_ERROR; } @@ -365,9 +365,9 @@ test_no_size_change_no_bkg(hid_t fid, unsigned chunked, unsigned mwbuf) if (H5Pclose(dxpl) < 0) FAIL_STACK_ERROR; - HDfree(wbuf); - HDfree(wbuf_bak); - HDfree(rbuf); + free(wbuf); + free(wbuf_bak); + free(rbuf); PASSED(); @@ -384,11 +384,11 @@ error: H5E_END_TRY; if (wbuf) - HDfree(wbuf); + free(wbuf); if (wbuf_bak) - HDfree(wbuf_bak); + free(wbuf_bak); if (wbuf) - HDfree(rbuf); + free(rbuf); return FAIL; @@ -468,7 +468,7 @@ test_larger_mem_type_no_bkg(hid_t fid, unsigned chunked, unsigned dtrans, unsign /* Copy wbuf if the library will be modifying it */ if (mwbuf) - HDmemcpy(wbuf_bak, wbuf, sizeof(wbuf)); + memcpy(wbuf_bak, wbuf, sizeof(wbuf)); /* Write data to the dataset with/without data transform set in dxpl */ if (H5Dwrite(did, H5T_NATIVE_LONG, H5S_ALL, H5S_ALL, dxpl, wbuf) < 0) @@ -476,7 +476,7 @@ test_larger_mem_type_no_bkg(hid_t fid, unsigned chunked, unsigned dtrans, unsign /* Restore wbuf from backup if the library modified it */ if (mwbuf) - HDmemcpy(wbuf, wbuf_bak, sizeof(wbuf)); + memcpy(wbuf, wbuf_bak, sizeof(wbuf)); /* Read the data from the dataset without data transform in dxpl */ if (H5Dread(did, H5T_NATIVE_LLONG, H5S_ALL, H5S_ALL, ntrans_dxpl, rbuf) < 0) @@ -486,8 +486,8 @@ test_larger_mem_type_no_bkg(hid_t fid, unsigned chunked, unsigned dtrans, unsign for (i = 0; i < DSET_SELECT_DIM; i++) if (rbuf[i] != (long long)(dtrans ? trans_wbuf[i] : wbuf[i])) { H5_FAILED(); - HDprintf(" Read different values than written.\n"); - HDprintf(" At index %d\n", i); + printf(" Read different values than written.\n"); + printf(" At index %d\n", i); TEST_ERROR; } @@ -501,8 +501,8 @@ test_larger_mem_type_no_bkg(hid_t fid, unsigned chunked, unsigned dtrans, unsign for (i = 0; i < DSET_SELECT_DIM; i++) if (rbuf[i] != (long long)(5 * (10 - trans_wbuf[i]))) { H5_FAILED(); - HDprintf(" Read different values than written.\n"); - HDprintf(" At index %d\n", i); + printf(" Read different values than written.\n"); + printf(" At index %d\n", i); TEST_ERROR; } } @@ -611,7 +611,7 @@ test_smaller_mem_type_no_bkg(hid_t fid, unsigned chunked, unsigned dtrans, unsig /* Copy wbuf if the library will be modifying it */ if (mwbuf) - HDmemcpy(wbuf_bak, wbuf, sizeof(wbuf)); + memcpy(wbuf_bak, wbuf, sizeof(wbuf)); /* Write data to the dataset with/without data transform in dxpl */ if (H5Dwrite(did, H5T_NATIVE_SHORT, H5S_ALL, H5S_ALL, dxpl, wbuf) < 0) @@ -619,7 +619,7 @@ test_smaller_mem_type_no_bkg(hid_t fid, unsigned chunked, unsigned dtrans, unsig /* Restore wbuf from backup if the library modified it */ if (mwbuf) - HDmemcpy(wbuf, wbuf_bak, sizeof(wbuf)); + memcpy(wbuf, wbuf_bak, sizeof(wbuf)); /* Read data from the dataset without data transform in dxpl */ if (H5Dread(did, H5T_NATIVE_SHORT, H5S_ALL, H5S_ALL, ntrans_dxpl, rbuf) < 0) @@ -629,8 +629,8 @@ test_smaller_mem_type_no_bkg(hid_t fid, unsigned chunked, unsigned dtrans, unsig for (i = 0; i < DSET_SELECT_DIM; i++) if (rbuf[i] != (dtrans ? trans_wbuf[i] : wbuf[i])) { H5_FAILED(); - HDprintf(" Read different values than written.\n"); - HDprintf(" At index %d\n", i); + printf(" Read different values than written.\n"); + printf(" At index %d\n", i); TEST_ERROR; } @@ -644,8 +644,8 @@ test_smaller_mem_type_no_bkg(hid_t fid, unsigned chunked, unsigned dtrans, unsig for (i = 0; i < DSET_SELECT_DIM; i++) if (rbuf[i] != (2 * (10 + trans_wbuf[i]))) { H5_FAILED(); - HDprintf(" Read different values than written.\n"); - HDprintf(" At index %d\n", i); + printf(" Read different values than written.\n"); + printf(" At index %d\n", i); TEST_ERROR; } } @@ -737,17 +737,17 @@ test_cmpd_with_bkg(hid_t fid, unsigned chunked, unsigned mwbuf) FAIL_STACK_ERROR; /* Allocate buffers for datasets */ - if (NULL == (s1_wbuf = (s1_t *)HDmalloc(sizeof(s1_t) * DSET_SELECT_DIM))) + if (NULL == (s1_wbuf = (s1_t *)malloc(sizeof(s1_t) * DSET_SELECT_DIM))) FAIL_STACK_ERROR; - if (mwbuf && NULL == (s1_wbuf_bak = (s1_t *)HDmalloc(sizeof(s1_t) * DSET_SELECT_DIM))) + if (mwbuf && NULL == (s1_wbuf_bak = (s1_t *)malloc(sizeof(s1_t) * DSET_SELECT_DIM))) FAIL_STACK_ERROR; - if (NULL == (s1_rbuf = (s1_t *)HDmalloc(sizeof(s1_t) * DSET_SELECT_DIM))) + if (NULL == (s1_rbuf = (s1_t *)malloc(sizeof(s1_t) * DSET_SELECT_DIM))) FAIL_STACK_ERROR; - if (NULL == (s2_wbuf = (s2_t *)HDmalloc(sizeof(s2_t) * DSET_SELECT_DIM))) + if (NULL == (s2_wbuf = (s2_t *)malloc(sizeof(s2_t) * DSET_SELECT_DIM))) FAIL_STACK_ERROR; - if (mwbuf && NULL == (s2_wbuf_bak = (s2_t *)HDmalloc(sizeof(s2_t) * DSET_SELECT_DIM))) + if (mwbuf && NULL == (s2_wbuf_bak = (s2_t *)malloc(sizeof(s2_t) * DSET_SELECT_DIM))) FAIL_STACK_ERROR; - if (NULL == (s2_rbuf = (s2_t *)HDmalloc(sizeof(s2_t) * DSET_SELECT_DIM))) + if (NULL == (s2_rbuf = (s2_t *)malloc(sizeof(s2_t) * DSET_SELECT_DIM))) FAIL_STACK_ERROR; /* Create the memory data type */ @@ -793,7 +793,7 @@ test_cmpd_with_bkg(hid_t fid, unsigned chunked, unsigned mwbuf) /* Copy wbuf if the library will be modifying it */ if (mwbuf) - HDmemcpy(s1_wbuf_bak, s1_wbuf, sizeof(s1_t) * DSET_SELECT_DIM); + memcpy(s1_wbuf_bak, s1_wbuf, sizeof(s1_t) * DSET_SELECT_DIM); /* Write all the data to the dataset */ if (H5Dwrite(did, s1_tid, H5S_ALL, H5S_ALL, dxpl, s1_wbuf) < 0) @@ -801,7 +801,7 @@ test_cmpd_with_bkg(hid_t fid, unsigned chunked, unsigned mwbuf) /* Restore wbuf from backup if the library modified it */ if (mwbuf) - HDmemcpy(s1_wbuf, s1_wbuf_bak, sizeof(s1_t) * DSET_SELECT_DIM); + memcpy(s1_wbuf, s1_wbuf_bak, sizeof(s1_t) * DSET_SELECT_DIM); /* Read all the data from the dataset */ if (H5Dread(did, s1_tid, H5S_ALL, H5S_ALL, dxpl, s1_rbuf) < 0) @@ -812,8 +812,8 @@ test_cmpd_with_bkg(hid_t fid, unsigned chunked, unsigned mwbuf) if (s1_wbuf[i].a != s1_rbuf[i].a || s1_wbuf[i].b != s1_rbuf[i].b || s1_wbuf[i].c != s1_rbuf[i].c || s1_wbuf[i].d != s1_rbuf[i].d) { H5_FAILED(); - HDprintf(" Read different values than written.\n"); - HDprintf(" At index %d\n", i); + printf(" Read different values than written.\n"); + printf(" At index %d\n", i); TEST_ERROR; } } @@ -839,7 +839,7 @@ test_cmpd_with_bkg(hid_t fid, unsigned chunked, unsigned mwbuf) /* Copy wbuf if the library will be modifying it */ if (mwbuf) - HDmemcpy(s1_wbuf_bak, s1_wbuf, sizeof(s1_t) * DSET_SELECT_DIM); + memcpy(s1_wbuf_bak, s1_wbuf, sizeof(s1_t) * DSET_SELECT_DIM); /* Write s1_wbuf to the dataset with only subset members in ss_tid */ if (H5Dwrite(did, ss_ac_tid, H5S_ALL, H5S_ALL, dxpl, s1_wbuf) < 0) @@ -847,7 +847,7 @@ test_cmpd_with_bkg(hid_t fid, unsigned chunked, unsigned mwbuf) /* Restore wbuf from backup if the library modified it */ if (mwbuf) - HDmemcpy(s1_wbuf, s1_wbuf_bak, sizeof(s1_t) * DSET_SELECT_DIM); + memcpy(s1_wbuf, s1_wbuf_bak, sizeof(s1_t) * DSET_SELECT_DIM); /* Read the whole compound back */ if (H5Dread(did, ss_ac_tid, H5S_ALL, H5S_ALL, dxpl, s1_rbuf) < 0) @@ -858,8 +858,8 @@ test_cmpd_with_bkg(hid_t fid, unsigned chunked, unsigned mwbuf) if (s1_rbuf[i].a != s1_wbuf[i].a || s1_rbuf[i].b != ((4 * i) + 1) || s1_rbuf[i].c != s1_wbuf[i].c || s1_rbuf[i].d != ((4 * i) + 3)) { H5_FAILED(); - HDprintf(" Read different values than written.\n"); - HDprintf(" At index %d\n", i); + printf(" Read different values than written.\n"); + printf(" At index %d\n", i); TEST_ERROR; } } @@ -893,8 +893,8 @@ test_cmpd_with_bkg(hid_t fid, unsigned chunked, unsigned mwbuf) s1_rbuf[i].c != ((4 * i) + DSET_SELECT_DIM + 2) || s1_rbuf[i].d != ((4 * i) + (2 * DSET_SELECT_DIM) + 3)) { H5_FAILED(); - HDprintf(" Read different values than written.\n"); - HDprintf(" At index %d\n", i); + printf(" Read different values than written.\n"); + printf(" At index %d\n", i); TEST_ERROR; } } @@ -925,14 +925,14 @@ test_cmpd_with_bkg(hid_t fid, unsigned chunked, unsigned mwbuf) /* Copy wbuf if the library will be modifying it */ if (mwbuf) - HDmemcpy(s2_wbuf_bak, s2_wbuf, sizeof(s2_t) * DSET_SELECT_DIM); + memcpy(s2_wbuf_bak, s2_wbuf, sizeof(s2_t) * DSET_SELECT_DIM); if (H5Dwrite(did, s2_tid, H5S_ALL, H5S_ALL, dxpl, s2_wbuf) < 0) FAIL_STACK_ERROR; /* Restore wbuf from backup if the library modified it */ if (mwbuf) - HDmemcpy(s2_wbuf, s2_wbuf_bak, sizeof(s2_t) * DSET_SELECT_DIM); + memcpy(s2_wbuf, s2_wbuf_bak, sizeof(s2_t) * DSET_SELECT_DIM); /* Read it back */ if (H5Dread(did, s2_tid, H5S_ALL, H5S_ALL, dxpl, s2_rbuf) < 0) { @@ -944,8 +944,8 @@ test_cmpd_with_bkg(hid_t fid, unsigned chunked, unsigned mwbuf) if (s2_wbuf[i].a != s2_rbuf[i].a || s2_wbuf[i].b != s2_rbuf[i].b || s2_wbuf[i].c != s2_rbuf[i].c || s2_wbuf[i].d != s2_rbuf[i].d) { H5_FAILED(); - HDprintf(" Read different values than written.\n"); - HDprintf(" At index %d\n", i); + printf(" Read different values than written.\n"); + printf(" At index %d\n", i); TEST_ERROR; } } @@ -968,12 +968,12 @@ test_cmpd_with_bkg(hid_t fid, unsigned chunked, unsigned mwbuf) FAIL_STACK_ERROR; /* Release buffers */ - HDfree(s1_wbuf); - HDfree(s1_wbuf_bak); - HDfree(s1_rbuf); - HDfree(s2_wbuf); - HDfree(s2_wbuf_bak); - HDfree(s2_rbuf); + free(s1_wbuf); + free(s1_wbuf_bak); + free(s1_rbuf); + free(s2_wbuf); + free(s2_wbuf_bak); + free(s2_rbuf); PASSED(); @@ -994,17 +994,17 @@ error: H5E_END_TRY; if (s1_wbuf) - HDfree(s1_wbuf); + free(s1_wbuf); if (s1_wbuf_bak) - HDfree(s1_wbuf_bak); + free(s1_wbuf_bak); if (s1_rbuf) - HDfree(s1_rbuf); + free(s1_rbuf); if (s2_wbuf) - HDfree(s2_wbuf); + free(s2_wbuf); if (s2_wbuf_bak) - HDfree(s2_wbuf_bak); + free(s2_wbuf_bak); if (s2_rbuf) - HDfree(s2_rbuf); + free(s2_rbuf); return FAIL; } /* test_cmpd_with_bkg() */ @@ -1116,24 +1116,24 @@ test_multi_dsets_no_bkg(hid_t fid, unsigned chunked, unsigned dtrans, unsigned m buf_size = ndsets * DSET_SELECT_DIM * sizeof(int); /* Allocate buffers for all datasets */ - if (NULL == (total_wbuf = (int *)HDmalloc(buf_size))) + if (NULL == (total_wbuf = (int *)malloc(buf_size))) FAIL_STACK_ERROR; - if (mwbuf && NULL == (total_wbuf_bak = (int *)HDmalloc(buf_size))) + if (mwbuf && NULL == (total_wbuf_bak = (int *)malloc(buf_size))) FAIL_STACK_ERROR; - if (NULL == (total_trans_wbuf = (int *)HDmalloc(buf_size))) + if (NULL == (total_trans_wbuf = (int *)malloc(buf_size))) FAIL_STACK_ERROR; - if (NULL == (total_rbuf = (int *)HDmalloc(buf_size))) + if (NULL == (total_rbuf = (int *)malloc(buf_size))) FAIL_STACK_ERROR; buf_size = ndsets * DSET_SELECT_DIM * sizeof(long); - if (NULL == (total_lwbuf = (long *)HDmalloc(buf_size))) + if (NULL == (total_lwbuf = (long *)malloc(buf_size))) FAIL_STACK_ERROR; - if (mwbuf && NULL == (total_lwbuf_bak = (long *)HDmalloc(buf_size))) + if (mwbuf && NULL == (total_lwbuf_bak = (long *)malloc(buf_size))) FAIL_STACK_ERROR; - if (NULL == (total_trans_lwbuf = (long *)HDmalloc(buf_size))) + if (NULL == (total_trans_lwbuf = (long *)malloc(buf_size))) FAIL_STACK_ERROR; - if (NULL == (total_lrbuf = (long *)HDmalloc(buf_size))) + if (NULL == (total_lrbuf = (long *)malloc(buf_size))) FAIL_STACK_ERROR; /* Initialize buffer indices */ @@ -1161,7 +1161,7 @@ test_multi_dsets_no_bkg(hid_t fid, unsigned chunked, unsigned dtrans, unsigned m /* Copy wbuf if the library will be modifying it */ if (mwbuf) - HDmemcpy(total_wbuf_bak, total_wbuf, ndsets * DSET_SELECT_DIM * sizeof(int)); + memcpy(total_wbuf_bak, total_wbuf, ndsets * DSET_SELECT_DIM * sizeof(int)); /* Write data to the dataset with/without data transform */ if (H5Dwrite_multi(ndsets, dset_dids, mem_tids, mem_sids, file_sids, dxpl, wbufs) < 0) @@ -1169,7 +1169,7 @@ test_multi_dsets_no_bkg(hid_t fid, unsigned chunked, unsigned dtrans, unsigned m /* Restore wbuf from backup if the library modified it */ if (mwbuf) - HDmemcpy(total_wbuf, total_wbuf_bak, ndsets * DSET_SELECT_DIM * sizeof(int)); + memcpy(total_wbuf, total_wbuf_bak, ndsets * DSET_SELECT_DIM * sizeof(int)); /* Read data from the dataset (if dtrans, without data transform set in dxpl) */ if (H5Dread_multi(ndsets, dset_dids, mem_tids, mem_sids, file_sids, ntrans_dxpl, rbufs) < 0) @@ -1180,8 +1180,8 @@ test_multi_dsets_no_bkg(hid_t fid, unsigned chunked, unsigned dtrans, unsigned m for (j = 0; j < DSET_SELECT_DIM; j++) if (rbufi[i][j] != (dtrans ? trans_wbufi[i][j] : wbufi[i][j])) { H5_FAILED(); - HDprintf(" Read different values than written.\n"); - HDprintf(" For dset %d at index %d\n", i, j); + printf(" Read different values than written.\n"); + printf(" For dset %d at index %d\n", i, j); TEST_ERROR; } @@ -1196,8 +1196,8 @@ test_multi_dsets_no_bkg(hid_t fid, unsigned chunked, unsigned dtrans, unsigned m for (j = 0; j < DSET_SELECT_DIM; j++) if (rbufi[i][j] != (2 * trans_wbufi[i][j])) { H5_FAILED(); - HDprintf(" Read different values than written.\n"); - HDprintf(" For dset %d at index %d\n", i, j); + printf(" Read different values than written.\n"); + printf(" For dset %d at index %d\n", i, j); TEST_ERROR; } } @@ -1226,7 +1226,7 @@ test_multi_dsets_no_bkg(hid_t fid, unsigned chunked, unsigned dtrans, unsigned m /* Copy wbuf if the library will be modifying it */ if (mwbuf) - HDmemcpy(total_lwbuf_bak, total_lwbuf, ndsets * DSET_SELECT_DIM * sizeof(long)); + memcpy(total_lwbuf_bak, total_lwbuf, ndsets * DSET_SELECT_DIM * sizeof(long)); /* Write data to the dataset with/without data transform */ if (H5Dwrite_multi(ndsets, dset_dids, mem_tids, mem_sids, file_sids, dxpl, wbufs) < 0) @@ -1234,7 +1234,7 @@ test_multi_dsets_no_bkg(hid_t fid, unsigned chunked, unsigned dtrans, unsigned m /* Restore wbuf from backup if the library modified it */ if (mwbuf) - HDmemcpy(total_lwbuf, total_lwbuf_bak, ndsets * DSET_SELECT_DIM * sizeof(long)); + memcpy(total_lwbuf, total_lwbuf_bak, ndsets * DSET_SELECT_DIM * sizeof(long)); /* Read data from the dataset (if dtrans, with data transform again in dxpl) */ if (H5Dread_multi(ndsets, dset_dids, mem_tids, mem_sids, file_sids, dxpl, rbufs) < 0) @@ -1244,8 +1244,8 @@ test_multi_dsets_no_bkg(hid_t fid, unsigned chunked, unsigned dtrans, unsigned m for (j = 0; j < DSET_SELECT_DIM; j++) { if (lrbufi[i][j] != (dtrans ? (2 * trans_lwbufi[i][j]) : lwbufi[i][j])) { H5_FAILED(); - HDprintf(" Read different values than written.\n"); - HDprintf(" For dset %d at index %d\n", i, j); + printf(" Read different values than written.\n"); + printf(" For dset %d at index %d\n", i, j); TEST_ERROR; } } @@ -1267,14 +1267,14 @@ test_multi_dsets_no_bkg(hid_t fid, unsigned chunked, unsigned dtrans, unsigned m FAIL_STACK_ERROR; } - HDfree(total_wbuf); - HDfree(total_wbuf_bak); - HDfree(total_rbuf); - HDfree(total_trans_wbuf); - HDfree(total_lwbuf); - HDfree(total_lwbuf_bak); - HDfree(total_lrbuf); - HDfree(total_trans_lwbuf); + free(total_wbuf); + free(total_wbuf_bak); + free(total_rbuf); + free(total_trans_wbuf); + free(total_lwbuf); + free(total_lwbuf_bak); + free(total_lrbuf); + free(total_trans_lwbuf); PASSED(); @@ -1293,21 +1293,21 @@ error: H5E_END_TRY; if (total_wbuf) - HDfree(total_wbuf); + free(total_wbuf); if (total_wbuf_bak) - HDfree(total_wbuf_bak); + free(total_wbuf_bak); if (total_trans_wbuf) - HDfree(total_trans_wbuf); + free(total_trans_wbuf); if (total_rbuf) - HDfree(total_rbuf); + free(total_rbuf); if (total_lwbuf) - HDfree(total_lwbuf); + free(total_lwbuf); if (total_lwbuf_bak) - HDfree(total_lwbuf_bak); + free(total_lwbuf_bak); if (total_lrbuf) - HDfree(total_lrbuf); + free(total_lrbuf); if (total_trans_lwbuf) - HDfree(total_lrbuf); + free(total_lrbuf); return FAIL; @@ -1446,18 +1446,18 @@ test_multi_dsets_cmpd_with_bkg(hid_t fid, unsigned chunked, unsigned mwbuf) s2_buf_size = ndsets * DSET_SELECT_DIM * sizeof(s2_t); /* Allocate buffers */ - if (NULL == (total_wbuf = (s1_t *)HDmalloc(buf_size))) + if (NULL == (total_wbuf = (s1_t *)malloc(buf_size))) TEST_ERROR; - if (mwbuf && NULL == (total_wbuf_bak = (s1_t *)HDmalloc(buf_size))) + if (mwbuf && NULL == (total_wbuf_bak = (s1_t *)malloc(buf_size))) TEST_ERROR; - if (NULL == (total_rbuf = (s1_t *)HDmalloc(buf_size))) + if (NULL == (total_rbuf = (s1_t *)malloc(buf_size))) TEST_ERROR; - if (NULL == (s2_total_wbuf = (s2_t *)HDmalloc(s2_buf_size))) + if (NULL == (s2_total_wbuf = (s2_t *)malloc(s2_buf_size))) TEST_ERROR; - if (mwbuf && NULL == (s2_total_wbuf_bak = (s2_t *)HDmalloc(s2_buf_size))) + if (mwbuf && NULL == (s2_total_wbuf_bak = (s2_t *)malloc(s2_buf_size))) TEST_ERROR; - if (NULL == (s2_total_rbuf = (s2_t *)HDmalloc(s2_buf_size))) + if (NULL == (s2_total_rbuf = (s2_t *)malloc(s2_buf_size))) TEST_ERROR; /* Initialize buffer indices */ @@ -1486,14 +1486,14 @@ test_multi_dsets_cmpd_with_bkg(hid_t fid, unsigned chunked, unsigned mwbuf) /* Copy wbuf if the library will be modifying it */ if (mwbuf) - HDmemcpy(total_wbuf_bak, total_wbuf, buf_size); + memcpy(total_wbuf_bak, total_wbuf, buf_size); if (H5Dwrite_multi(ndsets, dset_dids, mem_tids, mem_sids, file_sids, dxpl, wbufs) < 0) TEST_ERROR; /* Restore wbuf from backup if the library modified it */ if (mwbuf) - HDmemcpy(total_wbuf, total_wbuf_bak, buf_size); + memcpy(total_wbuf, total_wbuf_bak, buf_size); if (H5Dread_multi(ndsets, dset_dids, mem_tids, mem_sids, file_sids, dxpl, rbufs) < 0) TEST_ERROR; @@ -1504,8 +1504,8 @@ test_multi_dsets_cmpd_with_bkg(hid_t fid, unsigned chunked, unsigned mwbuf) if (wbufi[i][j].a != rbufi[i][j].a || wbufi[i][j].b != rbufi[i][j].b || wbufi[i][j].c != rbufi[i][j].c || wbufi[i][j].d != rbufi[i][j].d) { H5_FAILED(); - HDprintf(" Read different values than written.\n"); - HDprintf(" For dset %d at index %d\n", i, j); + printf(" Read different values than written.\n"); + printf(" For dset %d at index %d\n", i, j); TEST_ERROR; } } @@ -1545,14 +1545,14 @@ test_multi_dsets_cmpd_with_bkg(hid_t fid, unsigned chunked, unsigned mwbuf) /* Copy wbuf if the library will be modifying it */ if (mwbuf) - HDmemcpy(total_wbuf_bak, total_wbuf, buf_size); + memcpy(total_wbuf_bak, total_wbuf, buf_size); if (H5Dwrite_multi(ndsets, dset_dids, mem_tids, mem_sids, file_sids, dxpl, wbufs) < 0) TEST_ERROR; /* Restore wbuf from backup if the library modified it */ if (mwbuf) - HDmemcpy(total_wbuf, total_wbuf_bak, buf_size); + memcpy(total_wbuf, total_wbuf_bak, buf_size); if (H5Dread_multi(ndsets, dset_dids, mem_tids, mem_sids, file_sids, dxpl, rbufs) < 0) TEST_ERROR; @@ -1564,8 +1564,8 @@ test_multi_dsets_cmpd_with_bkg(hid_t fid, unsigned chunked, unsigned mwbuf) if (wbufi[i][j].a != rbufi[i][j].a || ((4 * (int)j) + 1) != rbufi[i][j].b || wbufi[i][j].c != rbufi[i][j].c || ((4 * (int)j) + 3) != rbufi[i][j].d) { H5_FAILED(); - HDprintf(" Read different values than written.\n"); - HDprintf(" For dset %d at index %d\n", i, j); + printf(" Read different values than written.\n"); + printf(" For dset %d at index %d\n", i, j); TEST_ERROR; } } @@ -1574,8 +1574,8 @@ test_multi_dsets_cmpd_with_bkg(hid_t fid, unsigned chunked, unsigned mwbuf) if ((4 * (int)j) != rbufi[i][j].a || ((4 * (int)j) + 1) != rbufi[i][j].b || ((4 * (int)j) + 2) != rbufi[i][j].c || ((4 * (int)j) + 3) != rbufi[i][j].d) { H5_FAILED(); - HDprintf(" Read different values than written.\n"); - HDprintf(" For dset %d at index %d\n", i, j); + printf(" Read different values than written.\n"); + printf(" For dset %d at index %d\n", i, j); TEST_ERROR; } } @@ -1630,8 +1630,8 @@ test_multi_dsets_cmpd_with_bkg(hid_t fid, unsigned chunked, unsigned mwbuf) if (wbufi[0][j].a != rbufi[0][j].a || ((4 * (int)j) + 1) != rbufi[0][j].b || wbufi[0][j].c != rbufi[0][j].c || ((4 * (int)j) + 3) != rbufi[0][j].d) { H5_FAILED(); - HDprintf(" Read different values than written.\n"); - HDprintf(" For dset0 at index %d\n", j); + printf(" Read different values than written.\n"); + printf(" For dset0 at index %d\n", j); TEST_ERROR; } @@ -1641,8 +1641,8 @@ test_multi_dsets_cmpd_with_bkg(hid_t fid, unsigned chunked, unsigned mwbuf) rbufi[mm][j].b != ((4 * (int)j) + 1) || rbufi[mm][j].c != ((4 * (int)j) + 2) || rbufi[mm][j].d != ((4 * (int)j) + (2 * DSET_SELECT_DIM) + 3)) { H5_FAILED(); - HDprintf(" Read different values than written.\n"); - HDprintf(" For dset1 at index %d\n", j); + printf(" Read different values than written.\n"); + printf(" For dset1 at index %d\n", j); TEST_ERROR; } @@ -1655,8 +1655,8 @@ test_multi_dsets_cmpd_with_bkg(hid_t fid, unsigned chunked, unsigned mwbuf) if (rbufi[i][j].a != (4 * (int)j) || rbufi[i][j].b != ((4 * (int)j) + 1) || rbufi[i][j].c != ((4 * (int)j) + 2) || rbufi[i][j].d != ((4 * (int)j) + 3)) { H5_FAILED(); - HDprintf(" Read different values than written.\n"); - HDprintf(" For dset %d at index %d\n", i, j); + printf(" Read different values than written.\n"); + printf(" For dset %d at index %d\n", i, j); TEST_ERROR; } } @@ -1703,14 +1703,14 @@ test_multi_dsets_cmpd_with_bkg(hid_t fid, unsigned chunked, unsigned mwbuf) /* Copy wbuf if the library will be modifying it */ if (mwbuf) - HDmemcpy(s2_total_wbuf_bak, s2_total_wbuf, s2_buf_size); + memcpy(s2_total_wbuf_bak, s2_total_wbuf, s2_buf_size); if (H5Dwrite_multi(ndsets, dset_dids, mem_tids, mem_sids, file_sids, dxpl, wbufs) < 0) TEST_ERROR; /* Restore wbuf from backup if the library modified it */ if (mwbuf) - HDmemcpy(s2_total_wbuf, s2_total_wbuf_bak, s2_buf_size); + memcpy(s2_total_wbuf, s2_total_wbuf_bak, s2_buf_size); if (H5Dread_multi(ndsets, dset_dids, mem_tids, mem_sids, file_sids, dxpl, rbufs) < 0) TEST_ERROR; @@ -1721,8 +1721,8 @@ test_multi_dsets_cmpd_with_bkg(hid_t fid, unsigned chunked, unsigned mwbuf) if (s2_wbufi[i][j].a != s2_rbufi[i][j].a || s2_wbufi[i][j].b != s2_rbufi[i][j].b || s2_wbufi[i][j].c != s2_rbufi[i][j].c || s2_wbufi[i][j].d != s2_rbufi[i][j].d) { H5_FAILED(); - HDprintf(" Read different values than written.\n"); - HDprintf(" For dset %d at index %d\n", i, j); + printf(" Read different values than written.\n"); + printf(" For dset %d at index %d\n", i, j); TEST_ERROR; } @@ -1740,12 +1740,12 @@ test_multi_dsets_cmpd_with_bkg(hid_t fid, unsigned chunked, unsigned mwbuf) FAIL_STACK_ERROR; } - HDfree(total_wbuf); - HDfree(total_wbuf_bak); - HDfree(total_rbuf); - HDfree(s2_total_wbuf); - HDfree(s2_total_wbuf_bak); - HDfree(s2_total_rbuf); + free(total_wbuf); + free(total_wbuf_bak); + free(total_rbuf); + free(s2_total_wbuf); + free(s2_total_wbuf_bak); + free(s2_total_rbuf); PASSED(); @@ -1763,17 +1763,17 @@ error: H5E_END_TRY; if (total_wbuf) - HDfree(total_wbuf); + free(total_wbuf); if (total_wbuf_bak) - HDfree(total_wbuf_bak); + free(total_wbuf_bak); if (total_rbuf) - HDfree(total_rbuf); + free(total_rbuf); if (s2_total_wbuf) - HDfree(s2_total_wbuf); + free(s2_total_wbuf); if (s2_total_wbuf_bak) - HDfree(s2_total_wbuf_bak); + free(s2_total_wbuf_bak); if (s2_total_rbuf) - HDfree(s2_total_rbuf); + free(s2_total_rbuf); return FAIL; @@ -1882,11 +1882,11 @@ test_multi_dsets_size_change_no_bkg(hid_t fid, unsigned chunked, unsigned mwbuf) buf_size = ndsets * ss * DSET_SELECT_DIM; /* Allocate buffers for all datasets */ - if (NULL == (total_wbuf = (uint8_t *)HDmalloc(buf_size))) + if (NULL == (total_wbuf = (uint8_t *)malloc(buf_size))) FAIL_STACK_ERROR; - if (NULL == (total_wbuf_bak = (uint8_t *)HDmalloc(buf_size))) + if (NULL == (total_wbuf_bak = (uint8_t *)malloc(buf_size))) FAIL_STACK_ERROR; - if (NULL == (total_rbuf = (uint8_t *)HDmalloc(buf_size))) + if (NULL == (total_rbuf = (uint8_t *)malloc(buf_size))) FAIL_STACK_ERROR; /* Initialize buffer indices */ @@ -1913,7 +1913,7 @@ test_multi_dsets_size_change_no_bkg(hid_t fid, unsigned chunked, unsigned mwbuf) /* Copy wbuf if the library will be modifying it */ if (mwbuf) - HDmemcpy(total_wbuf_bak, total_wbuf, buf_size); + memcpy(total_wbuf_bak, total_wbuf, buf_size); /* Write data to the dataset */ if (H5Dwrite_multi(ndsets, dset_dids, mem_tids, mem_sids, file_sids, dxpl, wbufs) < 0) @@ -1921,7 +1921,7 @@ test_multi_dsets_size_change_no_bkg(hid_t fid, unsigned chunked, unsigned mwbuf) /* Restore wbuf from backup if the library modified it */ if (mwbuf) - HDmemcpy(total_wbuf, total_wbuf_bak, buf_size); + memcpy(total_wbuf, total_wbuf_bak, buf_size); /* Read data from the dataset */ if (H5Dread_multi(ndsets, dset_dids, mem_tids, mem_sids, file_sids, dxpl, rbufs) < 0) @@ -1937,8 +1937,8 @@ test_multi_dsets_size_change_no_bkg(hid_t fid, unsigned chunked, unsigned mwbuf) rbufi[i][(int)ss * j + 2] != wbufi[i][(int)ss * j + 2] || rbufi[i][(int)ss * j + 3] != wbufi[i][(int)ss * j + 3]) { H5_FAILED(); - HDprintf(" Read different values than written.\n"); - HDprintf(" For dset %d at index %d\n", i, j); + printf(" Read different values than written.\n"); + printf(" For dset %d at index %d\n", i, j); TEST_ERROR; } } @@ -1949,11 +1949,11 @@ test_multi_dsets_size_change_no_bkg(hid_t fid, unsigned chunked, unsigned mwbuf) buf_size = ndsets * (ss * DSET_SELECT_DIM); /* Allocate buffers for all datasets */ - if (NULL == (total_lwbuf = (uint8_t *)HDmalloc(buf_size))) + if (NULL == (total_lwbuf = (uint8_t *)malloc(buf_size))) FAIL_STACK_ERROR; - if (NULL == (total_lwbuf_bak = (uint8_t *)HDmalloc(buf_size))) + if (NULL == (total_lwbuf_bak = (uint8_t *)malloc(buf_size))) FAIL_STACK_ERROR; - if (NULL == (total_lrbuf = (uint8_t *)HDmalloc(buf_size))) + if (NULL == (total_lrbuf = (uint8_t *)malloc(buf_size))) FAIL_STACK_ERROR; /* Initialize buffer indices */ @@ -1984,7 +1984,7 @@ test_multi_dsets_size_change_no_bkg(hid_t fid, unsigned chunked, unsigned mwbuf) /* Copy wbuf if the library will be modifying it */ if (mwbuf) - HDmemcpy(total_lwbuf_bak, total_lwbuf, buf_size); + memcpy(total_lwbuf_bak, total_lwbuf, buf_size); /* Write data to the dataset */ if (H5Dwrite_multi(ndsets, dset_dids, mem_tids, mem_sids, file_sids, dxpl, wbufs) < 0) @@ -1992,7 +1992,7 @@ test_multi_dsets_size_change_no_bkg(hid_t fid, unsigned chunked, unsigned mwbuf) /* Restore wbuf from backup if the library modified it */ if (mwbuf) - HDmemcpy(total_lwbuf, total_lwbuf_bak, buf_size); + memcpy(total_lwbuf, total_lwbuf_bak, buf_size); /* Read data from the dataset */ if (H5Dread_multi(ndsets, dset_dids, mem_tids, mem_sids, file_sids, dxpl, rbufs) < 0) @@ -2012,8 +2012,8 @@ test_multi_dsets_size_change_no_bkg(hid_t fid, unsigned chunked, unsigned mwbuf) lrbufi[i][(int)ss * j + 6] != lwbufi[i][(int)ss * j + 6] || lrbufi[i][(int)ss * j + 7] != lwbufi[i][(int)ss * j + 7]) { H5_FAILED(); - HDprintf(" Read different values than written.\n"); - HDprintf(" For dset %d at index %d\n", i, j); + printf(" Read different values than written.\n"); + printf(" For dset %d at index %d\n", i, j); TEST_ERROR; } } @@ -2024,11 +2024,11 @@ test_multi_dsets_size_change_no_bkg(hid_t fid, unsigned chunked, unsigned mwbuf) buf_size = ndsets * (ss * DSET_SELECT_DIM); /* Allocate buffers for all datasets */ - if (NULL == (total_swbuf = (uint8_t *)HDmalloc(buf_size))) + if (NULL == (total_swbuf = (uint8_t *)malloc(buf_size))) FAIL_STACK_ERROR; - if (NULL == (total_swbuf_bak = (uint8_t *)HDmalloc(buf_size))) + if (NULL == (total_swbuf_bak = (uint8_t *)malloc(buf_size))) FAIL_STACK_ERROR; - if (NULL == (total_srbuf = (uint8_t *)HDmalloc(buf_size))) + if (NULL == (total_srbuf = (uint8_t *)malloc(buf_size))) FAIL_STACK_ERROR; /* Initialize buffer indices */ @@ -2053,7 +2053,7 @@ test_multi_dsets_size_change_no_bkg(hid_t fid, unsigned chunked, unsigned mwbuf) /* Copy wbuf if the library will be modifying it */ if (mwbuf) - HDmemcpy(total_swbuf_bak, total_swbuf, buf_size); + memcpy(total_swbuf_bak, total_swbuf, buf_size); /* Write data to the dataset */ if (H5Dwrite_multi(ndsets, dset_dids, mem_tids, mem_sids, file_sids, dxpl, wbufs) < 0) @@ -2061,7 +2061,7 @@ test_multi_dsets_size_change_no_bkg(hid_t fid, unsigned chunked, unsigned mwbuf) /* Restore wbuf from backup if the library modified it */ if (mwbuf) - HDmemcpy(total_swbuf, total_swbuf_bak, buf_size); + memcpy(total_swbuf, total_swbuf_bak, buf_size); /* Read data from the dataset */ if (H5Dread_multi(ndsets, dset_dids, mem_tids, mem_sids, file_sids, dxpl, rbufs) < 0) @@ -2074,8 +2074,8 @@ test_multi_dsets_size_change_no_bkg(hid_t fid, unsigned chunked, unsigned mwbuf) if (srbufi[i][(int)ss * j + 0] != swbufi[i][(int)ss * j + 0] || srbufi[i][(int)ss * j + 1] != swbufi[i][(int)ss * j + 1]) { H5_FAILED(); - HDprintf(" Read different values than written.\n"); - HDprintf(" For dset %d at index %d\n", i, j); + printf(" Read different values than written.\n"); + printf(" For dset %d at index %d\n", i, j); TEST_ERROR; } @@ -2093,15 +2093,15 @@ test_multi_dsets_size_change_no_bkg(hid_t fid, unsigned chunked, unsigned mwbuf) FAIL_STACK_ERROR; } - HDfree(total_wbuf); - HDfree(total_wbuf_bak); - HDfree(total_rbuf); - HDfree(total_lwbuf); - HDfree(total_lwbuf_bak); - HDfree(total_lrbuf); - HDfree(total_swbuf); - HDfree(total_swbuf_bak); - HDfree(total_srbuf); + free(total_wbuf); + free(total_wbuf_bak); + free(total_rbuf); + free(total_lwbuf); + free(total_lwbuf_bak); + free(total_lrbuf); + free(total_swbuf); + free(total_swbuf_bak); + free(total_srbuf); PASSED(); @@ -2119,23 +2119,23 @@ error: H5E_END_TRY; if (total_wbuf) - HDfree(total_wbuf); + free(total_wbuf); if (total_wbuf_bak) - HDfree(total_wbuf_bak); + free(total_wbuf_bak); if (total_rbuf) - HDfree(total_rbuf); + free(total_rbuf); if (total_lwbuf) - HDfree(total_lwbuf); + free(total_lwbuf); if (total_lwbuf_bak) - HDfree(total_lwbuf_bak); + free(total_lwbuf_bak); if (total_lrbuf) - HDfree(total_lrbuf); + free(total_lrbuf); if (total_swbuf) - HDfree(total_swbuf); + free(total_swbuf); if (total_swbuf_bak) - HDfree(total_swbuf_bak); + free(total_swbuf_bak); if (total_srbuf) - HDfree(total_srbuf); + free(total_srbuf); return FAIL; @@ -2363,49 +2363,49 @@ test_multi_dsets_all(int niter, hid_t fid, unsigned chunked, unsigned mwbuf) /* DSET_WITH_NO_CONV */ buf_size = ndsets * DSET_SELECT_DIM * sizeof(int); - if (NULL == (total_wbuf1 = (int *)HDmalloc(buf_size))) + if (NULL == (total_wbuf1 = (int *)malloc(buf_size))) FAIL_STACK_ERROR; - if (mwbuf && NULL == (total_wbuf1_bak = (int *)HDmalloc(buf_size))) + if (mwbuf && NULL == (total_wbuf1_bak = (int *)malloc(buf_size))) FAIL_STACK_ERROR; - if (NULL == (total_rbuf1 = (int *)HDmalloc(buf_size))) + if (NULL == (total_rbuf1 = (int *)malloc(buf_size))) FAIL_STACK_ERROR; /* DSET_WITH_CONV_AND_NO_BKG */ buf_size = ndsets * DSET_SELECT_DIM * sizeof(unsigned long); - if (NULL == (ul_total_wbuf2 = (unsigned long *)HDmalloc(buf_size))) + if (NULL == (ul_total_wbuf2 = (unsigned long *)malloc(buf_size))) FAIL_STACK_ERROR; - if (mwbuf && NULL == (ul_total_wbuf2_bak = (unsigned long *)HDmalloc(buf_size))) + if (mwbuf && NULL == (ul_total_wbuf2_bak = (unsigned long *)malloc(buf_size))) FAIL_STACK_ERROR; buf_size = ndsets * DSET_SELECT_DIM * sizeof(long); - if (NULL == (l_total_rbuf2 = (long *)HDmalloc(buf_size))) + if (NULL == (l_total_rbuf2 = (long *)malloc(buf_size))) FAIL_STACK_ERROR; buf_size = ndsets * DSET_SELECT_DIM * sizeof(long); - if (NULL == (l_total_wbuf2 = (long *)HDmalloc(buf_size))) + if (NULL == (l_total_wbuf2 = (long *)malloc(buf_size))) FAIL_STACK_ERROR; - if (mwbuf && NULL == (l_total_wbuf2_bak = (long *)HDmalloc(buf_size))) + if (mwbuf && NULL == (l_total_wbuf2_bak = (long *)malloc(buf_size))) FAIL_STACK_ERROR; buf_size = ndsets * DSET_SELECT_DIM * sizeof(short); - if (NULL == (s_total_rbuf2 = (short *)HDmalloc(buf_size))) + if (NULL == (s_total_rbuf2 = (short *)malloc(buf_size))) FAIL_STACK_ERROR; /* DSET_WITH_CONV_AND_BKG */ buf_size = ndsets * DSET_SELECT_DIM * sizeof(s1_t); - if (NULL == (s1_total_wbuf3 = (s1_t *)HDmalloc(buf_size))) + if (NULL == (s1_total_wbuf3 = (s1_t *)malloc(buf_size))) FAIL_STACK_ERROR; - if (mwbuf && NULL == (s1_total_wbuf3_bak = (s1_t *)HDmalloc(buf_size))) + if (mwbuf && NULL == (s1_total_wbuf3_bak = (s1_t *)malloc(buf_size))) FAIL_STACK_ERROR; buf_size = ndsets * DSET_SELECT_DIM * sizeof(s3_t); - if (NULL == (s3_total_rbuf3 = (s3_t *)HDmalloc(buf_size))) + if (NULL == (s3_total_rbuf3 = (s3_t *)malloc(buf_size))) FAIL_STACK_ERROR; buf_size = ndsets * DSET_SELECT_DIM * sizeof(s4_t); - if (NULL == (s4_total_wbuf3 = (s4_t *)HDmalloc(buf_size))) + if (NULL == (s4_total_wbuf3 = (s4_t *)malloc(buf_size))) FAIL_STACK_ERROR; - if (mwbuf && NULL == (s4_total_wbuf3_bak = (s4_t *)HDmalloc(buf_size))) + if (mwbuf && NULL == (s4_total_wbuf3_bak = (s4_t *)malloc(buf_size))) FAIL_STACK_ERROR; buf_size = ndsets * DSET_SELECT_DIM * sizeof(s1_t); - if (NULL == (s1_total_rbuf3 = (s1_t *)HDmalloc(buf_size))) + if (NULL == (s1_total_rbuf3 = (s1_t *)malloc(buf_size))) FAIL_STACK_ERROR; /* Test with s settings for ndsets */ @@ -2517,12 +2517,11 @@ test_multi_dsets_all(int niter, hid_t fid, unsigned chunked, unsigned mwbuf) /* Copy wbufs if the library will be modifying them */ if (mwbuf) { - HDmemcpy(total_wbuf1_bak, total_wbuf1, ndsets * DSET_SELECT_DIM * sizeof(int)); - HDmemcpy(ul_total_wbuf2_bak, ul_total_wbuf2, - ndsets * DSET_SELECT_DIM * sizeof(unsigned long)); - HDmemcpy(l_total_wbuf2_bak, l_total_wbuf2, ndsets * DSET_SELECT_DIM * sizeof(long)); - HDmemcpy(s1_total_wbuf3_bak, s1_total_wbuf3, ndsets * DSET_SELECT_DIM * sizeof(s1_t)); - HDmemcpy(s4_total_wbuf3_bak, s4_total_wbuf3, ndsets * DSET_SELECT_DIM * sizeof(s4_t)); + memcpy(total_wbuf1_bak, total_wbuf1, ndsets * DSET_SELECT_DIM * sizeof(int)); + memcpy(ul_total_wbuf2_bak, ul_total_wbuf2, ndsets * DSET_SELECT_DIM * sizeof(unsigned long)); + memcpy(l_total_wbuf2_bak, l_total_wbuf2, ndsets * DSET_SELECT_DIM * sizeof(long)); + memcpy(s1_total_wbuf3_bak, s1_total_wbuf3, ndsets * DSET_SELECT_DIM * sizeof(s1_t)); + memcpy(s4_total_wbuf3_bak, s4_total_wbuf3, ndsets * DSET_SELECT_DIM * sizeof(s4_t)); } if (H5Dwrite_multi(ndsets, dset_dids, mem_tids, mem_sids, file_sids, dxpl, wbufs) < 0) @@ -2530,12 +2529,11 @@ test_multi_dsets_all(int niter, hid_t fid, unsigned chunked, unsigned mwbuf) /* Restore wbufs from backup if the library modified them */ if (mwbuf) { - HDmemcpy(total_wbuf1, total_wbuf1_bak, ndsets * DSET_SELECT_DIM * sizeof(int)); - HDmemcpy(ul_total_wbuf2, ul_total_wbuf2_bak, - ndsets * DSET_SELECT_DIM * sizeof(unsigned long)); - HDmemcpy(l_total_wbuf2, l_total_wbuf2_bak, ndsets * DSET_SELECT_DIM * sizeof(long)); - HDmemcpy(s1_total_wbuf3, s1_total_wbuf3_bak, ndsets * DSET_SELECT_DIM * sizeof(s1_t)); - HDmemcpy(s4_total_wbuf3, s4_total_wbuf3_bak, ndsets * DSET_SELECT_DIM * sizeof(s4_t)); + memcpy(total_wbuf1, total_wbuf1_bak, ndsets * DSET_SELECT_DIM * sizeof(int)); + memcpy(ul_total_wbuf2, ul_total_wbuf2_bak, ndsets * DSET_SELECT_DIM * sizeof(unsigned long)); + memcpy(l_total_wbuf2, l_total_wbuf2_bak, ndsets * DSET_SELECT_DIM * sizeof(long)); + memcpy(s1_total_wbuf3, s1_total_wbuf3_bak, ndsets * DSET_SELECT_DIM * sizeof(s1_t)); + memcpy(s4_total_wbuf3, s4_total_wbuf3_bak, ndsets * DSET_SELECT_DIM * sizeof(s4_t)); } if (H5Dread_multi(ndsets, dset_dids, r_mem_tids, mem_sids, file_sids, dxpl, rbufs) < 0) @@ -2550,8 +2548,8 @@ test_multi_dsets_all(int niter, hid_t fid, unsigned chunked, unsigned mwbuf) for (j = 0; j < DSET_SELECT_DIM; j++) if (rbufi1[i][j] != wbufi1[i][j]) { H5_FAILED(); - HDprintf(" Read different values than written.\n"); - HDprintf(" For dset %d at index %d\n", i, j); + printf(" Read different values than written.\n"); + printf(" For dset %d at index %d\n", i, j); TEST_ERROR; } @@ -2562,8 +2560,8 @@ test_multi_dsets_all(int niter, hid_t fid, unsigned chunked, unsigned mwbuf) for (j = 0; j < DSET_SELECT_DIM; j++) if (l_rbufi2[i][j] != LONG_MAX) { H5_FAILED(); - HDprintf(" Read different values than written.\n"); - HDprintf(" For dset %d at index %d\n", i, j); + printf(" Read different values than written.\n"); + printf(" For dset %d at index %d\n", i, j); TEST_ERROR; } } @@ -2571,8 +2569,8 @@ test_multi_dsets_all(int niter, hid_t fid, unsigned chunked, unsigned mwbuf) for (j = 0; j < DSET_SELECT_DIM; j++) if (s_rbufi2[i][j] != SHRT_MAX) { H5_FAILED(); - HDprintf(" Read different values than written.\n"); - HDprintf(" For dset %d at index %d\n", i, j); + printf(" Read different values than written.\n"); + printf(" For dset %d at index %d\n", i, j); } } @@ -2586,8 +2584,8 @@ test_multi_dsets_all(int niter, hid_t fid, unsigned chunked, unsigned mwbuf) s3_rbufi3[i][j].c != s1_wbufi3[i][j].c || s3_rbufi3[i][j].d != s1_wbufi3[i][j].d) { H5_FAILED(); - HDprintf(" Read different values than written.\n"); - HDprintf(" For dset %d at index %d\n", i, j); + printf(" Read different values than written.\n"); + printf(" For dset %d at index %d\n", i, j); } } else if (s == SETTING_B) { @@ -2597,8 +2595,8 @@ test_multi_dsets_all(int niter, hid_t fid, unsigned chunked, unsigned mwbuf) s1_rbufi3[i][j].c != s1_wbufi3[i][j].c || s1_rbufi3[i][j].d != (DSET_SELECT_DIM + j)) { H5_FAILED(); - HDprintf(" Read different values than written.\n"); - HDprintf(" For dset %d at index %d\n", i, j); + printf(" Read different values than written.\n"); + printf(" For dset %d at index %d\n", i, j); } } @@ -2639,37 +2637,37 @@ test_multi_dsets_all(int niter, hid_t fid, unsigned chunked, unsigned mwbuf) } /* Freeing */ - HDfree(total_wbuf1); + free(total_wbuf1); total_wbuf1 = NULL; - HDfree(total_wbuf1_bak); + free(total_wbuf1_bak); total_wbuf1_bak = NULL; - HDfree(total_rbuf1); + free(total_rbuf1); total_rbuf1 = NULL; - HDfree(ul_total_wbuf2); + free(ul_total_wbuf2); ul_total_wbuf2 = NULL; - HDfree(ul_total_wbuf2_bak); + free(ul_total_wbuf2_bak); ul_total_wbuf2_bak = NULL; - HDfree(l_total_rbuf2); + free(l_total_rbuf2); l_total_rbuf2 = NULL; - HDfree(l_total_wbuf2); + free(l_total_wbuf2); l_total_wbuf2 = NULL; - HDfree(l_total_wbuf2_bak); + free(l_total_wbuf2_bak); l_total_wbuf2_bak = NULL; - HDfree(s_total_rbuf2); + free(s_total_rbuf2); s_total_rbuf2 = NULL; - HDfree(s1_total_wbuf3); + free(s1_total_wbuf3); s1_total_wbuf3 = NULL; - HDfree(s1_total_wbuf3_bak); + free(s1_total_wbuf3_bak); s1_total_wbuf3_bak = NULL; - HDfree(s3_total_rbuf3); + free(s3_total_rbuf3); s3_total_rbuf3 = NULL; - HDfree(s4_total_wbuf3); + free(s4_total_wbuf3); s4_total_wbuf3 = NULL; - HDfree(s4_total_wbuf3_bak); + free(s4_total_wbuf3_bak); s4_total_wbuf3_bak = NULL; - HDfree(s1_total_rbuf3); + free(s1_total_rbuf3); s1_total_rbuf3 = NULL; } /* end for n niter */ @@ -2693,37 +2691,37 @@ error: H5E_END_TRY; if (total_wbuf1) - HDfree(total_wbuf1); + free(total_wbuf1); if (total_wbuf1_bak) - HDfree(total_wbuf1_bak); + free(total_wbuf1_bak); if (total_rbuf1) - HDfree(total_rbuf1); + free(total_rbuf1); if (ul_total_wbuf2) - HDfree(ul_total_wbuf2); + free(ul_total_wbuf2); if (ul_total_wbuf2_bak) - HDfree(ul_total_wbuf2_bak); + free(ul_total_wbuf2_bak); if (l_total_rbuf2) - HDfree(l_total_rbuf2); + free(l_total_rbuf2); if (l_total_wbuf2) - HDfree(l_total_wbuf2); + free(l_total_wbuf2); if (l_total_wbuf2_bak) - HDfree(l_total_wbuf2_bak); + free(l_total_wbuf2_bak); if (s_total_rbuf2) - HDfree(s_total_rbuf2); + free(s_total_rbuf2); if (s1_total_wbuf3) - HDfree(s1_total_wbuf3); + free(s1_total_wbuf3); if (s1_total_wbuf3_bak) - HDfree(s1_total_wbuf3_bak); + free(s1_total_wbuf3_bak); if (s3_total_rbuf3) - HDfree(s3_total_rbuf3); + free(s3_total_rbuf3); if (s4_total_wbuf3) - HDfree(s4_total_wbuf3); + free(s4_total_wbuf3); if (s4_total_wbuf3_bak) - HDfree(s4_total_wbuf3_bak); + free(s4_total_wbuf3_bak); if (s1_total_rbuf3) - HDfree(s1_total_rbuf3); + free(s1_total_rbuf3); return FAIL; @@ -2745,7 +2743,7 @@ test_set_get_select_io_mode(hid_t fid) long wbuf[DSET_SELECT_DIM]; H5D_selection_io_mode_t selection_io_mode; - HDprintf("\n"); + printf("\n"); TESTING("H5Pget/set_selection_io_mode()"); if ((dxpl = H5Pcreate(H5P_DATASET_XFER)) < 0) @@ -3069,7 +3067,7 @@ test_get_no_selection_io_cause(const char *filename, hid_t fapl) int errs = 0; - HDprintf("\n"); + printf("\n"); TESTING("H5Pget_no_selection_io_cause()"); errs += test_no_selection_io_cause_mode(filename, fapl, TEST_DISABLE_BY_API); @@ -3088,7 +3086,7 @@ test_get_no_selection_io_cause(const char *filename, hid_t fapl) #endif if (errs) { - HDprintf(" FAILED\n"); + printf(" FAILED\n"); return FAIL; } else { @@ -3265,16 +3263,16 @@ main(void) goto error; printf("\n===================================\n"); - HDprintf("All selection I/O dataset tests passed.\n"); + printf("All selection I/O dataset tests passed.\n"); printf("===================================\n"); h5_cleanup(FILENAME, fapl); - HDexit(EXIT_SUCCESS); + exit(EXIT_SUCCESS); error: nerrors = MAX(1, nerrors); - HDprintf("***** %d SELECTION I/O DATASET TEST%s FAILED! *****\n", nerrors, 1 == nerrors ? "" : "S"); - HDexit(EXIT_FAILURE); + printf("***** %d SELECTION I/O DATASET TEST%s FAILED! *****\n", nerrors, 1 == nerrors ? "" : "S"); + exit(EXIT_FAILURE); } /* end main() */ diff --git a/test/set_extent.c b/test/set_extent.c index f3281d0..910f07c 100644 --- a/test/set_extent.c +++ b/test/set_extent.c @@ -41,12 +41,12 @@ const char *FILENAME[] = {"set_extent1", "set_extent2", "set_extent3", "set_exte #define FILL_VALUE (-1) #define DO_RANKS_PRINT_CONFIG(TEST) \ { \ - HDprintf(" Config:\n"); \ - HDprintf(" Test: %s\n", TEST); \ - HDprintf(" Compression: %s\n", (config & CONFIG_COMPRESS ? "yes" : "no")); \ - HDprintf(" Fill value: %s\n", (do_fillvalue ? "yes" : "no")); \ - HDprintf(" Early allocation: %s\n", (config & CONFIG_EARLY_ALLOC ? "yes" : "no")); \ - HDprintf(" Edge chunk filters: %s\n", (config & CONFIG_UNFILT_EDGE ? "disabled" : "enabled")); \ + printf(" Config:\n"); \ + printf(" Test: %s\n", TEST); \ + printf(" Compression: %s\n", (config & CONFIG_COMPRESS ? "yes" : "no")); \ + printf(" Fill value: %s\n", (do_fillvalue ? "yes" : "no")); \ + printf(" Early allocation: %s\n", (config & CONFIG_EARLY_ALLOC ? "yes" : "no")); \ + printf(" Edge chunk filters: %s\n", (config & CONFIG_UNFILT_EDGE ? "disabled" : "enabled")); \ } /* end DO_RANKS_PRINT_CONFIG */ #define RANK1 1 @@ -152,9 +152,9 @@ main(void) for (chunk_cache = FALSE; chunk_cache <= TRUE; chunk_cache++) { /* Output message about the type of format */ if (new_format) - HDprintf("Testing with new file format"); + printf("Testing with new file format"); else - HDprintf("Testing with old file format"); + printf("Testing with old file format"); /* Set the FAPL for the chunk cache settings */ if (chunk_cache) { @@ -211,7 +211,7 @@ main(void) error: nerrors = MAX(1, nerrors); - HDprintf("***** %d H5Dset_extent TEST%s FAILED! *****\n", nerrors, 1 == nerrors ? "" : "S"); + printf("***** %d H5Dset_extent TEST%s FAILED! *****\n", nerrors, 1 == nerrors ? "" : "S"); return 1; } @@ -285,22 +285,22 @@ do_ranks(hid_t fapl, hbool_t new_format) if (test_rank1(fapl, dcpl, do_fillvalue, disable_edge_filters, FALSE) < 0) { DO_RANKS_PRINT_CONFIG("Rank 1") - HDprintf(" Fill time: %s\n", (ifset ? "H5D_FILL_TIME_IFSET" : "H5D_FILL_TIME_ALLOC")); + printf(" Fill time: %s\n", (ifset ? "H5D_FILL_TIME_IFSET" : "H5D_FILL_TIME_ALLOC")); goto error; } /* end if */ if (test_rank2(fapl, dcpl, do_fillvalue, disable_edge_filters, FALSE) < 0) { DO_RANKS_PRINT_CONFIG("Rank 2") - HDprintf(" Fill time: %s\n", (ifset ? "H5D_FILL_TIME_IFSET" : "H5D_FILL_TIME_ALLOC")); + printf(" Fill time: %s\n", (ifset ? "H5D_FILL_TIME_IFSET" : "H5D_FILL_TIME_ALLOC")); goto error; } /* end if */ if (test_rank3(fapl, dcpl, do_fillvalue, disable_edge_filters, FALSE) < 0) { DO_RANKS_PRINT_CONFIG("Rank 3") - HDprintf(" Fill time: %s\n", (ifset ? "H5D_FILL_TIME_IFSET" : "H5D_FILL_TIME_ALLOC")); + printf(" Fill time: %s\n", (ifset ? "H5D_FILL_TIME_IFSET" : "H5D_FILL_TIME_ALLOC")); goto error; } /* end if */ if (test_rank2(fapl, dcpl, do_fillvalue, disable_edge_filters, TRUE) < 0) { DO_RANKS_PRINT_CONFIG("Rank 2 with non-default indexed storage B-tree") - HDprintf(" Fill time: %s\n", (ifset ? "H5D_FILL_TIME_IFSET" : "H5D_FILL_TIME_ALLOC")); + printf(" Fill time: %s\n", (ifset ? "H5D_FILL_TIME_IFSET" : "H5D_FILL_TIME_ALLOC")); goto error; } /* end if */ } /* end for */ @@ -340,9 +340,9 @@ do_ranks(hid_t fapl, hbool_t new_format) /* Standard test */ if (test_random_rank4(fapl, dcpl, do_fillvalue, disable_edge_filters, FALSE, index_type) < 0) { DO_RANKS_PRINT_CONFIG("Randomized rank 4") - HDprintf(" Index: %s\n", index_type == RANK4_INDEX_BTREE - ? "btree" - : (index_type == RANK4_INDEX_FARRAY ? "farray" : "earray")); + printf(" Index: %s\n", index_type == RANK4_INDEX_BTREE + ? "btree" + : (index_type == RANK4_INDEX_FARRAY ? "farray" : "earray")); goto error; } /* end if */ @@ -351,10 +351,9 @@ do_ranks(hid_t fapl, hbool_t new_format) if (test_random_rank4_vl(fapl, dcpl, do_fillvalue, disable_edge_filters, FALSE, index_type) < 0) { DO_RANKS_PRINT_CONFIG("Randomized rank 4 variable length") - HDprintf(" Index: %s\n", - index_type == RANK4_INDEX_BTREE - ? "btree" - : (index_type == RANK4_INDEX_FARRAY ? "farray" : "earray")); + printf(" Index: %s\n", index_type == RANK4_INDEX_BTREE + ? "btree" + : (index_type == RANK4_INDEX_FARRAY ? "farray" : "earray")); goto error; } /* end if */ } @@ -363,10 +362,9 @@ do_ranks(hid_t fapl, hbool_t new_format) if (!(config & CONFIG_EARLY_ALLOC)) { if (test_random_rank4(fapl, dcpl, do_fillvalue, disable_edge_filters, TRUE, index_type) < 0) { DO_RANKS_PRINT_CONFIG("Randomized rank 4 with sparse allocation") - HDprintf(" Index: %s\n", - index_type == RANK4_INDEX_BTREE - ? "btree" - : (index_type == RANK4_INDEX_FARRAY ? "farray" : "earray")); + printf(" Index: %s\n", index_type == RANK4_INDEX_BTREE + ? "btree" + : (index_type == RANK4_INDEX_FARRAY ? "farray" : "earray")); goto error; } /* end if */ @@ -374,10 +372,10 @@ do_ranks(hid_t fapl, hbool_t new_format) if (test_random_rank4_vl(fapl, dcpl, do_fillvalue, disable_edge_filters, TRUE, index_type) < 0) { DO_RANKS_PRINT_CONFIG("Randomized rank 4 variable length with sparse allocation") - HDprintf(" Index: %s\n", - index_type == RANK4_INDEX_BTREE - ? "btree" - : (index_type == RANK4_INDEX_FARRAY ? "farray" : "earray")); + printf(" Index: %s\n", + index_type == RANK4_INDEX_BTREE + ? "btree" + : (index_type == RANK4_INDEX_FARRAY ? "farray" : "earray")); goto error; } /* end if */ } @@ -545,10 +543,10 @@ test_rank1(hid_t fapl, hid_t dcpl, hbool_t do_fill_value, hbool_t disable_edge_f TEST_ERROR; #if defined(H5_SET_EXTENT_DEBUG) - HDprintf("\n buf_o: "); + printf("\n buf_o: "); for (i = 0; i < (int)dims_o[0]; i++) - HDprintf("%d ", buf_o[i]); - HDprintf("\n"); + printf("%d ", buf_o[i]); + printf("\n"); #endif if (H5Sclose(sid) < 0) @@ -584,18 +582,18 @@ test_rank1(hid_t fapl, hid_t dcpl, hbool_t do_fill_value, hbool_t disable_edge_f TEST_ERROR; #if defined(H5_SET_EXTENT_DEBUG) - HDprintf("\n buf_e: "); + printf("\n buf_e: "); for (i = 0; i < (int)dims_r[0]; i++) - HDprintf("%d ", buf_e[i]); - HDprintf("\n"); + printf("%d ", buf_e[i]); + printf("\n"); #endif /* compare the read array with the expanded array */ for (i = 0; i < (int)dims_r[0]; i++) if (i >= DIM0) { if (buf_e[i] != comp_value) { - HDprintf("buf_e[%d] = %d\n", i, buf_e[i]); - HDprintf("expected = %d\n", comp_value); + printf("buf_e[%d] = %d\n", i, buf_e[i]); + printf("expected = %d\n", comp_value); TEST_ERROR; } /* end if */ } /* end if */ @@ -653,17 +651,17 @@ test_rank1(hid_t fapl, hid_t dcpl, hbool_t do_fill_value, hbool_t disable_edge_f TEST_ERROR; #if defined(H5_SET_EXTENT_DEBUG) - HDprintf("\n dims_r: "); + printf("\n dims_r: "); for (i = 0; i < (int)dims_r[0]; i++) - HDprintf("%d ", buf_s[i]); - HDprintf("\n"); + printf("%d ", buf_s[i]); + printf("\n"); #endif /* compare the read array with the shrunk array */ for (i = 0; i < (int)dims_r[0]; i++) if (buf_s[i] != buf_o[i]) { - HDprintf("buf_s[%d] = %d\n", i, buf_s[i]); - HDprintf("buf_o[%d] = %d\n", i, buf_o[i]); + printf("buf_s[%d] = %d\n", i, buf_s[i]); + printf("buf_o[%d] = %d\n", i, buf_o[i]); TEST_ERROR; } /* end if */ @@ -697,18 +695,18 @@ test_rank1(hid_t fapl, hid_t dcpl, hbool_t do_fill_value, hbool_t disable_edge_f TEST_ERROR; #if defined(H5_SET_EXTENT_DEBUG) - HDprintf("\n dims_r: "); + printf("\n dims_r: "); for (i = 0; i < (int)dims_r[0]; i++) - HDprintf("%d ", buf_r[i]); - HDprintf("\n"); + printf("%d ", buf_r[i]); + printf("\n"); #endif /* compare the read array with the original array */ for (i = 0; i < (int)dims_r[0]; i++) if (i >= DIMS0) { if (buf_r[i] != comp_value) { - HDprintf("buf_r[%d] = %d\n", i, buf_r[i]); - HDprintf("expected = %d\n", comp_value); + printf("buf_r[%d] = %d\n", i, buf_r[i]); + printf("expected = %d\n", comp_value); TEST_ERROR; } /* end if */ } /* end if */ @@ -901,12 +899,12 @@ test_rank2(hid_t fapl, hid_t dcpl, hbool_t do_fill_value, hbool_t disable_edge_f } #if defined(H5_SET_EXTENT_DEBUG2) - HDprintf("\n"); + printf("\n"); for (i = 0; i < (int)dims_o[0]; i++) { for (j = 0; j < (int)dims_o[1]; j++) { - HDprintf("%d ", buf_o[i][j]); + printf("%d ", buf_o[i][j]); } - HDprintf("\n"); + printf("\n"); } #endif @@ -959,12 +957,12 @@ test_rank2(hid_t fapl, hid_t dcpl, hbool_t do_fill_value, hbool_t disable_edge_f TEST_ERROR; #if defined(H5_SET_EXTENT_DEBUG2) - HDprintf("\n"); + printf("\n"); for (i = 0; i < (int)dims_r[0]; i++) { for (j = 0; j < (int)dims_r[1]; j++) { - HDprintf("%d ", buf_e[i][j]); + printf("%d ", buf_e[i][j]); } - HDprintf("\n"); + printf("\n"); } #endif @@ -973,8 +971,8 @@ test_rank2(hid_t fapl, hid_t dcpl, hbool_t do_fill_value, hbool_t disable_edge_f for (j = 0; j < (int)dims_r[1]; j++) { if (i >= DIM0 || j >= DIM1) { if (buf_e[i][j] != comp_value) { - HDprintf("buf_e[%d][%d] = %d\n", i, j, buf_e[i][j]); - HDprintf("value = %d\n", comp_value); + printf("buf_e[%d][%d] = %d\n", i, j, buf_e[i][j]); + printf("value = %d\n", comp_value); TEST_ERROR; } } @@ -1056,12 +1054,12 @@ test_rank2(hid_t fapl, hid_t dcpl, hbool_t do_fill_value, hbool_t disable_edge_f } #if defined(H5_SET_EXTENT_DEBUG2) - HDprintf("\n"); + printf("\n"); for (i = 0; i < (int)dims_r[0]; i++) { for (j = 0; j < (int)dims_r[1]; j++) { - HDprintf("%d ", buf_s[i][j]); + printf("%d ", buf_s[i][j]); } - HDprintf("\n"); + printf("\n"); } #endif @@ -1069,8 +1067,8 @@ test_rank2(hid_t fapl, hid_t dcpl, hbool_t do_fill_value, hbool_t disable_edge_f for (i = 0; i < (int)dims_r[0]; i++) { for (j = 0; j < (int)dims_r[1]; j++) { if (buf_s[i][j] != buf_o[i][j]) { - HDprintf("buf_s[%d][%d] = %d\n", i, j, buf_s[i][j]); - HDprintf("buf_o[%d][%d] = %d\n", i, j, buf_o[i][j]); + printf("buf_s[%d][%d] = %d\n", i, j, buf_s[i][j]); + printf("buf_o[%d][%d] = %d\n", i, j, buf_o[i][j]); TEST_ERROR; } } @@ -1123,12 +1121,12 @@ test_rank2(hid_t fapl, hid_t dcpl, hbool_t do_fill_value, hbool_t disable_edge_f TEST_ERROR; #if defined(H5_SET_EXTENT_DEBUG2) - HDprintf("\n"); + printf("\n"); for (i = 0; i < (int)dims_r[0]; i++) { for (j = 0; j < (int)dims_r[1]; j++) { - HDprintf("%d ", buf_r[i][j]); + printf("%d ", buf_r[i][j]); } - HDprintf("\n"); + printf("\n"); } #endif @@ -1137,8 +1135,8 @@ test_rank2(hid_t fapl, hid_t dcpl, hbool_t do_fill_value, hbool_t disable_edge_f for (j = 0; j < (int)dims_r[1]; j++) { if (i >= DIMS0 || j >= DIMS1) { if (buf_r[i][j] != comp_value) { - HDprintf("buf_r[%d][%d] = %d\n", i, j, buf_r[i][j]); - HDprintf("value = %d\n", comp_value); + printf("buf_r[%d][%d] = %d\n", i, j, buf_r[i][j]); + printf("value = %d\n", comp_value); TEST_ERROR; } } @@ -1388,17 +1386,17 @@ test_rank3(hid_t fapl, hid_t dcpl, hbool_t do_fill_value, hbool_t disable_edge_f } #if defined(H5_SET_EXTENT_DEBUG3) - HDprintf("\n"); + printf("\n"); for (i = 0; i < (int)dims_o[0]; i++) { for (j = 0; j < (int)dims_o[1]; j++) { for (k = 0; k < (int)dims_o[2]; k++) { - HDprintf("%d ", buf_o[i][j][k]); + printf("%d ", buf_o[i][j][k]); } - HDprintf("[%d] ", j); + printf("[%d] ", j); } - HDprintf("\n"); + printf("\n"); } - HDprintf("\n"); + printf("\n"); #endif if (H5Sclose(sid) < 0) { @@ -1441,17 +1439,17 @@ test_rank3(hid_t fapl, hid_t dcpl, hbool_t do_fill_value, hbool_t disable_edge_f TEST_ERROR; #if defined(H5_SET_EXTENT_DEBUG3) - HDprintf("\n"); + printf("\n"); for (i = 0; i < (int)dims_r[0]; i++) { for (j = 0; j < (int)dims_r[1]; j++) { for (k = 0; k < (int)dims_r[2]; k++) { - HDprintf("%d ", buf_e[i][j][k]); + printf("%d ", buf_e[i][j][k]); } - HDprintf("[%d] ", j); + printf("[%d] ", j); } - HDprintf("\n"); + printf("\n"); } - HDprintf("\n"); + printf("\n"); #endif /* compare the read array with the expanded array */ @@ -1460,8 +1458,8 @@ test_rank3(hid_t fapl, hid_t dcpl, hbool_t do_fill_value, hbool_t disable_edge_f for (k = 0; k < (int)dims_r[2]; k++) { if (i >= DIM0 || j >= DIM1 || k >= DIM2) { if (buf_e[i][j][k] != comp_value) { - HDprintf("buf_e[%d][%d][%d] = %d\n", i, j, k, buf_e[i][j][k]); - HDprintf("value = %d\n", comp_value); + printf("buf_e[%d][%d][%d] = %d\n", i, j, k, buf_e[i][j][k]); + printf("value = %d\n", comp_value); TEST_ERROR; } } @@ -1533,17 +1531,17 @@ test_rank3(hid_t fapl, hid_t dcpl, hbool_t do_fill_value, hbool_t disable_edge_f } #if defined(H5_SET_EXTENT_DEBUG3) - HDprintf("\n"); + printf("\n"); for (i = 0; i < (int)dims_r[0]; i++) { for (j = 0; j < (int)dims_r[1]; j++) { for (k = 0; k < (int)dims_r[2]; k++) { - HDprintf("%d ", buf_s[i][j][k]); + printf("%d ", buf_s[i][j][k]); } - HDprintf("[%d] ", j); + printf("[%d] ", j); } - HDprintf("\n"); + printf("\n"); } - HDprintf("\n"); + printf("\n"); #endif /* compare the read array with the shrunk array */ @@ -1551,8 +1549,8 @@ test_rank3(hid_t fapl, hid_t dcpl, hbool_t do_fill_value, hbool_t disable_edge_f for (j = 0; j < (int)dims_r[1]; j++) { for (k = 0; k < (int)dims_r[2]; k++) { if (buf_s[i][j][k] != buf_o[i][j][k]) { - HDprintf("buf_s[%d][%d][%d] = %d\n", i, j, k, buf_s[i][j][k]); - HDprintf("buf_o[%d][%d][%d] = %d\n", i, j, k, buf_o[i][j][k]); + printf("buf_s[%d][%d][%d] = %d\n", i, j, k, buf_s[i][j][k]); + printf("buf_o[%d][%d][%d] = %d\n", i, j, k, buf_o[i][j][k]); TEST_ERROR; } } @@ -1594,18 +1592,18 @@ test_rank3(hid_t fapl, hid_t dcpl, hbool_t do_fill_value, hbool_t disable_edge_f TEST_ERROR; #if defined(H5_SET_EXTENT_DEBUG3) - HDprintf("\n"); + printf("\n"); for (i = 0; i < (int)dims_r[0]; i++) { for (j = 0; j < (int)dims_r[1]; j++) { for (k = 0; k < (int)dims_r[2]; k++) { - HDprintf("%d ", buf_r[i][j][k]); + printf("%d ", buf_r[i][j][k]); } - HDprintf("[%d] ", j); + printf("[%d] ", j); } - HDprintf("\n"); + printf("\n"); } - HDprintf("\n"); + printf("\n"); #endif /* compare the read array with the original array */ @@ -1614,8 +1612,8 @@ test_rank3(hid_t fapl, hid_t dcpl, hbool_t do_fill_value, hbool_t disable_edge_f for (k = 0; k < (int)dims_r[2]; k++) { if (i >= DIMS0 || j >= DIMS1 || k >= DIMS2) { if (buf_r[i][j][k] != comp_value) { - HDprintf("buf_r[%d][%d][%d] = %d\n", i, j, k, buf_r[i][j][k]); - HDprintf("value = %d\n", comp_value); + printf("buf_r[%d][%d][%d] = %d\n", i, j, k, buf_r[i][j][k]); + printf("value = %d\n", comp_value); TEST_ERROR; } } @@ -1824,12 +1822,12 @@ test_external(hid_t fapl) FAIL_STACK_ERROR; #if defined(H5_SET_EXTENT_DEBUG) - HDprintf("\n"); + printf("\n"); for (i = 0; i < (int)dims_o[0]; i++) { for (j = 0; j < (int)dims_o[1]; j++) { - HDprintf("%d ", buf_ro[i][j]); + printf("%d ", buf_ro[i][j]); } - HDprintf("\n"); + printf("\n"); } #endif @@ -1879,12 +1877,12 @@ test_external(hid_t fapl) FAIL_STACK_ERROR; #if defined(H5_SET_EXTENT_DEBUG) - HDprintf("\n"); + printf("\n"); for (i = 0; i < (int)dims_r[0]; i++) { for (j = 0; j < (int)dims_r[1]; j++) { - HDprintf("%d ", buf_e[i][j]); + printf("%d ", buf_e[i][j]); } - HDprintf("\n"); + printf("\n"); } #endif @@ -1893,8 +1891,8 @@ test_external(hid_t fapl) for (j = 0; j < (int)dims_r[1]; j++) { if (i >= DIM0 || j >= DIM1) { if (buf_e[i][j] != comp_value) { - HDprintf("buf_e[%d][%d] = %d\n", i, j, buf_e[i][j]); - HDprintf("value = %d\n", comp_value); + printf("buf_e[%d][%d] = %d\n", i, j, buf_e[i][j]); + printf("value = %d\n", comp_value); TEST_ERROR; } } @@ -1947,12 +1945,12 @@ test_external(hid_t fapl) FAIL_STACK_ERROR; #if defined(H5_SET_EXTENT_DEBUG) - HDprintf("\n"); + printf("\n"); for (i = 0; i < (int)dims_r[0]; i++) { for (j = 0; j < (int)dims_r[1]; j++) { - HDprintf("%d ", buf_s[i][j]); + printf("%d ", buf_s[i][j]); } - HDprintf("\n"); + printf("\n"); } #endif @@ -1960,8 +1958,8 @@ test_external(hid_t fapl) for (i = 0; i < (int)dims_r[0]; i++) { for (j = 0; j < (int)dims_r[1]; j++) { if (buf_s[i][j] != buf_o[i][j]) { - HDprintf("buf_s[%d][%d] = %d\n", i, j, buf_s[i][j]); - HDprintf("buf_o[%d][%d] = %d\n", i, j, buf_o[i][j]); + printf("buf_s[%d][%d] = %d\n", i, j, buf_s[i][j]); + printf("buf_o[%d][%d] = %d\n", i, j, buf_o[i][j]); TEST_ERROR; } } @@ -2075,12 +2073,12 @@ test_layouts(H5D_layout_t layout, hid_t fapl) } #if defined(H5_SET_EXTENT_DEBUG4) - HDprintf("\n"); + printf("\n"); for (i = 0; i < (int)dims_o[0]; i++) { for (j = 0; j < (int)dims_o[1]; j++) { - HDprintf("%d ", buf_o[i][j]); + printf("%d ", buf_o[i][j]); } - HDprintf("\n"); + printf("\n"); } #endif @@ -2128,12 +2126,12 @@ test_layouts(H5D_layout_t layout, hid_t fapl) TEST_ERROR; #if defined(H5_SET_EXTENT_DEBUG4) - HDprintf("\n"); + printf("\n"); for (i = 0; i < (int)dims_r[0]; i++) { for (j = 0; j < (int)dims_r[1]; j++) { - HDprintf("%d ", buf_r[i][j]); + printf("%d ", buf_r[i][j]); } - HDprintf("\n"); + printf("\n"); } #endif @@ -2183,12 +2181,12 @@ test_layouts(H5D_layout_t layout, hid_t fapl) } #if defined(H5_SET_EXTENT_DEBUG4) - HDprintf("\n"); + printf("\n"); for (i = 0; i < (int)dims_r[0]; i++) { for (j = 0; j < (int)dims_r[1]; j++) { - HDprintf("%d ", buf_r[i][j]); + printf("%d ", buf_r[i][j]); } - HDprintf("\n"); + printf("\n"); } #endif @@ -2272,11 +2270,11 @@ test_random_rank4(hid_t fapl, hid_t dcpl, hbool_t do_fillvalue, hbool_t disable_ char filename[NAME_BUF_SIZE]; /* Initialize large arrays */ - if (NULL == (rbuf = HDcalloc(1, sizeof(*rbuf)))) + if (NULL == (rbuf = calloc(1, sizeof(*rbuf)))) TEST_ERROR; - if (NULL == (wbuf = HDcalloc(1, sizeof(*wbuf)))) + if (NULL == (wbuf = calloc(1, sizeof(*wbuf)))) TEST_ERROR; - if (NULL == (dim_log = HDcalloc(1, sizeof(*dim_log)))) + if (NULL == (dim_log = calloc(1, sizeof(*dim_log)))) TEST_ERROR; /* Create a new file */ @@ -2419,9 +2417,9 @@ test_random_rank4(hid_t fapl, hid_t dcpl, hbool_t do_fillvalue, hbool_t disable_ if (H5Fclose(file) < 0) TEST_ERROR; - HDfree(rbuf); - HDfree(wbuf); - HDfree(dim_log); + free(rbuf); + free(wbuf); + free(dim_log); return 0; @@ -2436,9 +2434,9 @@ error: } H5E_END_TRY; - HDfree(rbuf); - HDfree(wbuf); - HDfree(dim_log); + free(rbuf); + free(wbuf); + free(dim_log); return -1; } /* end test_random_rank4 */ @@ -2494,11 +2492,11 @@ test_random_rank4_vl(hid_t fapl, hid_t dcpl, hbool_t do_fillvalue, hbool_t disab char filename[NAME_BUF_SIZE]; /* Initialize large arrays */ - if (NULL == (rbuf = HDcalloc(1, sizeof(*rbuf)))) + if (NULL == (rbuf = calloc(1, sizeof(*rbuf)))) TEST_ERROR; - if (NULL == (wbuf = HDcalloc(1, sizeof(*wbuf)))) + if (NULL == (wbuf = calloc(1, sizeof(*wbuf)))) TEST_ERROR; - if (NULL == (dim_log = HDcalloc(1, sizeof(*dim_log)))) + if (NULL == (dim_log = calloc(1, sizeof(*dim_log)))) TEST_ERROR; /* Initialize fill value buffers so they aren't freed in case of an error */ @@ -2521,7 +2519,7 @@ test_random_rank4_vl(hid_t fapl, hid_t dcpl, hbool_t do_fillvalue, hbool_t disab for (k = 0; k < dims[2]; k++) for (l = 0; l < dims[3]; l++) { wbuf->arr[i][j][k][l].len = 2; - if (NULL == (wbuf->arr[i][j][k][l].p = HDmalloc(2 * sizeof(int)))) + if (NULL == (wbuf->arr[i][j][k][l].p = malloc(2 * sizeof(int)))) TEST_ERROR; } /* end for */ @@ -2564,7 +2562,7 @@ test_random_rank4_vl(hid_t fapl, hid_t dcpl, hbool_t do_fillvalue, hbool_t disab /* Create VL fill value, if requested */ if (do_fillvalue) { fill_value.len = 2; - if (NULL == (fill_value.p = HDmalloc(2 * sizeof(int)))) + if (NULL == (fill_value.p = malloc(2 * sizeof(int)))) TEST_ERROR; ((int *)fill_value.p)[0] = 1; ((int *)fill_value.p)[1] = 2; @@ -2690,7 +2688,7 @@ test_random_rank4_vl(hid_t fapl, hid_t dcpl, hbool_t do_fillvalue, hbool_t disab TEST_ERROR; if (H5Treclaim(type, mspace, H5P_DEFAULT, wbuf) < 0) TEST_ERROR; - HDfree(fill_value.p); + free(fill_value.p); if (H5Sclose(mspace) < 0) TEST_ERROR; if (H5Pclose(my_dcpl) < 0) @@ -2702,9 +2700,9 @@ test_random_rank4_vl(hid_t fapl, hid_t dcpl, hbool_t do_fillvalue, hbool_t disab if (H5Fclose(file) < 0) TEST_ERROR; - HDfree(rbuf); - HDfree(wbuf); - HDfree(dim_log); + free(rbuf); + free(wbuf); + free(dim_log); return 0; @@ -2716,12 +2714,12 @@ error: for (k = 0; k < dims[2]; k++) for (l = 0; l < dims[3]; l++) { if (rbuf->arr[i][j][k][l].p) - HDfree(rbuf->arr[i][j][k][l].p); + free(rbuf->arr[i][j][k][l].p); if (wbuf->arr[i][j][k][l].p) - HDfree(wbuf->arr[i][j][k][l].p); + free(wbuf->arr[i][j][k][l].p); } /* end for */ if (fill_value.p) - HDfree(fill_value.p); + free(fill_value.p); H5Sclose(fspace); H5Sclose(mspace); H5Pclose(dcpl); @@ -2731,9 +2729,9 @@ error: } H5E_END_TRY; - HDfree(rbuf); - HDfree(wbuf); - HDfree(dim_log); + free(rbuf); + free(wbuf); + free(dim_log); return -1; } /* end test_random_rank4_vl */ @@ -2747,12 +2745,12 @@ test_random_rank4_dump(unsigned ndim_sets, hsize_t dim_log[][4], hsize_t cdims[4 { unsigned i; - HDprintf(" Chunk dimensions: ( %u, %u, %u, %u )\n", (unsigned)cdims[0], (unsigned)cdims[1], - (unsigned)cdims[2], (unsigned)cdims[3]); - HDprintf(" Log of dataset dimensions (oldest first):\n"); + printf(" Chunk dimensions: ( %u, %u, %u, %u )\n", (unsigned)cdims[0], (unsigned)cdims[1], + (unsigned)cdims[2], (unsigned)cdims[3]); + printf(" Log of dataset dimensions (oldest first):\n"); for (i = 0; i < ndim_sets; i++) - HDprintf(" Iteration %-3u: ( %2u, %2u, %2u, %2u )\n", i, (unsigned)dim_log[i][0], - (unsigned)dim_log[i][1], (unsigned)dim_log[i][2], (unsigned)dim_log[i][3]); + printf(" Iteration %-3u: ( %2u, %2u, %2u, %2u )\n", i, (unsigned)dim_log[i][0], + (unsigned)dim_log[i][1], (unsigned)dim_log[i][2], (unsigned)dim_log[i][3]); if (j >= 0) - HDprintf(" First incorrect value read: ( %d, %d, %d, %d )\n", j, k, l, m); + printf(" First incorrect value read: ( %d, %d, %d, %d )\n", j, k, l, m); } /* end test_random_rank4_dump */ diff --git a/test/stab.c b/test/stab.c index 8daf9cc..9e0b1a4 100644 --- a/test/stab.c +++ b/test/stab.c @@ -136,7 +136,7 @@ test_misc(hid_t fcpl, hid_t fapl, hbool_t new_format) if (HDstrcmp(comment, "hello world") != 0) { H5_FAILED(); HDputs(" Read the wrong comment string from the group."); - HDprintf(" got: \"%s\"\n ans: \"hello world\"\n", comment); + printf(" got: \"%s\"\n ans: \"hello world\"\n", comment); TEST_ERROR; } if (H5Gclose(g1) < 0) @@ -214,7 +214,7 @@ test_long(hid_t fcpl, hid_t fapl, hbool_t new_format) TEST_ERROR; /* Group names */ - name1 = (char *)HDmalloc((size_t)LONG_NAME_LEN); + name1 = (char *)malloc((size_t)LONG_NAME_LEN); for (i = 0; i < LONG_NAME_LEN; i++) name1[i] = (char)('A' + i % 26); name1[LONG_NAME_LEN - 1] = '\0'; @@ -247,8 +247,8 @@ test_long(hid_t fcpl, hid_t fapl, hbool_t new_format) TEST_ERROR; /* Release name buffers */ - HDfree(name2); - HDfree(name1); + free(name2); + free(name1); PASSED(); return 0; @@ -259,8 +259,8 @@ error: H5Gclose(g1); H5Gclose(g2); H5Fclose(fid); - HDfree(name2); - HDfree(name1); + free(name2); + free(name1); } H5E_END_TRY; return 1; @@ -669,9 +669,9 @@ long_compact(hid_t fcpl, hid_t fapl2) TEST_ERROR; /* Construct very long object name template */ - if (NULL == (objname = (char *)HDmalloc((size_t)(LONG_COMPACT_LENGTH + 1)))) + if (NULL == (objname = (char *)malloc((size_t)(LONG_COMPACT_LENGTH + 1)))) TEST_ERROR; - HDmemset(objname, 'a', (size_t)LONG_COMPACT_LENGTH); + memset(objname, 'a', (size_t)LONG_COMPACT_LENGTH); objname[LONG_COMPACT_LENGTH] = '\0'; /* Re-open file */ @@ -753,7 +753,7 @@ long_compact(hid_t fcpl, hid_t fapl2) TEST_ERROR; /* Free object name */ - HDfree(objname); + free(objname); objname = NULL; /* Close top group */ @@ -789,7 +789,7 @@ error: H5E_END_TRY; if (objname) - HDfree(objname); + free(objname); return 1; } /* end long_compact() */ diff --git a/test/swmr.c b/test/swmr.c index d3a0d13..54afb9d 100644 --- a/test/swmr.c +++ b/test/swmr.c @@ -2509,12 +2509,12 @@ test_start_swmr_write_concur(hid_t in_fapl, hbool_t new_format) /* Close unused write end for out_pdf */ if (HDclose(out_pdf[1]) < 0) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); /* Wait for notification from parent process */ while (child_notify != 1) { if (HDread(out_pdf[0], &child_notify, sizeof(int)) < 0) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); } /* Should fail */ @@ -2525,13 +2525,13 @@ test_start_swmr_write_concur(hid_t in_fapl, hbool_t new_format) } H5E_END_TRY; if (fid >= 0) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); /* Close the pipe */ if (HDclose(out_pdf[0]) < 0) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); - HDexit(EXIT_SUCCESS); + exit(EXIT_SUCCESS); } /* close unused read end for out_pdf */ @@ -2591,84 +2591,84 @@ test_start_swmr_write_concur(hid_t in_fapl, hbool_t new_format) /* Close unused write end for out_pdf */ if (HDclose(out_pdf[1]) < 0) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); /* close unused read end for in_pdf */ if (HDclose(in_pdf[0]) < 0) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); /* Wait for notification from parent process */ while (child_notify != 1) { if (HDread(out_pdf[0], &child_notify, sizeof(int)) < 0) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); } /* Should succeed in opening the test file 2 times */ if ((child_fid1 = H5Fopen(filename, H5F_ACC_RDONLY | H5F_ACC_SWMR_READ, fapl)) < 0) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); if ((child_fid2 = H5Fopen(filename, H5F_ACC_RDONLY | H5F_ACC_SWMR_READ, fapl)) < 0) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); /* open "dataset" 2 times */ if ((child_did1 = H5Dopen2(child_fid1, "dataset", H5P_DEFAULT)) < 0) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); if ((child_did2 = H5Dopen2(child_fid2, "dataset", H5P_DEFAULT)) < 0) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); /* Read from "dataset" via child_did1 */ rdata = 0; if (H5Dread(child_did1, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, &rdata) < 0) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); if (rdata != 88) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); /* Notify parent process */ child_notify = 2; if (HDwrite(in_pdf[1], &child_notify, sizeof(int)) < 0) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); /* Wait for notification from parent process */ while (child_notify != 3) { if (HDread(out_pdf[0], &child_notify, sizeof(int)) < 0) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); } /* Refresh "dataset" via child_did2 */ if (H5Drefresh(child_did2) < 0) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); /* Read from "dataset" child_did2 */ rdata = 0; if (H5Dread(child_did2, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, &rdata) < 0) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); if (rdata != 99) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); /* Read from "dataset" child_did1 */ rdata = 0; if (H5Dread(child_did1, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, &rdata) < 0) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); if (rdata != 99) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); /* Close the dataset */ if (H5Dclose(child_did1)) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); if (H5Dclose(child_did2)) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); /* Close the file */ if (H5Fclose(child_fid1) < 0) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); if (H5Fclose(child_fid2) < 0) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); /* Close the pipe */ if (HDclose(out_pdf[0]) < 0) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); if (HDclose(in_pdf[1]) < 0) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); - HDexit(EXIT_SUCCESS); + exit(EXIT_SUCCESS); } /* close unused read end for out_pdf */ @@ -2780,12 +2780,12 @@ test_start_swmr_write_concur(hid_t in_fapl, hbool_t new_format) /* Close unused write end for out_pdf */ if (HDclose(out_pdf[1]) < 0) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); /* Wait for notification from parent process */ while (child_notify != 1) { if (HDread(out_pdf[0], &child_notify, sizeof(int)) < 0) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); } /* Should fail in opening the test file */ @@ -2795,9 +2795,9 @@ test_start_swmr_write_concur(hid_t in_fapl, hbool_t new_format) } H5E_END_TRY; if (fid >= 0) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); - HDexit(EXIT_SUCCESS); + exit(EXIT_SUCCESS); } /* end if */ /* close unused read end for out_pdf */ @@ -2856,12 +2856,12 @@ test_start_swmr_write_concur(hid_t in_fapl, hbool_t new_format) /* Close unused write end for out_pdf */ if (HDclose(out_pdf[1]) < 0) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); /* Wait for notification from parent process */ while (child_notify != 1) { if (HDread(out_pdf[0], &child_notify, sizeof(int)) < 0) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); } /* Should fail in opening the test file */ @@ -2871,13 +2871,13 @@ test_start_swmr_write_concur(hid_t in_fapl, hbool_t new_format) } H5E_END_TRY; if (fid >= 0) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); /* Close the pipe */ if (HDclose(out_pdf[0]) < 0) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); - HDexit(EXIT_SUCCESS); + exit(EXIT_SUCCESS); } /* end if */ /* close unused read end for out_pdf */ @@ -2936,12 +2936,12 @@ test_start_swmr_write_concur(hid_t in_fapl, hbool_t new_format) /* Close unused write end for out_pdf */ if (HDclose(out_pdf[1]) < 0) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); /* Wait for notification from parent process */ while (child_notify != 1) { if (HDread(out_pdf[0], &child_notify, sizeof(int)) < 0) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); } /* Should fail in opening the test file */ @@ -2951,13 +2951,13 @@ test_start_swmr_write_concur(hid_t in_fapl, hbool_t new_format) } H5E_END_TRY; if (fid >= 0) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); /* Close the pipe */ if (HDclose(out_pdf[0]) < 0) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); - HDexit(EXIT_SUCCESS); + exit(EXIT_SUCCESS); } /* close unused read end for out_pdf */ @@ -3048,8 +3048,8 @@ test_start_swmr_write_stress_ohdr(hid_t in_fapl) TESTING("H5Fstart_swmr_write()--stress object header messages"); /* Initialize buffers */ - HDmemset(fill, 0, sizeof(fill)); - HDmemset(attr_data, 0, sizeof(attr_data)); + memset(fill, 0, sizeof(fill)); + memset(attr_data, 0, sizeof(attr_data)); if ((fapl = H5Pcopy(in_fapl)) < 0) FAIL_STACK_ERROR; @@ -3992,7 +3992,7 @@ test_append_flush_generic(void) TEST_ERROR; /* Verify expected values: with boundary rank < set boundary rank */ - HDmemset(ret_boundary, 0, sizeof(ret_boundary)); + memset(ret_boundary, 0, sizeof(ret_boundary)); if (H5Pget_append_flush(dapl, 1, ret_boundary, NULL, NULL) < 0) TEST_ERROR; if (ret_boundary[0] != 1 || ret_boundary[1] != 0 || boundary[2] != 0) @@ -4123,7 +4123,7 @@ test_append_flush_dataset_chunked(hid_t in_fapl) FAIL_STACK_ERROR; /* Set boundary dimension rank > the rank of dataset to be created */ - HDmemset(boundary, 0, sizeof(boundary)); + memset(boundary, 0, sizeof(boundary)); if (H5Pset_append_flush(dapl, 3, boundary, NULL, NULL) < 0) FAIL_STACK_ERROR; @@ -4185,7 +4185,7 @@ test_append_flush_dataset_chunked(hid_t in_fapl) if ((ddapl = H5Dget_access_plist(did2)) < 0) FAIL_STACK_ERROR; - HDmemset(ret_boundary, 0, sizeof(ret_boundary)); + memset(ret_boundary, 0, sizeof(ret_boundary)); ret_cb = NULL; ret_count = NULL; /* Retrieve the append flush property values */ @@ -4198,7 +4198,7 @@ test_append_flush_dataset_chunked(hid_t in_fapl) if (ret_boundary[0] != 0 || ret_boundary[1] != 1 || ret_boundary[2] != 0) TEST_ERROR; - HDmemset(ret_boundary, 0, sizeof(ret_boundary)); + memset(ret_boundary, 0, sizeof(ret_boundary)); /* Retrieve the append flush property values */ if (H5Pget_append_flush(ddapl, 1, ret_boundary, NULL, NULL) < 0) TEST_ERROR; @@ -4396,7 +4396,7 @@ test_append_flush_dataset_fixed(hid_t in_fapl) * zero boundary, null callback function, null user data */ - HDmemset(boundary, 0, sizeof(boundary)); + memset(boundary, 0, sizeof(boundary)); if (H5Pset_append_flush(dapl, 1, boundary, append_cb, &count) < 0) FAIL_STACK_ERROR; if ((did2 = H5Dopen2(fid, "dataset2", dapl)) < 0) @@ -5245,12 +5245,12 @@ test_file_lock_concur(hid_t in_fapl) /* Close unused write end for out_pdf */ if (HDclose(out_pdf[1]) < 0) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); /* Wait for notification from parent process */ while (child_notify != 1) { if (HDread(out_pdf[0], &child_notify, sizeof(int)) < 0) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); } /* Open the test file */ @@ -5262,13 +5262,13 @@ test_file_lock_concur(hid_t in_fapl) /* Should fail */ if (child_fid == FAIL) - HDexit(EXIT_SUCCESS); + exit(EXIT_SUCCESS); /* Close the pipe */ if (HDclose(out_pdf[0]) < 0) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); } /* close unused read end for out_pdf */ @@ -5322,12 +5322,12 @@ test_file_lock_concur(hid_t in_fapl) /* Close unused write end for out_pdf */ if (HDclose(out_pdf[1]) < 0) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); /* Wait for notification from parent process */ while (child_notify != 1) { if (HDread(out_pdf[0], &child_notify, sizeof(int)) < 0) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); } /* Opens the test file */ @@ -5339,13 +5339,13 @@ test_file_lock_concur(hid_t in_fapl) /* Should fail */ if (child_fid == FAIL) - HDexit(EXIT_SUCCESS); + exit(EXIT_SUCCESS); /* Close the pipe */ if (HDclose(out_pdf[0]) < 0) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); } /* close unused read end for out_pdf */ @@ -5400,12 +5400,12 @@ test_file_lock_concur(hid_t in_fapl) /* Close unused write end for out_pdf */ if (HDclose(out_pdf[1]) < 0) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); /* Wait for notification from parent process */ while (child_notify != 1) { if (HDread(out_pdf[0], &child_notify, sizeof(int)) < 0) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); } /* Opens the test file */ @@ -5417,13 +5417,13 @@ test_file_lock_concur(hid_t in_fapl) /* Should fail */ if (child_fid == FAIL) - HDexit(EXIT_SUCCESS); + exit(EXIT_SUCCESS); /* Close the pipe */ if (HDclose(out_pdf[0]) < 0) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); } /* end if */ /* close unused read end for out_pdf */ @@ -5478,12 +5478,12 @@ test_file_lock_concur(hid_t in_fapl) /* Close unused write end for out_pdf */ if (HDclose(out_pdf[1]) < 0) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); /* Wait for notification from parent process */ while (child_notify != 1) { if (HDread(out_pdf[0], &child_notify, sizeof(int)) < 0) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); } /* Opens the test file */ @@ -5497,16 +5497,16 @@ test_file_lock_concur(hid_t in_fapl) if (child_fid >= 0) { /* Close the file */ if (H5Fclose(child_fid) < 0) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); /* Close the pipe */ if (HDclose(out_pdf[0]) < 0) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); - HDexit(EXIT_SUCCESS); + exit(EXIT_SUCCESS); } /* end if */ - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); } /* end if */ /* close unused read end for out_pdf */ @@ -5642,12 +5642,12 @@ test_file_lock_swmr_concur(hid_t in_fapl) /* Close unused write end for out_pdf */ if (HDclose(out_pdf[1]) < 0) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); /* Wait for notification from parent process */ while (child_notify != 1) { if (HDread(out_pdf[0], &child_notify, sizeof(int)) < 0) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); } /* Open the test file */ @@ -5659,13 +5659,13 @@ test_file_lock_swmr_concur(hid_t in_fapl) /* Should fail */ if (child_fid == FAIL) - HDexit(EXIT_SUCCESS); + exit(EXIT_SUCCESS); /* Close the pipe */ if (HDclose(out_pdf[0]) < 0) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); } /* close unused read end for out_pdf */ @@ -5720,12 +5720,12 @@ test_file_lock_swmr_concur(hid_t in_fapl) /* Close unused write end for out_pdf */ if (HDclose(out_pdf[1]) < 0) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); /* Wait for notification from parent process */ while (child_notify != 1) { if (HDread(out_pdf[0], &child_notify, sizeof(int)) < 0) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); } /* Open the test file */ @@ -5737,13 +5737,13 @@ test_file_lock_swmr_concur(hid_t in_fapl) /* Should fail */ if (child_fid == FAIL) - HDexit(EXIT_SUCCESS); + exit(EXIT_SUCCESS); /* Close the pipe */ if (HDclose(out_pdf[0]) < 0) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); } /* close unused read end for out_pdf */ @@ -5798,12 +5798,12 @@ test_file_lock_swmr_concur(hid_t in_fapl) /* Close unused write end for out_pdf */ if (HDclose(out_pdf[1]) < 0) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); /* Wait for notification from parent process */ while (child_notify != 1) { if (HDread(out_pdf[0], &child_notify, sizeof(int)) < 0) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); } /* Open the test file */ @@ -5815,13 +5815,13 @@ test_file_lock_swmr_concur(hid_t in_fapl) /* Should fail */ if (child_fid == FAIL) - HDexit(EXIT_SUCCESS); + exit(EXIT_SUCCESS); /* Close the pipe */ if (HDclose(out_pdf[0]) < 0) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); } /* close unused read end for out_pdf */ @@ -5875,12 +5875,12 @@ test_file_lock_swmr_concur(hid_t in_fapl) /* Close unused write end for out_pdf */ if (HDclose(out_pdf[1]) < 0) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); /* Wait for notification from parent process */ while (child_notify != 1) { if (HDread(out_pdf[0], &child_notify, sizeof(int)) < 0) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); } /* Open the test file */ @@ -5892,13 +5892,13 @@ test_file_lock_swmr_concur(hid_t in_fapl) /* Should fail */ if (child_fid == FAIL) - HDexit(EXIT_SUCCESS); + exit(EXIT_SUCCESS); /* Close the pipe */ if (HDclose(out_pdf[0]) < 0) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); } /* close unused read end for out_pdf */ @@ -5952,12 +5952,12 @@ test_file_lock_swmr_concur(hid_t in_fapl) /* Close unused write end for out_pdf */ if (HDclose(out_pdf[1]) < 0) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); /* Wait for notification from parent process */ while (child_notify != 1) { if (HDread(out_pdf[0], &child_notify, sizeof(int)) < 0) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); } /* Open the test file */ @@ -5971,14 +5971,14 @@ test_file_lock_swmr_concur(hid_t in_fapl) if (child_fid >= 0) { if (H5Fclose(child_fid) < 0) FAIL_STACK_ERROR; - HDexit(EXIT_SUCCESS); + exit(EXIT_SUCCESS); } /* Close the pipe */ if (HDclose(out_pdf[0]) < 0) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); } /* close unused read end for out_pdf */ @@ -6032,12 +6032,12 @@ test_file_lock_swmr_concur(hid_t in_fapl) /* Close unused write end for out_pdf */ if (HDclose(out_pdf[1]) < 0) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); /* Wait for notification from parent process */ while (child_notify != 1) { if (HDread(out_pdf[0], &child_notify, sizeof(int)) < 0) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); } /* Open the test file */ @@ -6049,13 +6049,13 @@ test_file_lock_swmr_concur(hid_t in_fapl) /* Should fail */ if (child_fid == FAIL) - HDexit(EXIT_SUCCESS); + exit(EXIT_SUCCESS); /* Close the pipe */ if (HDclose(out_pdf[0]) < 0) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); } /* close unused read end for out_pdf */ @@ -6110,12 +6110,12 @@ test_file_lock_swmr_concur(hid_t in_fapl) /* Close unused write end for out_pdf */ if (HDclose(out_pdf[1]) < 0) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); /* Wait for notification from parent process */ while (child_notify != 1) { if (HDread(out_pdf[0], &child_notify, sizeof(int)) < 0) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); } /* Open the test file */ @@ -6127,13 +6127,13 @@ test_file_lock_swmr_concur(hid_t in_fapl) /* Should fail */ if (child_fid == FAIL) - HDexit(EXIT_SUCCESS); + exit(EXIT_SUCCESS); /* Close the pipe */ if (HDclose(out_pdf[0]) < 0) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); } /* close unused read end for out_pdf */ @@ -6188,12 +6188,12 @@ test_file_lock_swmr_concur(hid_t in_fapl) /* Close unused write end for out_pdf */ if (HDclose(out_pdf[1]) < 0) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); /* Wait for notification from parent process */ while (child_notify != 1) { if (HDread(out_pdf[0], &child_notify, sizeof(int)) < 0) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); } /* Open the test file */ @@ -6205,13 +6205,13 @@ test_file_lock_swmr_concur(hid_t in_fapl) /* Should fail */ if (child_fid == FAIL) - HDexit(EXIT_SUCCESS); + exit(EXIT_SUCCESS); /* Close the pipe */ if (HDclose(out_pdf[0]) < 0) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); } /* close unused read end for out_pdf */ @@ -6266,12 +6266,12 @@ test_file_lock_swmr_concur(hid_t in_fapl) /* Close unused write end for out_pdf */ if (HDclose(out_pdf[1]) < 0) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); /* Wait for notification from parent process */ while (child_notify != 1) { if (HDread(out_pdf[0], &child_notify, sizeof(int)) < 0) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); } /* Open the test file */ @@ -6285,14 +6285,14 @@ test_file_lock_swmr_concur(hid_t in_fapl) if (child_fid >= 0) { if (H5Fclose(child_fid) < 0) FAIL_STACK_ERROR; - HDexit(EXIT_SUCCESS); + exit(EXIT_SUCCESS); } /* Close the pipe */ if (HDclose(out_pdf[0]) < 0) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); } /* close unused read end for out_pdf */ @@ -6347,12 +6347,12 @@ test_file_lock_swmr_concur(hid_t in_fapl) /* Close unused write end for out_pdf */ if (HDclose(out_pdf[1]) < 0) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); /* Wait for notification from parent process */ while (child_notify != 1) { if (HDread(out_pdf[0], &child_notify, sizeof(int)) < 0) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); } /* Open the test file */ @@ -6363,14 +6363,14 @@ test_file_lock_swmr_concur(hid_t in_fapl) if (child_fid >= 0) { if (H5Fclose(child_fid) < 0) FAIL_STACK_ERROR; - HDexit(EXIT_SUCCESS); + exit(EXIT_SUCCESS); } /* Close the pipe */ if (HDclose(out_pdf[0]) < 0) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); } /* close unused read end for out_pdf */ @@ -6425,12 +6425,12 @@ test_file_lock_swmr_concur(hid_t in_fapl) /* Close unused write end for out_pdf */ if (HDclose(out_pdf[1]) < 0) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); /* Wait for notification from parent process */ while (child_notify != 1) { if (HDread(out_pdf[0], &child_notify, sizeof(int)) < 0) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); } /* Open the test file */ @@ -6442,13 +6442,13 @@ test_file_lock_swmr_concur(hid_t in_fapl) /* Should fail */ if (child_fid == FAIL) - HDexit(EXIT_SUCCESS); + exit(EXIT_SUCCESS); /* Close the pipe */ if (HDclose(out_pdf[0]) < 0) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); } /* Close unused read end for out_pdf */ @@ -6503,12 +6503,12 @@ test_file_lock_swmr_concur(hid_t in_fapl) /* Close unused write end for out_pdf */ if (HDclose(out_pdf[1]) < 0) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); /* Wait for notification from parent process */ while (child_notify != 1) { if (HDread(out_pdf[0], &child_notify, sizeof(int)) < 0) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); } /* Open the test file */ @@ -6522,14 +6522,14 @@ test_file_lock_swmr_concur(hid_t in_fapl) if (child_fid >= 0) { if (H5Fclose(child_fid) < 0) FAIL_STACK_ERROR; - HDexit(EXIT_SUCCESS); + exit(EXIT_SUCCESS); } /* Close the pipe */ if (HDclose(out_pdf[0]) < 0) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); } /* close unused read end for out_pdf */ @@ -6685,12 +6685,12 @@ test_file_locking(hid_t in_fapl, hbool_t turn_locking_on, hbool_t env_var_overri /* Close unused write end for out_pdf */ if (HDclose(out_pdf[1]) < 0) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); /* Wait for notification from parent process */ while (child_notify != 1) { if (HDread(out_pdf[0], &child_notify, sizeof(int)) < 0) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); } /* Open and close the test file */ @@ -6703,12 +6703,12 @@ test_file_locking(hid_t in_fapl, hbool_t turn_locking_on, hbool_t env_var_overri /* Close the pipe */ if (HDclose(out_pdf[0]) < 0) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); if (H5I_INVALID_HID == child_fid || FAIL == ret) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); else - HDexit(EXIT_SUCCESS); + exit(EXIT_SUCCESS); } /* end child process work */ /* close unused read end for out_pdf */ @@ -7186,96 +7186,96 @@ test_refresh_concur(hid_t in_fapl, hbool_t new_format) /* Close unused write end for out_pdf */ if (HDclose(out_pdf[1]) < 0) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); /* close unused read end for in_pdf */ if (HDclose(in_pdf[0]) < 0) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); /* Wait for notification from parent process */ while (child_notify != 1) if (HDread(out_pdf[0], &child_notify, sizeof(int)) < 0) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); /* Open the file 2 times */ if ((child_fid1 = H5Fopen(filename, H5F_ACC_RDONLY | H5F_ACC_SWMR_READ, fapl)) < 0) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); if ((child_fid2 = H5Fopen(filename, H5F_ACC_RDONLY | H5F_ACC_SWMR_READ, fapl)) < 0) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); /* Open the dataset 2 times */ if ((child_did1 = H5Dopen2(child_fid1, "dataset", H5P_DEFAULT)) < 0) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); if ((child_did2 = H5Dopen2(child_fid2, "dataset", H5P_DEFAULT)) < 0) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); /* Get the dataset's dataspace via did1 */ if ((child_sid = H5Dget_space(child_did1)) < 0) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); if (H5Sget_simple_extent_dims(child_sid, tdims, NULL) < 0) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); if (tdims[0] != 1) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); /* Read from the dataset via did2 */ if (H5Dread(child_did2, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf) < 0) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); /* Verify the data is correct */ if (rbuf[0] != 99) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); /* Notify parent process */ child_notify = 2; if (HDwrite(in_pdf[1], &child_notify, sizeof(int)) < 0) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); /* Wait for notification from parent process */ while (child_notify != 3) if (HDread(out_pdf[0], &child_notify, sizeof(int)) < 0) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); /* Refresh dataset via did1 */ if (H5Drefresh(child_did1) < 0) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); /* Get the dataset's dataspace and verify */ if ((child_sid = H5Dget_space(child_did1)) < 0) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); if (H5Sget_simple_extent_dims(child_sid, tdims, NULL) < 0) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); if (tdims[0] != 2) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); /* Read from the dataset */ if (H5Dread(child_did2, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf) < 0) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); /* Verify the data is correct */ if (rbuf[0] != 100 || rbuf[1] != 100) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); /* Close the 2 datasets */ if (H5Dclose(child_did1) < 0) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); if (H5Dclose(child_did2) < 0) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); /* Close the 2 files */ if (H5Fclose(child_fid1) < 0) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); if (H5Fclose(child_fid2) < 0) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); /* Close the pipes */ if (HDclose(out_pdf[0]) < 0) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); if (HDclose(in_pdf[1]) < 0) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); - HDexit(EXIT_SUCCESS); + exit(EXIT_SUCCESS); } /* Close unused read end for out_pdf */ @@ -7740,7 +7740,7 @@ main(void) */ driver = HDgetenv(HDF5_DRIVER); if (!H5FD__supports_swmr_test(driver)) { - HDprintf("This VFD does not support SWMR I/O\n"); + printf("This VFD does not support SWMR I/O\n"); return EXIT_SUCCESS; } /* end if */ @@ -7757,7 +7757,7 @@ main(void) /* Check if file locking is enabled on this file system */ if (use_file_locking) if (h5_check_if_file_locking_enabled(&file_locking_enabled) < 0) { - HDprintf("Error when determining if file locks are enabled\n"); + printf("Error when determining if file locks are enabled\n"); return EXIT_FAILURE; } @@ -7847,7 +7847,7 @@ main(void) if (nerrors) goto error; - HDprintf("All tests passed.\n"); + printf("All tests passed.\n"); h5_cleanup(FILENAME, fapl); @@ -7855,7 +7855,7 @@ main(void) error: nerrors = MAX(1, nerrors); - HDprintf("***** %d SWMR TEST%s FAILED! *****\n", nerrors, 1 == nerrors ? "" : "S"); + printf("***** %d SWMR TEST%s FAILED! *****\n", nerrors, 1 == nerrors ? "" : "S"); return EXIT_FAILURE; } /* end main() */ diff --git a/test/swmr_addrem_writer.c b/test/swmr_addrem_writer.c index 07f2cb1..1b21a70 100644 --- a/test/swmr_addrem_writer.c +++ b/test/swmr_addrem_writer.c @@ -75,7 +75,7 @@ open_skeleton(const char *filename, unsigned verbose) hsize_t dim[2]; /* Dataspace dimension */ unsigned u, v; /* Local index variable */ - HDassert(filename); + assert(filename); /* Create file access property list */ if ((fapl = h5_fileaccess()) < 0) @@ -95,7 +95,7 @@ open_skeleton(const char *filename, unsigned verbose) /* Emit informational message */ if (verbose) - HDfprintf(stderr, "Opening datasets\n"); + fprintf(stderr, "Opening datasets\n"); /* Open the datasets */ for (u = 0; u < NLEVELS; u++) @@ -148,10 +148,10 @@ addrem_records(hid_t fid, unsigned verbose, unsigned long nops, unsigned long fl unsigned long op_to_flush; /* # of operations before flush */ unsigned long u, v; /* Local index variables */ - HDassert(fid > 0); + assert(fid > 0); /* Reset the buffer */ - HDmemset(&buf, 0, sizeof(buf)); + memset(&buf, 0, sizeof(buf)); /* Create a dataspace for the record to add */ if ((mem_sid = H5Screate_simple(2, count, NULL)) < 0) @@ -250,7 +250,7 @@ addrem_records(hid_t fid, unsigned verbose, unsigned long nops, unsigned long fl /* Emit informational message */ if (verbose) - HDfprintf(stderr, "Closing datasets\n"); + fprintf(stderr, "Closing datasets\n"); /* Close the datasets */ for (u = 0; u < NLEVELS; u++) @@ -264,21 +264,21 @@ addrem_records(hid_t fid, unsigned verbose, unsigned long nops, unsigned long fl static void usage(void) { - HDprintf("\n"); - HDprintf("Usage error!\n"); - HDprintf("\n"); - HDprintf("Usage: swmr_addrem_writer [-q] [-f <# of operations between flushing\n"); - HDprintf(" file contents>] [-r <random seed>] <# of operations>\n"); - HDprintf("\n"); - HDprintf("<# of operations between flushing file contents> should be 0 (for\n"); - HDprintf("no flushing) or between 1 and (<# of operations> - 1).\n"); - HDprintf("\n"); - HDprintf("<# of operations> must be specified.\n"); - HDprintf("\n"); - HDprintf("Defaults to verbose (no '-q' given), flushing every 1000 operations\n"); - HDprintf("('-f 1000'), and will generate a random seed (no -r given).\n"); - HDprintf("\n"); - HDexit(EXIT_FAILURE); + printf("\n"); + printf("Usage error!\n"); + printf("\n"); + printf("Usage: swmr_addrem_writer [-q] [-f <# of operations between flushing\n"); + printf(" file contents>] [-r <random seed>] <# of operations>\n"); + printf("\n"); + printf("<# of operations between flushing file contents> should be 0 (for\n"); + printf("no flushing) or between 1 and (<# of operations> - 1).\n"); + printf("\n"); + printf("<# of operations> must be specified.\n"); + printf("\n"); + printf("Defaults to verbose (no '-q' given), flushing every 1000 operations\n"); + printf("('-f 1000'), and will generate a random seed (no -r given).\n"); + printf("\n"); + exit(EXIT_FAILURE); } int @@ -318,7 +318,7 @@ main(int argc, char *argv[]) /* Random # seed */ case 'r': use_seed = 1; - temp = HDatoi(argv[u + 1]); + temp = atoi(argv[u + 1]); if (temp < 0) usage(); else @@ -348,9 +348,9 @@ main(int argc, char *argv[]) /* Emit informational message */ if (verbose) { - HDfprintf(stderr, "Parameters:\n"); - HDfprintf(stderr, "\t# of operations between flushes = %ld\n", flush_count); - HDfprintf(stderr, "\t# of operations = %ld\n", nops); + fprintf(stderr, "Parameters:\n"); + fprintf(stderr, "\t# of operations between flushes = %ld\n", flush_count); + fprintf(stderr, "\t# of operations = %ld\n", nops); } /* end if */ /* Set the random seed */ @@ -361,11 +361,11 @@ main(int argc, char *argv[]) } /* end if */ HDsrandom(random_seed); /* ALWAYS emit the random seed for possible debugging */ - HDfprintf(stderr, "Using writer random seed: %u\n", random_seed); + fprintf(stderr, "Using writer random seed: %u\n", random_seed); /* Emit informational message */ if (verbose) - HDfprintf(stderr, "Generating symbol names\n"); + fprintf(stderr, "Generating symbol names\n"); /* Generate dataset names */ if (generate_symbols() < 0) @@ -373,12 +373,12 @@ main(int argc, char *argv[]) /* Emit informational message */ if (verbose) - HDfprintf(stderr, "Opening skeleton file: %s\n", FILENAME); + fprintf(stderr, "Opening skeleton file: %s\n", FILENAME); /* Open file skeleton */ if ((fid = open_skeleton(FILENAME, verbose)) < 0) { - HDfprintf(stderr, "Error opening skeleton file!\n"); - HDexit(EXIT_FAILURE); + fprintf(stderr, "Error opening skeleton file!\n"); + exit(EXIT_FAILURE); } /* end if */ /* Send a message to indicate "H5Fopen" is complete--releasing the file lock */ @@ -386,32 +386,32 @@ main(int argc, char *argv[]) /* Emit informational message */ if (verbose) - HDfprintf(stderr, "Adding and removing records\n"); + fprintf(stderr, "Adding and removing records\n"); /* Grow and shrink datasets */ if (addrem_records(fid, verbose, (unsigned long)nops, (unsigned long)flush_count) < 0) { - HDfprintf(stderr, "Error adding and removing records from datasets!\n"); - HDexit(EXIT_FAILURE); + fprintf(stderr, "Error adding and removing records from datasets!\n"); + exit(EXIT_FAILURE); } /* end if */ /* Emit informational message */ if (verbose) - HDfprintf(stderr, "Releasing symbols\n"); + fprintf(stderr, "Releasing symbols\n"); /* Clean up the symbols */ if (shutdown_symbols() < 0) { - HDfprintf(stderr, "Error releasing symbols!\n"); - HDexit(EXIT_FAILURE); + fprintf(stderr, "Error releasing symbols!\n"); + exit(EXIT_FAILURE); } /* end if */ /* Emit informational message */ if (verbose) - HDfprintf(stderr, "Closing objects\n"); + fprintf(stderr, "Closing objects\n"); /* Close objects opened */ if (H5Fclose(fid) < 0) { - HDfprintf(stderr, "Error closing file!\n"); - HDexit(EXIT_FAILURE); + fprintf(stderr, "Error closing file!\n"); + exit(EXIT_FAILURE); } /* end if */ return 0; diff --git a/test/swmr_common.c b/test/swmr_common.c index 0c869f1..ef4c550 100644 --- a/test/swmr_common.c +++ b/test/swmr_common.c @@ -179,7 +179,7 @@ create_symbol_datatype(void) int generate_name(char *name_buf, size_t name_buf_length, unsigned level, unsigned count) { - HDassert(name_buf); + assert(name_buf); HDsnprintf(name_buf, name_buf_length, "%u-%04u", level, count); @@ -204,7 +204,7 @@ generate_symbols(void) unsigned u, v; /* Local index variables */ for (u = 0; u < NLEVELS; u++) { - symbol_info[u] = HDmalloc(symbol_count[u] * sizeof(symbol_info_t)); + symbol_info[u] = malloc(symbol_count[u] * sizeof(symbol_info_t)); for (v = 0; v < symbol_count[u]; v++) { char name_buf[64]; @@ -238,8 +238,8 @@ shutdown_symbols(void) /* Clean up the symbols */ for (u = 0; u < NLEVELS; u++) { for (v = 0; v < symbol_count[u]; v++) - HDfree(symbol_info[u][v].name); - HDfree(symbol_info[u]); + free(symbol_info[u][v].name); + free(symbol_info[u]); } /* end for */ return 0; @@ -275,12 +275,12 @@ print_metadata_retries_info(hid_t fid) if (NULL == info.retries[i]) continue; - HDfprintf(stderr, "Metadata read retries for item %u:\n", i); + fprintf(stderr, "Metadata read retries for item %u:\n", i); power = 1; for (j = 0; j < info.nbins; j++) { if (info.retries[i][j]) - HDfprintf(stderr, "\t# of retries for %u - %u retries: %u\n", power, (power * 10) - 1, - info.retries[i][j]); + fprintf(stderr, "\t# of retries for %u - %u retries: %u\n", power, (power * 10) - 1, + info.retries[i][j]); power *= 10; } /* end for */ } /* end for */ diff --git a/test/swmr_generator.c b/test/swmr_generator.c index 53a619b..75e392d 100644 --- a/test/swmr_generator.c +++ b/test/swmr_generator.c @@ -97,8 +97,8 @@ gen_skeleton(const char *filename, hbool_t verbose, hbool_t swmr_write, int comp #endif /* FILLVAL_WORKS */ unsigned u, v; /* Local index variable */ - HDassert(filename); - HDassert(index_type); + assert(filename); + assert(index_type); /* Create file access property list */ if ((fapl = h5_fileaccess()) < 0) @@ -124,7 +124,7 @@ gen_skeleton(const char *filename, hbool_t verbose, hbool_t swmr_write, int comp /* Emit informational message */ if (verbose) - HDfprintf(stderr, "Creating file\n"); + fprintf(stderr, "Creating file\n"); /* Create the file */ if ((fid = H5Fcreate(filename, H5F_ACC_TRUNC | (swmr_write ? H5F_ACC_SWMR_WRITE : 0), fcpl, fapl)) < 0) @@ -169,7 +169,7 @@ gen_skeleton(const char *filename, hbool_t verbose, hbool_t swmr_write, int comp /* Currently fill values do not work because they can bump the dataspace * message to the second object header chunk. We should enable the fillval * here when this is fixed. -NAF 8/11/11 */ - HDmemset(&fillval, 0, sizeof(fillval)); + memset(&fillval, 0, sizeof(fillval)); fillval.rec_id = (uint64_t)ULLONG_MAX; if (H5Pset_fill_value(dcpl, tid, &fillval) < 0) return -1; @@ -177,7 +177,7 @@ gen_skeleton(const char *filename, hbool_t verbose, hbool_t swmr_write, int comp /* Emit informational message */ if (verbose) - HDfprintf(stderr, "Creating datasets\n"); + fprintf(stderr, "Creating datasets\n"); /* Create the datasets */ for (u = 0; u < NLEVELS; u++) @@ -218,7 +218,7 @@ gen_skeleton(const char *filename, hbool_t verbose, hbool_t swmr_write, int comp /* Emit informational message */ if (verbose) - HDfprintf(stderr, "Closing objects\n"); + fprintf(stderr, "Closing objects\n"); /* Close everything */ if (H5Pclose(dcpl) < 0) @@ -236,24 +236,24 @@ gen_skeleton(const char *filename, hbool_t verbose, hbool_t swmr_write, int comp static void usage(void) { - HDprintf("\n"); - HDprintf("Usage error!\n"); - HDprintf("\n"); - HDprintf("Usage: swmr_generator [-q] [-s] [-c <deflate compression level>]\n"); - HDprintf(" [-i <index type>] [-r <random seed>]\n"); - HDprintf("\n"); - HDprintf("NOTE: The random seed option is only used by the sparse test. Other\n"); - HDprintf(" tests specify the random seed as a reader/writer option.\n"); - HDprintf("\n"); - HDprintf("<deflate compression level> should be -1 (for no compression) or 0-9\n"); - HDprintf("\n"); - HDprintf("<index type> should be b2 or ea\n"); - HDprintf("\n"); - HDprintf("Defaults to verbose (no '-q' given), no SWMR_WRITE mode (no '-s' given) no\n"); - HDprintf("compression ('-c -1'), v1 b-tree indexing (-i b1), and will generate a random\n"); - HDprintf("seed (no -r given).\n"); - HDprintf("\n"); - HDexit(EXIT_FAILURE); + printf("\n"); + printf("Usage error!\n"); + printf("\n"); + printf("Usage: swmr_generator [-q] [-s] [-c <deflate compression level>]\n"); + printf(" [-i <index type>] [-r <random seed>]\n"); + printf("\n"); + printf("NOTE: The random seed option is only used by the sparse test. Other\n"); + printf(" tests specify the random seed as a reader/writer option.\n"); + printf("\n"); + printf("<deflate compression level> should be -1 (for no compression) or 0-9\n"); + printf("\n"); + printf("<index type> should be b2 or ea\n"); + printf("\n"); + printf("Defaults to verbose (no '-q' given), no SWMR_WRITE mode (no '-s' given) no\n"); + printf("compression ('-c -1'), v1 b-tree indexing (-i b1), and will generate a random\n"); + printf("seed (no -r given).\n"); + printf("\n"); + exit(EXIT_FAILURE); } /* end usage() */ int @@ -276,7 +276,7 @@ main(int argc, char *argv[]) switch (argv[u][1]) { /* Compress dataset chunks */ case 'c': - comp_level = HDatoi(argv[u + 1]); + comp_level = atoi(argv[u + 1]); if (comp_level < -1 || comp_level > 9) usage(); u += 2; @@ -293,7 +293,7 @@ main(int argc, char *argv[]) /* Random # seed */ case 'r': use_seed = TRUE; - temp = HDatoi(argv[u + 1]); + temp = atoi(argv[u + 1]); if (temp < 0) usage(); else @@ -323,10 +323,10 @@ main(int argc, char *argv[]) /* Emit informational message */ if (verbose) { - HDfprintf(stderr, "Parameters:\n"); - HDfprintf(stderr, "\tswmr writes %s\n", swmr_write ? "on" : "off"); - HDfprintf(stderr, "\tcompression level = %d\n", comp_level); - HDfprintf(stderr, "\tindex type = %s\n", index_type); + fprintf(stderr, "Parameters:\n"); + fprintf(stderr, "\tswmr writes %s\n", swmr_write ? "on" : "off"); + fprintf(stderr, "\tcompression level = %d\n", comp_level); + fprintf(stderr, "\tindex type = %s\n", index_type); } /* end if */ /* Set the random seed */ @@ -338,16 +338,16 @@ main(int argc, char *argv[]) } /* end if */ HDsrandom(random_seed); /* ALWAYS emit the random seed for possible debugging */ - HDfprintf(stderr, "Using generator random seed (used in sparse test only): %u\n", random_seed); + fprintf(stderr, "Using generator random seed (used in sparse test only): %u\n", random_seed); /* Emit informational message */ if (verbose) - HDfprintf(stderr, "Generating skeleton file: %s\n", FILENAME); + fprintf(stderr, "Generating skeleton file: %s\n", FILENAME); /* Generate file skeleton */ if (gen_skeleton(FILENAME, verbose, swmr_write, comp_level, index_type, random_seed) < 0) { - HDfprintf(stderr, "Error generating skeleton file!\n"); - HDexit(EXIT_FAILURE); + fprintf(stderr, "Error generating skeleton file!\n"); + exit(EXIT_FAILURE); } /* end if */ return 0; diff --git a/test/swmr_reader.c b/test/swmr_reader.c index 4c3770b..9e4e322 100644 --- a/test/swmr_reader.c +++ b/test/swmr_reader.c @@ -86,10 +86,10 @@ check_dataset(hid_t fid, hbool_t verbose, FILE *verbose_file, const char *sym_na hssize_t snpoints; /* Number of elements in dataset */ hsize_t start[2] = {0, 0}, count[2] = {1, 1}; /* Hyperslab selection values */ - HDassert(fid >= 0); - HDassert(sym_name); - HDassert(record); - HDassert(rec_sid >= 0); + assert(fid >= 0); + assert(sym_name); + assert(record); + assert(rec_sid >= 0); /* Open dataset for symbol */ if ((dsid = H5Dopen2(fid, sym_name, H5P_DEFAULT)) < 0) @@ -105,7 +105,7 @@ check_dataset(hid_t fid, hbool_t verbose, FILE *verbose_file, const char *sym_na /* Emit informational message */ if (verbose) - HDfprintf(verbose_file, "Symbol = '%s', # of records = %lld\n", sym_name, (long long)snpoints); + fprintf(verbose_file, "Symbol = '%s', # of records = %lld\n", sym_name, (long long)snpoints); /* Check if there are records for symbol */ if (snpoints > 0) { @@ -126,12 +126,12 @@ check_dataset(hid_t fid, hbool_t verbose, FILE *verbose_file, const char *sym_na HDgettimeofday(&tv, NULL); if (verbose) { - HDfprintf(verbose_file, "*** ERROR ***\n"); - HDfprintf(verbose_file, "Incorrect record value!\n"); - HDfprintf(verbose_file, - "Time = %llu.%llu, Symbol = '%s', # of records = %lld, record->rec_id = %llu\n", - (unsigned long long)tv.tv_sec, (unsigned long long)tv.tv_usec, sym_name, - (long long)snpoints, (unsigned long long)record->rec_id); + fprintf(verbose_file, "*** ERROR ***\n"); + fprintf(verbose_file, "Incorrect record value!\n"); + fprintf(verbose_file, + "Time = %llu.%llu, Symbol = '%s', # of records = %lld, record->rec_id = %llu\n", + (unsigned long long)tv.tv_sec, (unsigned long long)tv.tv_usec, sym_name, + (long long)snpoints, (unsigned long long)record->rec_id); } /* end if */ return -1; } /* end if */ @@ -204,22 +204,22 @@ read_records(const char *filename, hbool_t verbose, FILE *verbose_file, unsigned unsigned v; /* Local index variable */ hbool_t use_log_vfd = FALSE; /* Use the log VFD (set this manually) */ - HDassert(filename); - HDassert(nseconds != 0); - HDassert(poll_time != 0); + assert(filename); + assert(nseconds != 0); + assert(poll_time != 0); /* Reset the record */ /* (record's 'info' field might need to change for each record read, also) */ - HDmemset(&record, 0, sizeof(record)); + memset(&record, 0, sizeof(record)); /* Emit informational message */ if (verbose) - HDfprintf(verbose_file, "Choosing datasets\n"); + fprintf(verbose_file, "Choosing datasets\n"); /* Allocate space for 'common' datasets, if any */ if (ncommon > 0) { /* Allocate array to hold pointers to symbols for common datasets */ - if (NULL == (sym_com = (symbol_info_t **)HDmalloc(sizeof(symbol_info_t *) * ncommon))) + if (NULL == (sym_com = (symbol_info_t **)malloc(sizeof(symbol_info_t *) * ncommon))) return -1; /* Open the common datasets */ @@ -233,14 +233,14 @@ read_records(const char *filename, hbool_t verbose, FILE *verbose_file, unsigned /* Emit informational message */ if (verbose) - HDfprintf(verbose_file, "Common symbol #%u = '%s'\n", v, symbol_info[0][offset].name); + fprintf(verbose_file, "Common symbol #%u = '%s'\n", v, symbol_info[0][offset].name); } /* end for */ } /* end if */ /* Allocate space for 'random' datasets, if any */ if (nrandom > 0) { /* Allocate array to hold pointers to symbols for random datasets */ - if (NULL == (sym_rand = (symbol_info_t **)HDmalloc(sizeof(symbol_info_t *) * nrandom))) + if (NULL == (sym_rand = (symbol_info_t **)malloc(sizeof(symbol_info_t *) * nrandom))) return -1; /* Determine the random datasets */ @@ -254,7 +254,7 @@ read_records(const char *filename, hbool_t verbose, FILE *verbose_file, unsigned /* Emit informational message */ if (verbose) - HDfprintf(verbose_file, "Random symbol #%u = '%s'\n", v, sym->name); + fprintf(verbose_file, "Random symbol #%u = '%s'\n", v, sym->name); } /* end for */ } /* end if */ @@ -264,7 +264,7 @@ read_records(const char *filename, hbool_t verbose, FILE *verbose_file, unsigned /* Emit informational message */ if (verbose) - HDfprintf(verbose_file, "Reading records\n"); + fprintf(verbose_file, "Reading records\n"); /* Get the starting time */ start_time = HDtime(NULL); @@ -288,7 +288,7 @@ read_records(const char *filename, hbool_t verbose, FILE *verbose_file, unsigned /* Emit informational message */ if (verbose) - HDfprintf(verbose_file, "Opening file: %s\n", filename); + fprintf(verbose_file, "Opening file: %s\n", filename); /* Open the file */ if ((fid = H5Fopen(filename, H5F_ACC_RDONLY | H5F_ACC_SWMR_READ, fapl)) < 0) @@ -298,14 +298,14 @@ read_records(const char *filename, hbool_t verbose, FILE *verbose_file, unsigned if (ncommon > 0) { /* Emit informational message */ if (verbose) - HDfprintf(verbose_file, "Checking common symbols\n"); + fprintf(verbose_file, "Checking common symbols\n"); /* Iterate over common datasets */ for (v = 0; v < ncommon; v++) { /* Check common dataset */ if (check_dataset(fid, verbose, verbose_file, sym_com[v]->name, &record, mem_sid) < 0) return -1; - HDmemset(&record, 0, sizeof(record)); + memset(&record, 0, sizeof(record)); } /* end for */ } /* end if */ @@ -313,20 +313,20 @@ read_records(const char *filename, hbool_t verbose, FILE *verbose_file, unsigned if (nrandom > 0) { /* Emit informational message */ if (verbose) - HDfprintf(verbose_file, "Checking random symbols\n"); + fprintf(verbose_file, "Checking random symbols\n"); /* Iterate over random datasets */ for (v = 0; v < nrandom; v++) { /* Check random dataset */ if (check_dataset(fid, verbose, verbose_file, sym_rand[v]->name, &record, mem_sid) < 0) return -1; - HDmemset(&record, 0, sizeof(record)); + memset(&record, 0, sizeof(record)); } /* end for */ } /* end if */ /* Emit informational message */ if (verbose) - HDfprintf(verbose_file, "Closing file\n"); + fprintf(verbose_file, "Closing file\n"); /* Close the file */ if (H5Fclose(fid) < 0) @@ -349,18 +349,18 @@ read_records(const char *filename, hbool_t verbose, FILE *verbose_file, unsigned /* Emit informational message */ if (verbose) - HDfprintf(verbose_file, "Closing datasets\n"); + fprintf(verbose_file, "Closing datasets\n"); /* Close 'random' datasets, if any */ if (nrandom > 0) { /* Release array holding dataset ID's for random datasets */ - HDfree(sym_rand); + free(sym_rand); } /* end if */ /* Close 'common' datasets, if any */ if (ncommon > 0) { /* Release array holding dataset ID's for common datasets */ - HDfree(sym_com); + free(sym_com); } /* end if */ return 0; @@ -369,20 +369,20 @@ read_records(const char *filename, hbool_t verbose, FILE *verbose_file, unsigned static void usage(void) { - HDprintf("\n"); - HDprintf("Usage error!\n"); - HDprintf("\n"); - HDprintf("Usage: swmr_reader [-q] [-s <# of seconds to sleep between polling>]\n"); - HDprintf(" [-h <# of common symbols to poll>] [-l <# of random symbols to poll>]\n"); - HDprintf(" [-r <random seed>] <# of seconds to test>\n"); - HDprintf("\n"); - HDprintf("<# of seconds to test> must be specified.\n"); - HDprintf("\n"); - HDprintf("Defaults to verbose (no '-q' given), 1 second between polling ('-s 1'),\n"); - HDprintf("5 common symbols to poll ('-h 5'), 10 random symbols to poll ('-l 10'),\n"); - HDprintf("and will generate a random seed (no -r given).\n"); - HDprintf("\n"); - HDexit(EXIT_FAILURE); + printf("\n"); + printf("Usage error!\n"); + printf("\n"); + printf("Usage: swmr_reader [-q] [-s <# of seconds to sleep between polling>]\n"); + printf(" [-h <# of common symbols to poll>] [-l <# of random symbols to poll>]\n"); + printf(" [-r <random seed>] <# of seconds to test>\n"); + printf("\n"); + printf("<# of seconds to test> must be specified.\n"); + printf("\n"); + printf("Defaults to verbose (no '-q' given), 1 second between polling ('-s 1'),\n"); + printf("5 common symbols to poll ('-h 5'), 10 random symbols to poll ('-l 10'),\n"); + printf("and will generate a random seed (no -r given).\n"); + printf("\n"); + exit(EXIT_FAILURE); } int @@ -409,7 +409,7 @@ main(int argc, char *argv[]) switch (argv[u][1]) { /* # of common symbols to poll */ case 'h': - ncommon = HDatoi(argv[u + 1]); + ncommon = atoi(argv[u + 1]); if (ncommon < 0) usage(); u += 2; @@ -417,7 +417,7 @@ main(int argc, char *argv[]) /* # of random symbols to poll */ case 'l': - nrandom = HDatoi(argv[u + 1]); + nrandom = atoi(argv[u + 1]); if (nrandom < 0) usage(); u += 2; @@ -432,7 +432,7 @@ main(int argc, char *argv[]) /* Random # seed */ case 'r': use_seed = TRUE; - temp = HDatoi(argv[u + 1]); + temp = atoi(argv[u + 1]); if (temp < 0) usage(); else @@ -442,7 +442,7 @@ main(int argc, char *argv[]) /* # of seconds between polling */ case 's': - poll_time = HDatoi(argv[u + 1]); + poll_time = atoi(argv[u + 1]); if (poll_time < 0) usage(); u += 2; @@ -482,32 +482,32 @@ main(int argc, char *argv[]) char verbose_name[1024]; HDsnprintf(verbose_name, sizeof(verbose_name), "swmr_reader.out.%u", random_seed); - if (NULL == (verbose_file = HDfopen(verbose_name, "w"))) { - HDfprintf(stderr, "Can't open verbose output file!\n"); - HDexit(EXIT_FAILURE); + if (NULL == (verbose_file = fopen(verbose_name, "w"))) { + fprintf(stderr, "Can't open verbose output file!\n"); + exit(EXIT_FAILURE); } } /* end if */ /* Emit informational message */ if (verbose) { - HDfprintf(verbose_file, "Parameters:\n"); - HDfprintf(verbose_file, "\t# of seconds between polling = %d\n", poll_time); - HDfprintf(verbose_file, "\t# of common symbols to poll = %d\n", ncommon); - HDfprintf(verbose_file, "\t# of random symbols to poll = %d\n", nrandom); - HDfprintf(verbose_file, "\t# of seconds to test = %ld\n", nseconds); + fprintf(verbose_file, "Parameters:\n"); + fprintf(verbose_file, "\t# of seconds between polling = %d\n", poll_time); + fprintf(verbose_file, "\t# of common symbols to poll = %d\n", ncommon); + fprintf(verbose_file, "\t# of random symbols to poll = %d\n", nrandom); + fprintf(verbose_file, "\t# of seconds to test = %ld\n", nseconds); } /* end if */ /* ALWAYS emit the random seed for possible debugging */ - HDfprintf(stdout, "Using reader random seed: %u\n", random_seed); + fprintf(stdout, "Using reader random seed: %u\n", random_seed); /* Emit informational message */ if (verbose) - HDfprintf(verbose_file, "Generating symbol names\n"); + fprintf(verbose_file, "Generating symbol names\n"); /* Generate dataset names */ if (generate_symbols() < 0) { - HDfprintf(stderr, "Error generating symbol names!\n"); - HDexit(EXIT_FAILURE); + fprintf(stderr, "Error generating symbol names!\n"); + exit(EXIT_FAILURE); } /* end if */ /* Create datatype for creating datasets */ @@ -517,28 +517,28 @@ main(int argc, char *argv[]) /* Reading records from datasets */ if (read_records(FILENAME, verbose, verbose_file, random_seed, (unsigned long)nseconds, (unsigned)poll_time, (unsigned)ncommon, (unsigned)nrandom) < 0) { - HDfprintf(stderr, "Error reading records from datasets (random_seed = %u)!\n", random_seed); - HDexit(EXIT_FAILURE); + fprintf(stderr, "Error reading records from datasets (random_seed = %u)!\n", random_seed); + exit(EXIT_FAILURE); } /* end if */ /* Emit informational message */ if (verbose) - HDfprintf(verbose_file, "Releasing symbols\n"); + fprintf(verbose_file, "Releasing symbols\n"); /* Clean up the symbols */ if (shutdown_symbols() < 0) { - HDfprintf(stderr, "Error releasing symbols!\n"); - HDexit(EXIT_FAILURE); + fprintf(stderr, "Error releasing symbols!\n"); + exit(EXIT_FAILURE); } /* end if */ /* Emit informational message */ if (verbose) - HDfprintf(verbose_file, "Closing objects\n"); + fprintf(verbose_file, "Closing objects\n"); /* Close objects created */ if (H5Tclose(symbol_tid) < 0) { - HDfprintf(stderr, "Error closing symbol datatype!\n"); - HDexit(EXIT_FAILURE); + fprintf(stderr, "Error closing symbol datatype!\n"); + exit(EXIT_FAILURE); } /* end if */ return 0; diff --git a/test/swmr_remove_reader.c b/test/swmr_remove_reader.c index 82c6af6..5a4eccd 100644 --- a/test/swmr_remove_reader.c +++ b/test/swmr_remove_reader.c @@ -83,10 +83,10 @@ check_dataset(hid_t fid, unsigned verbose, const char *sym_name, symbol_t *recor hssize_t snpoints; /* Number of elements in dataset */ hsize_t start[2] = {0, 0}, count[2] = {1, 1}; /* Hyperslab selection values */ - HDassert(fid >= 0); - HDassert(sym_name); - HDassert(record); - HDassert(rec_sid >= 0); + assert(fid >= 0); + assert(sym_name); + assert(record); + assert(rec_sid >= 0); /* Open dataset for symbol */ if ((dsid = H5Dopen2(fid, sym_name, H5P_DEFAULT)) < 0) @@ -102,7 +102,7 @@ check_dataset(hid_t fid, unsigned verbose, const char *sym_name, symbol_t *recor /* Emit informational message */ if (verbose) - HDfprintf(stderr, "Symbol = '%s', # of records = %lld\n", sym_name, (long long)snpoints); + fprintf(stderr, "Symbol = '%s', # of records = %lld\n", sym_name, (long long)snpoints); /* Check if there are records for symbol */ if (snpoints > 0) { @@ -131,10 +131,10 @@ check_dataset(hid_t fid, unsigned verbose, const char *sym_name, symbol_t *recor * chunk may be deleted before the object header has the updated * dimensions */ if (record->rec_id != start[1] && record->rec_id != (uint64_t)0) { - HDfprintf(stderr, "*** ERROR ***\n"); - HDfprintf(stderr, "Incorrect record value!\n"); - HDfprintf(stderr, "Symbol = '%s', # of records = %lld, record->rec_id = %llx\n", sym_name, - (long long)snpoints, (unsigned long long)record->rec_id); + fprintf(stderr, "*** ERROR ***\n"); + fprintf(stderr, "Incorrect record value!\n"); + fprintf(stderr, "Symbol = '%s', # of records = %lld, record->rec_id = %llx\n", sym_name, + (long long)snpoints, (unsigned long long)record->rec_id); return -1; } /* end if */ } /* end if */ @@ -199,22 +199,22 @@ read_records(const char *filename, unsigned verbose, unsigned long nseconds, uns symbol_t record; /* The record to add to the dataset */ unsigned v; /* Local index variable */ - HDassert(filename); - HDassert(nseconds != 0); - HDassert(poll_time != 0); + assert(filename); + assert(nseconds != 0); + assert(poll_time != 0); /* Reset the record */ /* (record's 'info' field might need to change for each record written, also) */ - HDmemset(&record, 0, sizeof(record)); + memset(&record, 0, sizeof(record)); /* Emit informational message */ if (verbose) - HDfprintf(stderr, "Choosing datasets\n"); + fprintf(stderr, "Choosing datasets\n"); /* Allocate space for 'common' datasets, if any */ if (ncommon > 0) { /* Allocate array to hold pointers to symbols for common datasets */ - if (NULL == (sym_com = (symbol_info_t **)HDmalloc(sizeof(symbol_info_t *) * ncommon))) + if (NULL == (sym_com = (symbol_info_t **)malloc(sizeof(symbol_info_t *) * ncommon))) return -1; /* Open the common datasets */ @@ -228,14 +228,14 @@ read_records(const char *filename, unsigned verbose, unsigned long nseconds, uns /* Emit informational message */ if (verbose) - HDfprintf(stderr, "Common symbol #%u = '%s'\n", v, symbol_info[0][offset].name); + fprintf(stderr, "Common symbol #%u = '%s'\n", v, symbol_info[0][offset].name); } /* end for */ } /* end if */ /* Allocate space for 'random' datasets, if any */ if (nrandom > 0) { /* Allocate array to hold pointers to symbols for random datasets */ - if (NULL == (sym_rand = (symbol_info_t **)HDmalloc(sizeof(symbol_info_t *) * nrandom))) + if (NULL == (sym_rand = (symbol_info_t **)malloc(sizeof(symbol_info_t *) * nrandom))) return -1; /* Determine the random datasets */ @@ -249,7 +249,7 @@ read_records(const char *filename, unsigned verbose, unsigned long nseconds, uns /* Emit informational message */ if (verbose) - HDfprintf(stderr, "Random symbol #%u = '%s'\n", v, sym->name); + fprintf(stderr, "Random symbol #%u = '%s'\n", v, sym->name); } /* end for */ } /* end if */ @@ -259,7 +259,7 @@ read_records(const char *filename, unsigned verbose, unsigned long nseconds, uns /* Emit informational message */ if (verbose) - HDfprintf(stderr, "Reading records\n"); + fprintf(stderr, "Reading records\n"); /* Get the starting time */ start_time = HDtime(NULL); @@ -274,7 +274,7 @@ read_records(const char *filename, unsigned verbose, unsigned long nseconds, uns /* Emit informational message */ if (verbose) - HDfprintf(stderr, "Opening file: %s\n", filename); + fprintf(stderr, "Opening file: %s\n", filename); /* Open the file */ if ((fid = H5Fopen(filename, H5F_ACC_RDONLY | H5F_ACC_SWMR_READ, fapl)) < 0) @@ -284,14 +284,14 @@ read_records(const char *filename, unsigned verbose, unsigned long nseconds, uns if (ncommon > 0) { /* Emit informational message */ if (verbose) - HDfprintf(stderr, "Checking common symbols\n"); + fprintf(stderr, "Checking common symbols\n"); /* Iterate over common datasets */ for (v = 0; v < ncommon; v++) { /* Check common dataset */ if (check_dataset(fid, verbose, sym_com[v]->name, &record, mem_sid) < 0) return -1; - HDmemset(&record, 0, sizeof(record)); + memset(&record, 0, sizeof(record)); } /* end for */ } /* end if */ @@ -299,20 +299,20 @@ read_records(const char *filename, unsigned verbose, unsigned long nseconds, uns if (nrandom > 0) { /* Emit informational message */ if (verbose) - HDfprintf(stderr, "Checking random symbols\n"); + fprintf(stderr, "Checking random symbols\n"); /* Iterate over random datasets */ for (v = 0; v < nrandom; v++) { /* Check random dataset */ if (check_dataset(fid, verbose, sym_rand[v]->name, &record, mem_sid) < 0) return -1; - HDmemset(&record, 0, sizeof(record)); + memset(&record, 0, sizeof(record)); } /* end for */ } /* end if */ /* Emit informational message */ if (verbose) - HDfprintf(stderr, "Closing file\n"); + fprintf(stderr, "Closing file\n"); /* Close the file */ if (H5Fclose(fid) < 0) @@ -335,18 +335,18 @@ read_records(const char *filename, unsigned verbose, unsigned long nseconds, uns /* Emit informational message */ if (verbose) - HDfprintf(stderr, "Closing datasets\n"); + fprintf(stderr, "Closing datasets\n"); /* Close 'random' datasets, if any */ if (nrandom > 0) { /* Release array holding dataset ID's for random datasets */ - HDfree(sym_rand); + free(sym_rand); } /* end if */ /* Close 'common' datasets, if any */ if (ncommon > 0) { /* Release array holding dataset ID's for common datasets */ - HDfree(sym_com); + free(sym_com); } /* end if */ return 0; @@ -355,18 +355,18 @@ read_records(const char *filename, unsigned verbose, unsigned long nseconds, uns static void usage(void) { - HDprintf("\n"); - HDprintf("Usage error!\n"); - HDprintf("\n"); - HDprintf("Usage: swmr_remove_reader [-q] [-s <# of seconds to sleep between\n"); - HDprintf(" polling>] [-h <# of common symbols to poll>] [-l <# of random symbols\n"); - HDprintf(" to poll>] [-r <random seed>] <# of seconds to test>\n"); - HDprintf("\n"); - HDprintf("Defaults to verbose (no '-q' given), 1 second between polling ('-s 1'),\n"); - HDprintf("5 common symbols to poll ('-h 5'), 10 random symbols to poll ('-l 10'),\n"); - HDprintf("and will generate a random seed (no -r given).\n"); - HDprintf("\n"); - HDexit(EXIT_FAILURE); + printf("\n"); + printf("Usage error!\n"); + printf("\n"); + printf("Usage: swmr_remove_reader [-q] [-s <# of seconds to sleep between\n"); + printf(" polling>] [-h <# of common symbols to poll>] [-l <# of random symbols\n"); + printf(" to poll>] [-r <random seed>] <# of seconds to test>\n"); + printf("\n"); + printf("Defaults to verbose (no '-q' given), 1 second between polling ('-s 1'),\n"); + printf("5 common symbols to poll ('-h 5'), 10 random symbols to poll ('-l 10'),\n"); + printf("and will generate a random seed (no -r given).\n"); + printf("\n"); + exit(EXIT_FAILURE); } int @@ -392,7 +392,7 @@ main(int argc, char *argv[]) switch (argv[u][1]) { /* # of common symbols to poll */ case 'h': - ncommon = HDatoi(argv[u + 1]); + ncommon = atoi(argv[u + 1]); if (ncommon < 0) usage(); u += 2; @@ -400,7 +400,7 @@ main(int argc, char *argv[]) /* # of random symbols to poll */ case 'l': - nrandom = HDatoi(argv[u + 1]); + nrandom = atoi(argv[u + 1]); if (nrandom < 0) usage(); u += 2; @@ -415,7 +415,7 @@ main(int argc, char *argv[]) /* Random # seed */ case 'r': use_seed = 1; - temp = HDatoi(argv[u + 1]); + temp = atoi(argv[u + 1]); if (temp < 0) usage(); else @@ -425,7 +425,7 @@ main(int argc, char *argv[]) /* # of seconds between polling */ case 's': - poll_time = HDatoi(argv[u + 1]); + poll_time = atoi(argv[u + 1]); if (poll_time < 0) usage(); u += 2; @@ -453,11 +453,11 @@ main(int argc, char *argv[]) /* Emit informational message */ if (verbose) { - HDfprintf(stderr, "Parameters:\n"); - HDfprintf(stderr, "\t# of seconds between polling = %d\n", poll_time); - HDfprintf(stderr, "\t# of common symbols to poll = %d\n", ncommon); - HDfprintf(stderr, "\t# of random symbols to poll = %d\n", nrandom); - HDfprintf(stderr, "\t# of seconds to test = %ld\n", nseconds); + fprintf(stderr, "Parameters:\n"); + fprintf(stderr, "\t# of seconds between polling = %d\n", poll_time); + fprintf(stderr, "\t# of common symbols to poll = %d\n", ncommon); + fprintf(stderr, "\t# of random symbols to poll = %d\n", nrandom); + fprintf(stderr, "\t# of seconds to test = %ld\n", nseconds); } /* end if */ /* Set the random seed */ @@ -468,16 +468,16 @@ main(int argc, char *argv[]) } /* end if */ HDsrandom(random_seed); /* ALWAYS emit the random seed for possible debugging */ - HDfprintf(stderr, "Using reader random seed: %u\n", random_seed); + fprintf(stderr, "Using reader random seed: %u\n", random_seed); /* Emit informational message */ if (verbose) - HDfprintf(stderr, "Generating symbol names\n"); + fprintf(stderr, "Generating symbol names\n"); /* Generate dataset names */ if (generate_symbols() < 0) { - HDfprintf(stderr, "Error generating symbol names!\n"); - HDexit(EXIT_FAILURE); + fprintf(stderr, "Error generating symbol names!\n"); + exit(EXIT_FAILURE); } /* end if */ /* Create datatype for creating datasets */ @@ -487,28 +487,28 @@ main(int argc, char *argv[]) /* Reading records from datasets */ if (read_records(FILENAME, verbose, (unsigned long)nseconds, (unsigned)poll_time, (unsigned)ncommon, (unsigned)nrandom) < 0) { - HDfprintf(stderr, "Error reading records from datasets!\n"); - HDexit(EXIT_FAILURE); + fprintf(stderr, "Error reading records from datasets!\n"); + exit(EXIT_FAILURE); } /* end if */ /* Emit informational message */ if (verbose) - HDfprintf(stderr, "Releasing symbols\n"); + fprintf(stderr, "Releasing symbols\n"); /* Clean up the symbols */ if (shutdown_symbols() < 0) { - HDfprintf(stderr, "Error releasing symbols!\n"); - HDexit(EXIT_FAILURE); + fprintf(stderr, "Error releasing symbols!\n"); + exit(EXIT_FAILURE); } /* end if */ /* Emit informational message */ if (verbose) - HDfprintf(stderr, "Closing objects\n"); + fprintf(stderr, "Closing objects\n"); /* Close objects created */ if (H5Tclose(symbol_tid) < 0) { - HDfprintf(stderr, "Error closing symbol datatype!\n"); - HDexit(EXIT_FAILURE); + fprintf(stderr, "Error closing symbol datatype!\n"); + exit(EXIT_FAILURE); } /* end if */ return 0; diff --git a/test/swmr_remove_writer.c b/test/swmr_remove_writer.c index da09b2b..9e29d71 100644 --- a/test/swmr_remove_writer.c +++ b/test/swmr_remove_writer.c @@ -75,7 +75,7 @@ open_skeleton(const char *filename, unsigned verbose, unsigned old) hsize_t dim[2]; /* Dataspace dimensions */ unsigned u, v; /* Local index variable */ - HDassert(filename); + assert(filename); /* Create file access property list */ if ((fapl = h5_fileaccess()) < 0) @@ -97,7 +97,7 @@ open_skeleton(const char *filename, unsigned verbose, unsigned old) /* Emit informational message */ if (verbose) - HDfprintf(stderr, "Opening datasets\n"); + fprintf(stderr, "Opening datasets\n"); /* Open the datasets */ for (u = 0; u < NLEVELS; u++) @@ -146,7 +146,7 @@ remove_records(hid_t fid, unsigned verbose, unsigned long nshrinks, unsigned lon hsize_t dim[2] = {1, 0}; /* Dataspace dimensions */ unsigned long u, v; /* Local index variables */ - HDassert(fid >= 0); + assert(fid >= 0); /* Remove records from random datasets, according to frequency distribution */ shrink_to_flush = flush_count; @@ -186,7 +186,7 @@ remove_records(hid_t fid, unsigned verbose, unsigned long nshrinks, unsigned lon /* Emit informational message */ if (verbose) - HDfprintf(stderr, "Closing datasets\n"); + fprintf(stderr, "Closing datasets\n"); /* Close the datasets */ for (u = 0; u < NLEVELS; u++) @@ -200,19 +200,19 @@ remove_records(hid_t fid, unsigned verbose, unsigned long nshrinks, unsigned lon static void usage(void) { - HDprintf("\n"); - HDprintf("Usage error!\n"); - HDprintf("\n"); - HDprintf("Usage: swmr_remove_writer [-q] [-o] [-f <# of shrinks between flushing\n"); - HDprintf(" file contents>] [-r <random seed>] <# of shrinks>\n"); - HDprintf("\n"); - HDprintf("<# of shrinks between flushing file contents> should be 0 (for no\n"); - HDprintf("flushing) or between 1 and (<# of shrinks> - 1)\n"); - HDprintf("\n"); - HDprintf("Defaults to verbose (no '-q' given), latest format when opening file (no '-o' given),\n"); - HDprintf("flushing every 1000 shrinks ('-f 1000'), and will generate a random seed (no -r given).\n"); - HDprintf("\n"); - HDexit(EXIT_FAILURE); + printf("\n"); + printf("Usage error!\n"); + printf("\n"); + printf("Usage: swmr_remove_writer [-q] [-o] [-f <# of shrinks between flushing\n"); + printf(" file contents>] [-r <random seed>] <# of shrinks>\n"); + printf("\n"); + printf("<# of shrinks between flushing file contents> should be 0 (for no\n"); + printf("flushing) or between 1 and (<# of shrinks> - 1)\n"); + printf("\n"); + printf("Defaults to verbose (no '-q' given), latest format when opening file (no '-o' given),\n"); + printf("flushing every 1000 shrinks ('-f 1000'), and will generate a random seed (no -r given).\n"); + printf("\n"); + exit(EXIT_FAILURE); } int @@ -253,7 +253,7 @@ main(int argc, char *argv[]) /* Random # seed */ case 'r': use_seed = 1; - temp = HDatoi(argv[u + 1]); + temp = atoi(argv[u + 1]); random_seed = (unsigned)temp; u += 2; break; @@ -286,9 +286,9 @@ main(int argc, char *argv[]) /* Emit informational message */ if (verbose) { - HDfprintf(stderr, "Parameters:\n"); - HDfprintf(stderr, "\t# of shrinks between flushes = %ld\n", flush_count); - HDfprintf(stderr, "\t# of shrinks = %ld\n", nshrinks); + fprintf(stderr, "Parameters:\n"); + fprintf(stderr, "\t# of shrinks between flushes = %ld\n", flush_count); + fprintf(stderr, "\t# of shrinks = %ld\n", nshrinks); } /* end if */ /* Set the random seed */ @@ -299,11 +299,11 @@ main(int argc, char *argv[]) } /* end if */ HDsrandom(random_seed); /* ALWAYS emit the random seed for possible debugging */ - HDfprintf(stderr, "Using writer random seed: %u\n", random_seed); + fprintf(stderr, "Using writer random seed: %u\n", random_seed); /* Emit informational message */ if (verbose) - HDfprintf(stderr, "Generating symbol names\n"); + fprintf(stderr, "Generating symbol names\n"); /* Generate dataset names */ if (generate_symbols() < 0) @@ -311,12 +311,12 @@ main(int argc, char *argv[]) /* Emit informational message */ if (verbose) - HDfprintf(stderr, "Opening skeleton file: %s\n", FILENAME); + fprintf(stderr, "Opening skeleton file: %s\n", FILENAME); /* Open file skeleton */ if ((fid = open_skeleton(FILENAME, verbose, old)) < 0) { - HDfprintf(stderr, "Error opening skeleton file!\n"); - HDexit(EXIT_FAILURE); + fprintf(stderr, "Error opening skeleton file!\n"); + exit(EXIT_FAILURE); } /* end if */ /* Send a message to indicate "H5Fopen" is complete--releasing the file lock */ @@ -324,32 +324,32 @@ main(int argc, char *argv[]) /* Emit informational message */ if (verbose) - HDfprintf(stderr, "Removing records\n"); + fprintf(stderr, "Removing records\n"); /* Remove records from datasets */ if (remove_records(fid, verbose, (unsigned long)nshrinks, (unsigned long)flush_count) < 0) { - HDfprintf(stderr, "Error removing records from datasets!\n"); - HDexit(EXIT_FAILURE); + fprintf(stderr, "Error removing records from datasets!\n"); + exit(EXIT_FAILURE); } /* end if */ /* Emit informational message */ if (verbose) - HDfprintf(stderr, "Releasing symbols\n"); + fprintf(stderr, "Releasing symbols\n"); /* Clean up the symbols */ if (shutdown_symbols() < 0) { - HDfprintf(stderr, "Error releasing symbols!\n"); - HDexit(EXIT_FAILURE); + fprintf(stderr, "Error releasing symbols!\n"); + exit(EXIT_FAILURE); } /* end if */ /* Emit informational message */ if (verbose) - HDfprintf(stderr, "Closing objects\n"); + fprintf(stderr, "Closing objects\n"); /* Close objects opened */ if (H5Fclose(fid) < 0) { - HDfprintf(stderr, "Error closing file!\n"); - HDexit(EXIT_FAILURE); + fprintf(stderr, "Error closing file!\n"); + exit(EXIT_FAILURE); } /* end if */ return 0; diff --git a/test/swmr_sparse_reader.c b/test/swmr_sparse_reader.c index cc38fb8..0205db3 100644 --- a/test/swmr_sparse_reader.c +++ b/test/swmr_sparse_reader.c @@ -91,10 +91,10 @@ check_dataset(hid_t fid, unsigned verbose, const symbol_info_t *symbol, symbol_t hsize_t start[2] = {0, 0}; /* Hyperslab selection values */ hsize_t count[2] = {1, 1}; /* Hyperslab selection values */ - HDassert(fid >= 0); - HDassert(symbol); - HDassert(record); - HDassert(rec_sid >= 0); + assert(fid >= 0); + assert(symbol); + assert(record); + assert(rec_sid >= 0); /* Open dataset for symbol */ if ((dsid = H5Dopen2(fid, symbol->name, H5P_DEFAULT)) < 0) @@ -112,8 +112,8 @@ check_dataset(hid_t fid, unsigned verbose, const symbol_info_t *symbol, symbol_t /* Emit informational message */ if (verbose) - HDfprintf(stderr, "Symbol = '%s', location = %" PRIuMAX ",%" PRIuMAX "\n", symbol->name, - (uintmax_t)start[0], (uintmax_t)start[1]); + fprintf(stderr, "Symbol = '%s', location = %" PRIuMAX ",%" PRIuMAX "\n", symbol->name, + (uintmax_t)start[0], (uintmax_t)start[1]); /* Read record from dataset */ record->rec_id = UINT64_MAX; @@ -122,11 +122,10 @@ check_dataset(hid_t fid, unsigned verbose, const symbol_info_t *symbol, symbol_t /* Verify record value */ if (record->rec_id != start[1]) { - HDfprintf(stderr, "*** ERROR ***\n"); - HDfprintf(stderr, "Incorrect record value!\n"); - HDfprintf(stderr, - "Symbol = '%s', location = %" PRIuMAX ",%" PRIuMAX ", record->rec_id = %" PRIu64 "\n", - symbol->name, (uintmax_t)start[0], (uintmax_t)start[1], record->rec_id); + fprintf(stderr, "*** ERROR ***\n"); + fprintf(stderr, "Incorrect record value!\n"); + fprintf(stderr, "Symbol = '%s', location = %" PRIuMAX ",%" PRIuMAX ", record->rec_id = %" PRIu64 "\n", + symbol->name, (uintmax_t)start[0], (uintmax_t)start[1], record->rec_id); return -1; } /* end if */ @@ -182,8 +181,8 @@ read_records(const char *filename, unsigned verbose, unsigned long nrecords, uns unsigned long u; /* Local index variable */ hid_t fapl; - HDassert(filename); - HDassert(poll_time != 0); + assert(filename); + assert(poll_time != 0); /* Create file access property list */ if ((fapl = h5_fileaccess()) < 0) @@ -193,7 +192,7 @@ read_records(const char *filename, unsigned verbose, unsigned long nrecords, uns /* Emit informational message */ if (verbose) - HDfprintf(stderr, "Opening file: %s\n", filename); + fprintf(stderr, "Opening file: %s\n", filename); /* Open the file */ if ((fid = H5Fopen(filename, H5F_ACC_RDONLY | H5F_ACC_SWMR_READ, fapl)) < 0) @@ -210,7 +209,7 @@ read_records(const char *filename, unsigned verbose, unsigned long nrecords, uns /* Reset the record */ /* (record's 'info' field might need to change for each record written, also) */ - HDmemset(&record, 0, sizeof(record)); + memset(&record, 0, sizeof(record)); /* Create a dataspace for the record to read */ if ((mem_sid = H5Screate(H5S_SCALAR)) < 0) @@ -218,7 +217,7 @@ read_records(const char *filename, unsigned verbose, unsigned long nrecords, uns /* Emit informational message */ if (verbose) - HDfprintf(stderr, "Reading records\n"); + fprintf(stderr, "Reading records\n"); /* Get the starting time */ start_time = HDtime(NULL); @@ -259,7 +258,7 @@ read_records(const char *filename, unsigned verbose, unsigned long nrecords, uns /* Check for timeout */ if (HDtime(NULL) >= (time_t)(start_time + (time_t)TIMEOUT)) { - HDfprintf(stderr, "Reader timed out\n"); + fprintf(stderr, "Reader timed out\n"); return -1; } /* end if */ @@ -268,7 +267,7 @@ read_records(const char *filename, unsigned verbose, unsigned long nrecords, uns /* Retrieve and print the collection of metadata read retries */ if (print_metadata_retries_info(fid) < 0) - HDfprintf(stderr, "Warning: could not obtain metadata retries info\n"); + fprintf(stderr, "Warning: could not obtain metadata retries info\n"); /* Reopen the file */ if (H5Fclose(fid) < 0) @@ -280,23 +279,23 @@ read_records(const char *filename, unsigned verbose, unsigned long nrecords, uns /* Emit informational message */ if (verbose) - HDfprintf(stderr, "Checking dataset %lu\n", u); + fprintf(stderr, "Checking dataset %lu\n", u); /* Check dataset */ if (check_dataset(fid, verbose, symbol, &record, mem_sid) < 0) return -1; - HDmemset(&record, 0, sizeof(record)); + memset(&record, 0, sizeof(record)); /* Check for reopen */ iter_to_reopen--; if (iter_to_reopen == 0) { /* Emit informational message */ if (verbose) - HDfprintf(stderr, "Reopening file: %s\n", filename); + fprintf(stderr, "Reopening file: %s\n", filename); /* Retrieve and print the collection of metadata read retries */ if (print_metadata_retries_info(fid) < 0) - HDfprintf(stderr, "Warning: could not obtain metadata retries info\n"); + fprintf(stderr, "Warning: could not obtain metadata retries info\n"); /* Reopen the file */ if (H5Fclose(fid) < 0) @@ -309,7 +308,7 @@ read_records(const char *filename, unsigned verbose, unsigned long nrecords, uns /* Retrieve and print the collection of metadata read retries */ if (print_metadata_retries_info(fid) < 0) - HDfprintf(stderr, "Warning: could not obtain metadata retries info\n"); + fprintf(stderr, "Warning: could not obtain metadata retries info\n"); /* Close file */ if (H5Fclose(fid) < 0) @@ -325,19 +324,19 @@ read_records(const char *filename, unsigned verbose, unsigned long nrecords, uns static void usage(void) { - HDprintf("\n"); - HDprintf("Usage error!\n"); - HDprintf("\n"); - HDprintf("Usage: swmr_sparse_reader [-q] [-s <# of seconds to wait for writer>]\n"); - HDprintf(" [-n <# of reads between reopens>] <# of records>\n"); - HDprintf("\n"); - HDprintf("Defaults to verbose (no '-q' given), 1 second wait ('-s 1') and 1 read\n"); - HDprintf("between reopens ('-r 1')\n"); - HDprintf("\n"); - HDprintf("Note that the # of records *must* be the same as that supplied to\n"); - HDprintf("swmr_sparse_writer\n"); - HDprintf("\n"); - HDexit(EXIT_FAILURE); + printf("\n"); + printf("Usage error!\n"); + printf("\n"); + printf("Usage: swmr_sparse_reader [-q] [-s <# of seconds to wait for writer>]\n"); + printf(" [-n <# of reads between reopens>] <# of records>\n"); + printf("\n"); + printf("Defaults to verbose (no '-q' given), 1 second wait ('-s 1') and 1 read\n"); + printf("between reopens ('-r 1')\n"); + printf("\n"); + printf("Note that the # of records *must* be the same as that supplied to\n"); + printf("swmr_sparse_writer\n"); + printf("\n"); + exit(EXIT_FAILURE); } /* end usage() */ int @@ -359,7 +358,7 @@ main(int argc, char *argv[]) switch (argv[u][1]) { /* # of reads between reopens */ case 'n': - reopen_count = HDatoi(argv[u + 1]); + reopen_count = atoi(argv[u + 1]); if (reopen_count < 0) usage(); u += 2; @@ -373,7 +372,7 @@ main(int argc, char *argv[]) /* # of seconds between polling */ case 's': - poll_time = HDatoi(argv[u + 1]); + poll_time = atoi(argv[u + 1]); if (poll_time < 0) usage(); u += 2; @@ -397,20 +396,20 @@ main(int argc, char *argv[]) /* Emit informational message */ if (verbose) { - HDfprintf(stderr, "Parameters:\n"); - HDfprintf(stderr, "\t# of seconds between polling = %d\n", poll_time); - HDfprintf(stderr, "\t# of reads between reopens = %d\n", reopen_count); - HDfprintf(stderr, "\t# of records to read = %ld\n", nrecords); + fprintf(stderr, "Parameters:\n"); + fprintf(stderr, "\t# of seconds between polling = %d\n", poll_time); + fprintf(stderr, "\t# of reads between reopens = %d\n", reopen_count); + fprintf(stderr, "\t# of records to read = %ld\n", nrecords); } /* end if */ /* Emit informational message */ if (verbose) - HDfprintf(stderr, "Generating symbol names\n"); + fprintf(stderr, "Generating symbol names\n"); /* Generate dataset names */ if (generate_symbols() < 0) { - HDfprintf(stderr, "Error generating symbol names!\n"); - HDexit(EXIT_FAILURE); + fprintf(stderr, "Error generating symbol names!\n"); + exit(EXIT_FAILURE); } /* end if */ /* Create datatype for creating datasets */ @@ -420,28 +419,28 @@ main(int argc, char *argv[]) /* Reading records from datasets */ if (read_records(FILENAME, verbose, (unsigned long)nrecords, (unsigned)poll_time, (unsigned)reopen_count) < 0) { - HDfprintf(stderr, "Error reading records from datasets!\n"); - HDexit(EXIT_FAILURE); + fprintf(stderr, "Error reading records from datasets!\n"); + exit(EXIT_FAILURE); } /* end if */ /* Emit informational message */ if (verbose) - HDfprintf(stderr, "Releasing symbols\n"); + fprintf(stderr, "Releasing symbols\n"); /* Clean up the symbols */ if (shutdown_symbols() < 0) { - HDfprintf(stderr, "Error releasing symbols!\n"); - HDexit(EXIT_FAILURE); + fprintf(stderr, "Error releasing symbols!\n"); + exit(EXIT_FAILURE); } /* end if */ /* Emit informational message */ if (verbose) - HDfprintf(stderr, "Closing objects\n"); + fprintf(stderr, "Closing objects\n"); /* Close objects created */ if (H5Tclose(symbol_tid) < 0) { - HDfprintf(stderr, "Error closing symbol datatype!\n"); - HDexit(EXIT_FAILURE); + fprintf(stderr, "Error closing symbol datatype!\n"); + exit(EXIT_FAILURE); } /* end if */ return 0; diff --git a/test/swmr_sparse_writer.c b/test/swmr_sparse_writer.c index 3644d89..79889b1 100644 --- a/test/swmr_sparse_writer.c +++ b/test/swmr_sparse_writer.c @@ -73,7 +73,7 @@ open_skeleton(const char *filename, unsigned verbose) unsigned seed; /* Seed for random number generator */ unsigned u, v; /* Local index variable */ - HDassert(filename); + assert(filename); /* Create file access property list */ if ((fapl = h5_fileaccess()) < 0) @@ -93,7 +93,7 @@ open_skeleton(const char *filename, unsigned verbose) /* Emit informational message */ if (verbose) - HDfprintf(stderr, "Opening datasets\n"); + fprintf(stderr, "Opening datasets\n"); /* Seed the random number generator with the attribute in the file */ if ((aid = H5Aopen(fid, "seed", H5P_DEFAULT)) < 0) @@ -153,11 +153,11 @@ add_records(hid_t fid, unsigned verbose, unsigned long nrecords, unsigned long f hsize_t dim[2] = {1, 0}; /* Dataspace dimensions */ unsigned long u, v; /* Local index variables */ - HDassert(fid >= 0); + assert(fid >= 0); /* Reset the record */ /* (record's 'info' field might need to change for each record written, also) */ - HDmemset(&record, 0, sizeof(record)); + memset(&record, 0, sizeof(record)); /* Create a dataspace for the record to add */ if ((mem_sid = H5Screate(H5S_SCALAR)) < 0) @@ -287,7 +287,7 @@ add_records(hid_t fid, unsigned verbose, unsigned long nrecords, unsigned long f /* Emit informational message */ if (verbose) - HDfprintf(stderr, "Closing datasets\n"); + fprintf(stderr, "Closing datasets\n"); /* Close the datasets */ for (u = 0; u < NLEVELS; u++) @@ -301,19 +301,19 @@ add_records(hid_t fid, unsigned verbose, unsigned long nrecords, unsigned long f static void usage(void) { - HDprintf("\n"); - HDprintf("Usage error!\n"); - HDprintf("\n"); - HDprintf("Usage: swmr_sparse_writer [-q] [-f <# of records to write between\n"); - HDprintf(" flushing file contents>] <# of records>\n"); - HDprintf("\n"); - HDprintf("<# of records to write between flushing file contents> should be 0\n"); - HDprintf("(for no flushing) or between 1 and (<# of records> - 1)\n"); - HDprintf("\n"); - HDprintf("Defaults to verbose (no '-q' given) and flushing every 1000 records\n"); - HDprintf("('-f 1000')\n"); - HDprintf("\n"); - HDexit(EXIT_FAILURE); + printf("\n"); + printf("Usage error!\n"); + printf("\n"); + printf("Usage: swmr_sparse_writer [-q] [-f <# of records to write between\n"); + printf(" flushing file contents>] <# of records>\n"); + printf("\n"); + printf("<# of records to write between flushing file contents> should be 0\n"); + printf("(for no flushing) or between 1 and (<# of records> - 1)\n"); + printf("\n"); + printf("Defaults to verbose (no '-q' given) and flushing every 1000 records\n"); + printf("('-f 1000')\n"); + printf("\n"); + exit(EXIT_FAILURE); } int @@ -369,14 +369,14 @@ main(int argc, char *argv[]) /* Emit informational message */ if (verbose) { - HDfprintf(stderr, "Parameters:\n"); - HDfprintf(stderr, "\t# of records between flushes = %ld\n", flush_count); - HDfprintf(stderr, "\t# of records to write = %ld\n", nrecords); + fprintf(stderr, "Parameters:\n"); + fprintf(stderr, "\t# of records between flushes = %ld\n", flush_count); + fprintf(stderr, "\t# of records to write = %ld\n", nrecords); } /* end if */ /* Emit informational message */ if (verbose) - HDfprintf(stderr, "Generating symbol names\n"); + fprintf(stderr, "Generating symbol names\n"); /* Generate dataset names */ if (generate_symbols() < 0) @@ -384,12 +384,12 @@ main(int argc, char *argv[]) /* Emit informational message */ if (verbose) - HDfprintf(stderr, "Opening skeleton file: %s\n", FILENAME); + fprintf(stderr, "Opening skeleton file: %s\n", FILENAME); /* Open file skeleton */ if ((fid = open_skeleton(FILENAME, verbose)) < 0) { - HDfprintf(stderr, "Error opening skeleton file!\n"); - HDexit(EXIT_FAILURE); + fprintf(stderr, "Error opening skeleton file!\n"); + exit(EXIT_FAILURE); } /* end if */ /* Send a message to indicate "H5Fopen" is complete--releasing the file lock */ @@ -397,32 +397,32 @@ main(int argc, char *argv[]) /* Emit informational message */ if (verbose) - HDfprintf(stderr, "Adding records\n"); + fprintf(stderr, "Adding records\n"); /* Append records to datasets */ if (add_records(fid, verbose, (unsigned long)nrecords, (unsigned long)flush_count) < 0) { - HDfprintf(stderr, "Error appending records to datasets!\n"); - HDexit(EXIT_FAILURE); + fprintf(stderr, "Error appending records to datasets!\n"); + exit(EXIT_FAILURE); } /* end if */ /* Emit informational message */ if (verbose) - HDfprintf(stderr, "Releasing symbols\n"); + fprintf(stderr, "Releasing symbols\n"); /* Clean up the symbols */ if (shutdown_symbols() < 0) { - HDfprintf(stderr, "Error releasing symbols!\n"); - HDexit(EXIT_FAILURE); + fprintf(stderr, "Error releasing symbols!\n"); + exit(EXIT_FAILURE); } /* end if */ /* Emit informational message */ if (verbose) - HDfprintf(stderr, "Closing objects\n"); + fprintf(stderr, "Closing objects\n"); /* Close objects opened */ if (H5Fclose(fid) < 0) { - HDfprintf(stderr, "Error closing file!\n"); - HDexit(EXIT_FAILURE); + fprintf(stderr, "Error closing file!\n"); + exit(EXIT_FAILURE); } /* end if */ return 0; diff --git a/test/swmr_start_write.c b/test/swmr_start_write.c index cd02457..78953d8 100644 --- a/test/swmr_start_write.c +++ b/test/swmr_start_write.c @@ -71,7 +71,7 @@ create_file(const char *filename, hbool_t verbose, FILE *verbose_file, unsigned hid_t sid; /* Dataspace ID */ hid_t aid; /* Attribute ID */ - HDassert(filename); + assert(filename); /* Create file access property list */ if ((fapl = h5_fileaccess()) < 0) @@ -87,7 +87,7 @@ create_file(const char *filename, hbool_t verbose, FILE *verbose_file, unsigned /* Emit informational message */ if (verbose) - HDfprintf(verbose_file, "Creating file without SWMR access\n"); + fprintf(verbose_file, "Creating file without SWMR access\n"); /* Create the file */ if ((fid = H5Fcreate(filename, H5F_ACC_TRUNC, fcpl, fapl)) < 0) @@ -145,7 +145,7 @@ create_datasets(hid_t fid, int comp_level, hbool_t verbose, FILE *verbose_file, hsize_t chunk_dims[2] = {1, CHUNK_SIZE}; /* Chunk dimensions */ unsigned u, v; /* Local index variable */ - HDassert(index_type); + assert(index_type); /* Create datatype for creating datasets */ if ((tid = create_symbol_datatype()) < 0) @@ -174,7 +174,7 @@ create_datasets(hid_t fid, int comp_level, hbool_t verbose, FILE *verbose_file, /* Emit informational message */ if (verbose) - HDfprintf(verbose_file, "Creating datasets\n"); + fprintf(verbose_file, "Creating datasets\n"); /* Create the datasets */ for (u = 0; u < NLEVELS; u++) @@ -219,11 +219,11 @@ add_records(hid_t fid, hbool_t verbose, FILE *verbose_file, unsigned long nrecor unsigned long rec_to_flush; /* # of records left to write before flush */ unsigned long u, v; /* Local index variables */ - HDassert(fid >= 0); + assert(fid >= 0); /* Reset the record */ /* (record's 'info' field might need to change for each record written, also) */ - HDmemset(&record, 0, sizeof(record)); + memset(&record, 0, sizeof(record)); /* Create a dataspace for the record to add */ if ((mem_sid = H5Screate(H5S_SCALAR)) < 0) @@ -306,7 +306,7 @@ add_records(hid_t fid, hbool_t verbose, FILE *verbose_file, unsigned long nrecor /* Emit informational message */ if (verbose) - HDfprintf(verbose_file, "Closing datasets\n"); + fprintf(verbose_file, "Closing datasets\n"); /* Close the datasets */ for (u = 0; u < NLEVELS; u++) @@ -320,27 +320,27 @@ add_records(hid_t fid, hbool_t verbose, FILE *verbose_file, unsigned long nrecor static void usage(void) { - HDprintf("\n"); - HDprintf("Usage error!\n"); - HDprintf("\n"); - HDprintf("Usage: swmr_start_write [-f <# of records to write between flushing file contents>]\n"); - HDprintf(" [-i <index type>] [-c <deflate compression level>]\n"); - HDprintf(" [-r <random seed>] [-q] <# of records>\n"); - HDprintf("\n"); - HDprintf("<# of records to write between flushing file contents> should be 0\n"); - HDprintf("(for no flushing) or between 1 and (<# of records> - 1).\n"); - HDprintf("\n"); - HDprintf("<index type> should be b2 or ea\n"); - HDprintf("\n"); - HDprintf("<deflate compression level> should be -1 (for no compression) or 0-9\n"); - HDprintf("\n"); - HDprintf("<# of records> must be specified.\n"); - HDprintf("\n"); - HDprintf("Defaults to flushing every 10000 records ('-f 10000'),\n"); - HDprintf("v1 b-tree indexing (-i b1), compression ('-c -1'),\n"); - HDprintf("will generate a random seed (no -r given), and verbose (no '-q' given)\n"); - HDprintf("\n"); - HDexit(EXIT_FAILURE); + printf("\n"); + printf("Usage error!\n"); + printf("\n"); + printf("Usage: swmr_start_write [-f <# of records to write between flushing file contents>]\n"); + printf(" [-i <index type>] [-c <deflate compression level>]\n"); + printf(" [-r <random seed>] [-q] <# of records>\n"); + printf("\n"); + printf("<# of records to write between flushing file contents> should be 0\n"); + printf("(for no flushing) or between 1 and (<# of records> - 1).\n"); + printf("\n"); + printf("<index type> should be b2 or ea\n"); + printf("\n"); + printf("<deflate compression level> should be -1 (for no compression) or 0-9\n"); + printf("\n"); + printf("<# of records> must be specified.\n"); + printf("\n"); + printf("Defaults to flushing every 10000 records ('-f 10000'),\n"); + printf("v1 b-tree indexing (-i b1), compression ('-c -1'),\n"); + printf("will generate a random seed (no -r given), and verbose (no '-q' given)\n"); + printf("\n"); + exit(EXIT_FAILURE); } /* usage() */ /* @@ -375,7 +375,7 @@ main(int argc, char *argv[]) switch (argv[u][1]) { /* Compress dataset chunks */ case 'c': - comp_level = HDatoi(argv[u + 1]); + comp_level = atoi(argv[u + 1]); if (comp_level < -1 || comp_level > 9) usage(); u += 2; @@ -406,7 +406,7 @@ main(int argc, char *argv[]) /* Random # seed */ case 'r': use_seed = TRUE; - temp = HDatoi(argv[u + 1]); + temp = atoi(argv[u + 1]); if (temp < 0) usage(); else @@ -449,33 +449,33 @@ main(int argc, char *argv[]) char verbose_name[1024]; HDsnprintf(verbose_name, sizeof(verbose_name), "swmr_writer.out.%u", random_seed); - if (NULL == (verbose_file = HDfopen(verbose_name, "w"))) { - HDfprintf(stderr, "Can't open verbose output file!\n"); - HDexit(EXIT_FAILURE); + if (NULL == (verbose_file = fopen(verbose_name, "w"))) { + fprintf(stderr, "Can't open verbose output file!\n"); + exit(EXIT_FAILURE); } } /* end if */ /* Emit informational message */ if (verbose) { - HDfprintf(verbose_file, "Parameters:\n"); - HDfprintf(verbose_file, "\tindex type = %s\n", index_type); - HDfprintf(verbose_file, "\tcompression level = %d\n", comp_level); - HDfprintf(verbose_file, "\t# of records between flushes = %ld\n", flush_count); - HDfprintf(verbose_file, "\t# of records to write = %ld\n", nrecords); + fprintf(verbose_file, "Parameters:\n"); + fprintf(verbose_file, "\tindex type = %s\n", index_type); + fprintf(verbose_file, "\tcompression level = %d\n", comp_level); + fprintf(verbose_file, "\t# of records between flushes = %ld\n", flush_count); + fprintf(verbose_file, "\t# of records to write = %ld\n", nrecords); } /* end if */ /* ALWAYS emit the random seed for possible debugging */ - HDfprintf(stdout, "Using writer random seed: %u\n", random_seed); + fprintf(stdout, "Using writer random seed: %u\n", random_seed); /* Create the test file */ if ((fid = create_file(FILENAME, verbose, verbose_file, random_seed)) < 0) { - HDfprintf(stderr, "Error creating the file...\n"); - HDexit(EXIT_FAILURE); + fprintf(stderr, "Error creating the file...\n"); + exit(EXIT_FAILURE); } /* Emit informational message */ if (verbose) - HDfprintf(verbose_file, "Generating symbol names\n"); + fprintf(verbose_file, "Generating symbol names\n"); /* Generate dataset names */ if (generate_symbols() < 0) @@ -483,14 +483,14 @@ main(int argc, char *argv[]) /* Create the datasets in the file */ if (create_datasets(fid, comp_level, verbose, verbose_file, index_type) < 0) { - HDfprintf(stderr, "Error creating datasets...\n"); - HDexit(EXIT_FAILURE); + fprintf(stderr, "Error creating datasets...\n"); + exit(EXIT_FAILURE); } /* Enable SWMR writing mode */ if (H5Fstart_swmr_write(fid) < 0) { - HDfprintf(stderr, "Error starting SWMR writing mode...\n"); - HDexit(EXIT_FAILURE); + fprintf(stderr, "Error starting SWMR writing mode...\n"); + exit(EXIT_FAILURE); } /* Send a message to indicate "H5Fopen" is complete--releasing the file lock */ @@ -498,32 +498,32 @@ main(int argc, char *argv[]) /* Emit informational message */ if (verbose) - HDfprintf(verbose_file, "Adding records\n"); + fprintf(verbose_file, "Adding records\n"); /* Append records to datasets */ if (add_records(fid, verbose, verbose_file, (unsigned long)nrecords, (unsigned long)flush_count) < 0) { - HDfprintf(stderr, "Error appending records to datasets!\n"); - HDexit(EXIT_FAILURE); + fprintf(stderr, "Error appending records to datasets!\n"); + exit(EXIT_FAILURE); } /* end if */ /* Emit informational message */ if (verbose) - HDfprintf(verbose_file, "Releasing symbols\n"); + fprintf(verbose_file, "Releasing symbols\n"); /* Clean up the symbols */ if (shutdown_symbols() < 0) { - HDfprintf(stderr, "Error releasing symbols!\n"); - HDexit(EXIT_FAILURE); + fprintf(stderr, "Error releasing symbols!\n"); + exit(EXIT_FAILURE); } /* end if */ /* Emit informational message */ if (verbose) - HDfprintf(verbose_file, "Closing the file\n"); + fprintf(verbose_file, "Closing the file\n"); /* Close objects opened */ if (H5Fclose(fid) < 0) { - HDfprintf(stderr, "Error closing file!\n"); - HDexit(EXIT_FAILURE); + fprintf(stderr, "Error closing file!\n"); + exit(EXIT_FAILURE); } /* end if */ return 0; diff --git a/test/swmr_writer.c b/test/swmr_writer.c index 5f41215..2fd559d 100644 --- a/test/swmr_writer.c +++ b/test/swmr_writer.c @@ -75,7 +75,7 @@ open_skeleton(const char *filename, hbool_t verbose, FILE *verbose_file, unsigne unsigned u, v; /* Local index variable */ hbool_t use_log_vfd = FALSE; /* Use the log VFD (set this manually) */ - HDassert(filename); + assert(filename); /* Create file access property list */ if ((fapl = h5_fileaccess()) < 0) @@ -105,7 +105,7 @@ open_skeleton(const char *filename, hbool_t verbose, FILE *verbose_file, unsigne /* Emit informational message */ if (verbose) - HDfprintf(verbose_file, "Opening datasets\n"); + fprintf(verbose_file, "Opening datasets\n"); /* Open the datasets */ for (u = 0; u < NLEVELS; u++) @@ -155,11 +155,11 @@ add_records(hid_t fid, hbool_t verbose, FILE *verbose_file, unsigned long nrecor unsigned long rec_to_flush; /* # of records left to write before flush */ unsigned long u, v; /* Local index variables */ - HDassert(fid >= 0); + assert(fid >= 0); /* Reset the record */ /* (record's 'info' field might need to change for each record written, also) */ - HDmemset(&record, 0, sizeof(record)); + memset(&record, 0, sizeof(record)); /* Create a dataspace for the record to add */ if ((mem_sid = H5Screate(H5S_SCALAR)) < 0) @@ -242,7 +242,7 @@ add_records(hid_t fid, hbool_t verbose, FILE *verbose_file, unsigned long nrecor /* Emit informational message */ if (verbose) - HDfprintf(verbose_file, "Closing datasets\n"); + fprintf(verbose_file, "Closing datasets\n"); /* Close the datasets */ for (u = 0; u < NLEVELS; u++) @@ -256,21 +256,21 @@ add_records(hid_t fid, hbool_t verbose, FILE *verbose_file, unsigned long nrecor static void usage(void) { - HDprintf("\n"); - HDprintf("Usage error!\n"); - HDprintf("\n"); - HDprintf("Usage: swmr_writer [-q] [-o] [-f <# of records to write between flushing\n"); - HDprintf(" file contents>] [-r <random seed>] <# of records>\n"); - HDprintf("\n"); - HDprintf("<# of records to write between flushing file contents> should be 0\n"); - HDprintf("(for no flushing) or between 1 and (<# of records> - 1).\n"); - HDprintf("\n"); - HDprintf("<# of records> must be specified.\n"); - HDprintf("\n"); - HDprintf("Defaults to verbose (no '-q' given), latest format when opening file (no '-o' given),\n"); - HDprintf("flushing every 10000 records ('-f 10000'), and will generate a random seed (no -r given).\n"); - HDprintf("\n"); - HDexit(EXIT_FAILURE); + printf("\n"); + printf("Usage error!\n"); + printf("\n"); + printf("Usage: swmr_writer [-q] [-o] [-f <# of records to write between flushing\n"); + printf(" file contents>] [-r <random seed>] <# of records>\n"); + printf("\n"); + printf("<# of records to write between flushing file contents> should be 0\n"); + printf("(for no flushing) or between 1 and (<# of records> - 1).\n"); + printf("\n"); + printf("<# of records> must be specified.\n"); + printf("\n"); + printf("Defaults to verbose (no '-q' given), latest format when opening file (no '-o' given),\n"); + printf("flushing every 10000 records ('-f 10000'), and will generate a random seed (no -r given).\n"); + printf("\n"); + exit(EXIT_FAILURE); } int @@ -312,7 +312,7 @@ main(int argc, char *argv[]) /* Random # seed */ case 'r': use_seed = TRUE; - temp = HDatoi(argv[u + 1]); + temp = atoi(argv[u + 1]); random_seed = (unsigned)temp; u += 2; break; @@ -357,25 +357,25 @@ main(int argc, char *argv[]) char verbose_name[1024]; HDsnprintf(verbose_name, sizeof(verbose_name), "swmr_writer.out.%u", random_seed); - if (NULL == (verbose_file = HDfopen(verbose_name, "w"))) { - HDfprintf(stderr, "Can't open verbose output file!\n"); - HDexit(EXIT_FAILURE); + if (NULL == (verbose_file = fopen(verbose_name, "w"))) { + fprintf(stderr, "Can't open verbose output file!\n"); + exit(EXIT_FAILURE); } } /* end if */ /* Emit informational message */ if (verbose) { - HDfprintf(verbose_file, "Parameters:\n"); - HDfprintf(verbose_file, "\t# of records between flushes = %ld\n", flush_count); - HDfprintf(verbose_file, "\t# of records to write = %ld\n", nrecords); + fprintf(verbose_file, "Parameters:\n"); + fprintf(verbose_file, "\t# of records between flushes = %ld\n", flush_count); + fprintf(verbose_file, "\t# of records to write = %ld\n", nrecords); } /* end if */ /* ALWAYS emit the random seed for possible debugging */ - HDfprintf(stdout, "Using writer random seed: %u\n", random_seed); + fprintf(stdout, "Using writer random seed: %u\n", random_seed); /* Emit informational message */ if (verbose) - HDfprintf(verbose_file, "Generating symbol names\n"); + fprintf(verbose_file, "Generating symbol names\n"); /* Generate dataset names */ if (generate_symbols() < 0) @@ -383,12 +383,12 @@ main(int argc, char *argv[]) /* Emit informational message */ if (verbose) - HDfprintf(verbose_file, "Opening skeleton file: %s\n", FILENAME); + fprintf(verbose_file, "Opening skeleton file: %s\n", FILENAME); /* Open file skeleton */ if ((fid = open_skeleton(FILENAME, verbose, verbose_file, random_seed, old)) < 0) { - HDfprintf(stderr, "Error opening skeleton file!\n"); - HDexit(EXIT_FAILURE); + fprintf(stderr, "Error opening skeleton file!\n"); + exit(EXIT_FAILURE); } /* end if */ /* Send a message to indicate "H5Fopen" is complete--releasing the file lock */ @@ -396,32 +396,32 @@ main(int argc, char *argv[]) /* Emit informational message */ if (verbose) - HDfprintf(verbose_file, "Adding records\n"); + fprintf(verbose_file, "Adding records\n"); /* Append records to datasets */ if (add_records(fid, verbose, verbose_file, (unsigned long)nrecords, (unsigned long)flush_count) < 0) { - HDfprintf(stderr, "Error appending records to datasets!\n"); - HDexit(EXIT_FAILURE); + fprintf(stderr, "Error appending records to datasets!\n"); + exit(EXIT_FAILURE); } /* end if */ /* Emit informational message */ if (verbose) - HDfprintf(verbose_file, "Releasing symbols\n"); + fprintf(verbose_file, "Releasing symbols\n"); /* Clean up the symbols */ if (shutdown_symbols() < 0) { - HDfprintf(stderr, "Error releasing symbols!\n"); - HDexit(EXIT_FAILURE); + fprintf(stderr, "Error releasing symbols!\n"); + exit(EXIT_FAILURE); } /* end if */ /* Emit informational message */ if (verbose) - HDfprintf(verbose_file, "Closing objects\n"); + fprintf(verbose_file, "Closing objects\n"); /* Close objects opened */ if (H5Fclose(fid) < 0) { - HDfprintf(stderr, "Error closing file!\n"); - HDexit(EXIT_FAILURE); + fprintf(stderr, "Error closing file!\n"); + exit(EXIT_FAILURE); } /* end if */ return 0; diff --git a/test/tarray.c b/test/tarray.c index 06eac90..96023fc 100644 --- a/test/tarray.c +++ b/test/tarray.c @@ -1055,7 +1055,7 @@ test_array_alloc_custom(size_t size, void *info) */ extra = MAX(sizeof(void *), sizeof(size_t)); - if ((ret_value = HDmalloc(extra + size)) != NULL) { + if ((ret_value = malloc(extra + size)) != NULL) { *(size_t *)ret_value = size; *mem_used += size; } /* end if */ @@ -1093,7 +1093,7 @@ test_array_free_custom(void *_mem, void *info) if (_mem != NULL) { mem = ((unsigned char *)_mem) - extra; *mem_used -= *(size_t *)((void *)mem); - HDfree(mem); + free(mem); } /* end if */ } /* end test_array_free_custom() */ @@ -1136,7 +1136,7 @@ test_array_vlen_atomic(void) /* Initialize array data to write */ for (i = 0; i < SPACE1_DIM1; i++) for (j = 0; j < ARRAY1_DIM1; j++) { - wdata[i][j].p = HDmalloc((size_t)(i + j + 1) * sizeof(unsigned int)); + wdata[i][j].p = malloc((size_t)(i + j + 1) * sizeof(unsigned int)); wdata[i][j].len = (size_t)(i + j + 1); for (k = 0; k < (i + j + 1); k++) ((unsigned int *)wdata[i][j].p)[k] = (unsigned int)(i * 100 + j * 10 + k); @@ -1357,7 +1357,7 @@ test_array_vlen_array(void) /* Initialize array data to write */ for (i = 0; i < SPACE1_DIM1; i++) for (j = 0; j < ARRAY1_DIM1; j++) { - wdata[i][j].p = HDmalloc((size_t)(i + j + 1) * sizeof(unsigned int) * (size_t)ARRAY1_DIM1); + wdata[i][j].p = malloc((size_t)(i + j + 1) * sizeof(unsigned int) * (size_t)ARRAY1_DIM1); wdata[i][j].len = (size_t)(i + j + 1); for (k = 0; k < (i + j + 1); k++) for (l = 0; l < ARRAY1_DIM1; l++) @@ -1632,9 +1632,9 @@ test_array_bkg(void) /* Initialize the data */ /* ------------------- */ - dtsinfo = (CmpDTSinfo *)HDmalloc(sizeof(CmpDTSinfo)); - CHECK_PTR(dtsinfo, "HDmalloc"); - HDmemset(dtsinfo, 0, sizeof(CmpDTSinfo)); + dtsinfo = (CmpDTSinfo *)malloc(sizeof(CmpDTSinfo)); + CHECK_PTR(dtsinfo, "malloc"); + memset(dtsinfo, 0, sizeof(CmpDTSinfo)); for (i = 0; i < LENGTH; i++) { for (j = 0; j < ALEN; j++) { cf[i].a[j] = 100 * (i + 1) + j; @@ -1662,7 +1662,7 @@ test_array_bkg(void) /* Initialize the names of data members */ /* ------------------------------------ */ for (i = 0; i < dtsinfo->nsubfields; i++) - dtsinfo->name[i] = (char *)HDcalloc((size_t)20, sizeof(char)); + dtsinfo->name[i] = (char *)calloc((size_t)20, sizeof(char)); HDstrcpy(dtsinfo->name[0], "One"); HDstrcpy(dtsinfo->name[1], "Two"); @@ -1734,7 +1734,7 @@ test_array_bkg(void) /* Release memory resources */ /* ------------------------ */ for (i = 0; i < dtsinfo->nsubfields; i++) - HDfree(dtsinfo->name[i]); + free(dtsinfo->name[i]); /* Release IDs */ /* ----------- */ @@ -1849,7 +1849,7 @@ test_array_bkg(void) /* Reset the data to read in */ /* ------------------------- */ - HDmemset(cfr, 0, sizeof(CmpField) * LENGTH); + memset(cfr, 0, sizeof(CmpField) * LENGTH); status = H5Dread(dataset, type, H5S_ALL, H5S_ALL, H5P_DEFAULT, cfr); CHECK(status, FAIL, "H5Dread"); @@ -1885,7 +1885,7 @@ test_array_bkg(void) status = H5Fclose(fid); CHECK(status, FAIL, "H5Fclose"); - HDfree(dtsinfo); + free(dtsinfo); } /* end test_array_bkg() */ /*------------------------------------------------------------------------- @@ -1937,7 +1937,7 @@ test_compat(void) if (h5_driver_is_default_vfd_compatible(H5P_DEFAULT, &driver_is_default_compatible) < 0) TestErrPrintf("can't check if VFD is default VFD compatible\n"); if (!driver_is_default_compatible) { - HDprintf(" -- SKIPPED --\n"); + printf(" -- SKIPPED --\n"); return; } @@ -2193,7 +2193,7 @@ test_compat(void) CHECK_I(ret, "H5Fclose"); } /* end if */ else - HDprintf("***cannot open the pre-created compound datatype test file (%s)\n", testfile); + printf("***cannot open the pre-created compound datatype test file (%s)\n", testfile); } /* end test_compat() */ diff --git a/test/tattr.c b/test/tattr.c index 5dd5736..ab69699 100644 --- a/test/tattr.c +++ b/test/tattr.c @@ -301,8 +301,8 @@ test_attr_basic_write(hid_t fapl) CHECK(attr_name_size, FAIL, "H5Aget_name"); if (attr_name_size > 0) { - attr_name = (char *)HDcalloc((size_t)(attr_name_size + 1), sizeof(char)); - CHECK_PTR(attr_name, "HDcalloc"); + attr_name = (char *)calloc((size_t)(attr_name_size + 1), sizeof(char)); + CHECK_PTR(attr_name, "calloc"); if (attr_name) { ret = (herr_t)H5Aget_name(attr, (size_t)(attr_name_size + 1), attr_name); @@ -310,7 +310,7 @@ test_attr_basic_write(hid_t fapl) ret = HDstrcmp(attr_name, ATTR_TMP_NAME); VERIFY(ret, 0, "HDstrcmp"); - HDfree(attr_name); + free(attr_name); attr_name = NULL; } /* end if */ } /* end if */ @@ -338,8 +338,8 @@ test_attr_basic_write(hid_t fapl) CHECK(attr_name_size, FAIL, "H5Aget_name"); if (attr_name_size > 0) { - attr_name = (char *)HDcalloc((size_t)(attr_name_size + 1), sizeof(char)); - CHECK_PTR(attr_name, "HDcalloc"); + attr_name = (char *)calloc((size_t)(attr_name_size + 1), sizeof(char)); + CHECK_PTR(attr_name, "calloc"); if (attr_name) { ret = (herr_t)H5Aget_name(attr2, (size_t)(attr_name_size + 1), attr_name); @@ -347,7 +347,7 @@ test_attr_basic_write(hid_t fapl) ret = HDstrcmp(attr_name, ATTR1A_NAME); VERIFY(ret, 0, "HDstrcmp"); - HDfree(attr_name); + free(attr_name); attr_name = NULL; } /* end if */ } /* end if */ @@ -917,11 +917,11 @@ test_attr_compound_read(hid_t fapl) /* Verify values read in */ for (i = 0; i < ATTR4_DIM1; i++) for (j = 0; j < ATTR4_DIM2; j++) - if (HDmemcmp(&attr_data4[i][j], &read_data4[i][j], sizeof(struct attr4_struct)) != 0) { - HDprintf("%d: attribute data different: attr_data4[%d][%d].i=%d, read_data4[%d][%d].i=%d\n", - __LINE__, i, j, attr_data4[i][j].i, i, j, read_data4[i][j].i); - HDprintf("%d: attribute data different: attr_data4[%d][%d].d=%f, read_data4[%d][%d].d=%f\n", - __LINE__, i, j, attr_data4[i][j].d, i, j, read_data4[i][j].d); + if (memcmp(&attr_data4[i][j], &read_data4[i][j], sizeof(struct attr4_struct)) != 0) { + printf("%d: attribute data different: attr_data4[%d][%d].i=%d, read_data4[%d][%d].i=%d\n", + __LINE__, i, j, attr_data4[i][j].i, i, j, read_data4[i][j].i); + printf("%d: attribute data different: attr_data4[%d][%d].d=%f, read_data4[%d][%d].d=%f\n", + __LINE__, i, j, attr_data4[i][j].d, i, j, read_data4[i][j].d); TestErrPrintf( "%d: attribute data different: attr_data4[%d][%d].c=%c, read_data4[%d][%d].c=%c\n", __LINE__, i, j, attr_data4[i][j].c, i, j, read_data4[i][j].c); @@ -1062,8 +1062,8 @@ test_attr_scalar_read(hid_t fapl) /* Verify the floating-poing value in this way to avoid compiler warning. */ if (!H5_FLT_ABS_EQUAL(rdata, attr_data5)) - HDprintf("*** UNEXPECTED VALUE from %s should be %f, but is %f at line %4d in %s\n", "H5Aread", - (double)attr_data5, (double)rdata, (int)__LINE__, __FILE__); + printf("*** UNEXPECTED VALUE from %s should be %f, but is %f at line %4d in %s\n", "H5Aread", + (double)attr_data5, (double)rdata, (int)__LINE__, __FILE__); /* Get the attribute's dataspace */ sid = H5Aget_space(attr); @@ -4609,7 +4609,7 @@ test_attr_corder_create_compact(hid_t fcpl, hid_t fapl) break; default: - HDassert(0 && "Too many datasets!"); + assert(0 && "Too many datasets!"); } /* end switch */ /* Check on dataset's attribute storage status */ @@ -4692,7 +4692,7 @@ test_attr_corder_create_compact(hid_t fcpl, hid_t fapl) break; default: - HDassert(0 && "Too many datasets!"); + assert(0 && "Too many datasets!"); } /* end switch */ /* Check on dataset's attribute storage status */ @@ -4813,7 +4813,7 @@ test_attr_corder_create_dense(hid_t fcpl, hid_t fapl) break; default: - HDassert(0 && "Too many datasets!"); + assert(0 && "Too many datasets!"); } /* end switch */ /* Check on dataset's attribute storage status */ @@ -4923,7 +4923,7 @@ test_attr_corder_create_dense(hid_t fcpl, hid_t fapl) break; default: - HDassert(0 && "Too many datasets!"); + assert(0 && "Too many datasets!"); } /* end switch */ /* Check on dataset's attribute storage status */ @@ -5154,7 +5154,7 @@ test_attr_corder_transition(hid_t fcpl, hid_t fapl) break; default: - HDassert(0 && "Too many datasets!"); + assert(0 && "Too many datasets!"); } /* end switch */ /* Check on dataset's attribute storage status */ @@ -5208,7 +5208,7 @@ test_attr_corder_transition(hid_t fcpl, hid_t fapl) break; default: - HDassert(0 && "Too many datasets!"); + assert(0 && "Too many datasets!"); } /* end switch */ /* Create several attributes, but keep storage in compact form */ @@ -5369,7 +5369,7 @@ test_attr_corder_transition(hid_t fcpl, hid_t fapl) break; default: - HDassert(0 && "Too many datasets!"); + assert(0 && "Too many datasets!"); } /* end switch */ /* Check on dataset's attribute storage status */ @@ -5563,7 +5563,7 @@ test_attr_corder_delete(hid_t fcpl, hid_t fapl) break; default: - HDassert(0 && "Too many datasets!"); + assert(0 && "Too many datasets!"); } /* end switch */ /* Check on dataset's attribute storage status */ @@ -5684,19 +5684,19 @@ attr_info_by_idx_check(hid_t obj_id, const char *attrname, hsize_t n, hbool_t us old_nerrs = GetTestNumErrs(); /* Verify the information for first attribute, in increasing creation order */ - HDmemset(&ainfo, 0, sizeof(ainfo)); + memset(&ainfo, 0, sizeof(ainfo)); ret = H5Aget_info_by_idx(obj_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)0, &ainfo, H5P_DEFAULT); CHECK(ret, FAIL, "H5Aget_info_by_idx"); VERIFY(ainfo.corder, 0, "H5Aget_info_by_idx"); /* Verify the information for new attribute, in increasing creation order */ - HDmemset(&ainfo, 0, sizeof(ainfo)); + memset(&ainfo, 0, sizeof(ainfo)); ret = H5Aget_info_by_idx(obj_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, n, &ainfo, H5P_DEFAULT); CHECK(ret, FAIL, "H5Aget_info_by_idx"); VERIFY(ainfo.corder, n, "H5Aget_info_by_idx"); /* Verify the name for new link, in increasing creation order */ - HDmemset(tmpname, 0, (size_t)NAME_BUF_SIZE); + memset(tmpname, 0, (size_t)NAME_BUF_SIZE); ret = (herr_t)H5Aget_name_by_idx(obj_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, n, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT); CHECK(ret, FAIL, "H5Aget_name_by_idx"); @@ -5709,20 +5709,20 @@ attr_info_by_idx_check(hid_t obj_id, const char *attrname, hsize_t n, hbool_t us */ if (use_index) { /* Verify the information for first attribute, in native creation order */ - HDmemset(&ainfo, 0, sizeof(ainfo)); + memset(&ainfo, 0, sizeof(ainfo)); ret = H5Aget_info_by_idx(obj_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_NATIVE, (hsize_t)0, &ainfo, H5P_DEFAULT); CHECK(ret, FAIL, "H5Aget_info_by_idx"); VERIFY(ainfo.corder, 0, "H5Aget_info_by_idx"); /* Verify the information for new attribute, in native creation order */ - HDmemset(&ainfo, 0, sizeof(ainfo)); + memset(&ainfo, 0, sizeof(ainfo)); ret = H5Aget_info_by_idx(obj_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_NATIVE, n, &ainfo, H5P_DEFAULT); CHECK(ret, FAIL, "H5Aget_info_by_idx"); VERIFY(ainfo.corder, n, "H5Aget_info_by_idx"); /* Verify the name for new link, in increasing native order */ - HDmemset(tmpname, 0, (size_t)NAME_BUF_SIZE); + memset(tmpname, 0, (size_t)NAME_BUF_SIZE); ret = (herr_t)H5Aget_name_by_idx(obj_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_NATIVE, n, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT); CHECK(ret, FAIL, "H5Aget_name_by_idx"); @@ -5731,19 +5731,19 @@ attr_info_by_idx_check(hid_t obj_id, const char *attrname, hsize_t n, hbool_t us } /* end if */ /* Verify the information for first attribute, in decreasing creation order */ - HDmemset(&ainfo, 0, sizeof(ainfo)); + memset(&ainfo, 0, sizeof(ainfo)); ret = H5Aget_info_by_idx(obj_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, n, &ainfo, H5P_DEFAULT); CHECK(ret, FAIL, "H5Aget_info_by_idx"); VERIFY(ainfo.corder, 0, "H5Aget_info_by_idx"); /* Verify the information for new attribute, in increasing creation order */ - HDmemset(&ainfo, 0, sizeof(ainfo)); + memset(&ainfo, 0, sizeof(ainfo)); ret = H5Aget_info_by_idx(obj_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, (hsize_t)0, &ainfo, H5P_DEFAULT); CHECK(ret, FAIL, "H5Aget_info_by_idx"); VERIFY(ainfo.corder, n, "H5Aget_info_by_idx"); /* Verify the name for new link, in increasing creation order */ - HDmemset(tmpname, 0, (size_t)NAME_BUF_SIZE); + memset(tmpname, 0, (size_t)NAME_BUF_SIZE); ret = (herr_t)H5Aget_name_by_idx(obj_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, (hsize_t)0, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT); CHECK(ret, FAIL, "H5Aget_name_by_idx"); @@ -5751,19 +5751,19 @@ attr_info_by_idx_check(hid_t obj_id, const char *attrname, hsize_t n, hbool_t us TestErrPrintf("Line %d: attribute name size wrong!\n", __LINE__); /* Verify the information for first attribute, in increasing name order */ - HDmemset(&ainfo, 0, sizeof(ainfo)); + memset(&ainfo, 0, sizeof(ainfo)); ret = H5Aget_info_by_idx(obj_id, ".", H5_INDEX_NAME, H5_ITER_INC, (hsize_t)0, &ainfo, H5P_DEFAULT); CHECK(ret, FAIL, "H5Aget_info_by_idx"); VERIFY(ainfo.corder, 0, "H5Aget_info_by_idx"); /* Verify the information for new attribute, in increasing name order */ - HDmemset(&ainfo, 0, sizeof(ainfo)); + memset(&ainfo, 0, sizeof(ainfo)); ret = H5Aget_info_by_idx(obj_id, ".", H5_INDEX_NAME, H5_ITER_INC, n, &ainfo, H5P_DEFAULT); CHECK(ret, FAIL, "H5Aget_info_by_idx"); VERIFY(ainfo.corder, n, "H5Aget_info_by_idx"); /* Verify the name for new link, in increasing name order */ - HDmemset(tmpname, 0, (size_t)NAME_BUF_SIZE); + memset(tmpname, 0, (size_t)NAME_BUF_SIZE); ret = (herr_t)H5Aget_name_by_idx(obj_id, ".", H5_INDEX_NAME, H5_ITER_INC, n, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT); CHECK(ret, FAIL, "H5Aget_name_by_idx"); @@ -5775,19 +5775,19 @@ attr_info_by_idx_check(hid_t obj_id, const char *attrname, hsize_t n, hbool_t us */ /* Verify the information for first attribute, in decreasing name order */ - HDmemset(&ainfo, 0, sizeof(ainfo)); + memset(&ainfo, 0, sizeof(ainfo)); ret = H5Aget_info_by_idx(obj_id, ".", H5_INDEX_NAME, H5_ITER_DEC, n, &ainfo, H5P_DEFAULT); CHECK(ret, FAIL, "H5Aget_info_by_idx"); VERIFY(ainfo.corder, 0, "H5Aget_info_by_idx"); /* Verify the information for new attribute, in increasing name order */ - HDmemset(&ainfo, 0, sizeof(ainfo)); + memset(&ainfo, 0, sizeof(ainfo)); ret = H5Aget_info_by_idx(obj_id, ".", H5_INDEX_NAME, H5_ITER_DEC, (hsize_t)0, &ainfo, H5P_DEFAULT); CHECK(ret, FAIL, "H5Aget_info_by_idx"); VERIFY(ainfo.corder, n, "H5Aget_info_by_idx"); /* Verify the name for new link, in increasing name order */ - HDmemset(tmpname, 0, (size_t)NAME_BUF_SIZE); + memset(tmpname, 0, (size_t)NAME_BUF_SIZE); ret = (herr_t)H5Aget_name_by_idx(obj_id, ".", H5_INDEX_NAME, H5_ITER_DEC, (hsize_t)0, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT); CHECK(ret, FAIL, "H5Aget_name_by_idx"); @@ -5892,7 +5892,7 @@ test_attr_info_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) break; default: - HDassert(0 && "Too many datasets!"); + assert(0 && "Too many datasets!"); } /* end switch */ /* Check on dataset's attribute storage status */ @@ -6414,7 +6414,7 @@ test_attr_delete_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) break; default: - HDassert(0 && "Too many datasets!"); + assert(0 && "Too many datasets!"); } /* end switch */ /* Check on dataset's attribute storage status */ @@ -6486,7 +6486,7 @@ test_attr_delete_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) break; default: - HDassert(0 && "Too many datasets!"); + assert(0 && "Too many datasets!"); } /* end switch */ /* Delete attributes from compact storage */ @@ -6496,7 +6496,7 @@ test_attr_delete_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) CHECK(ret, FAIL, "H5Adelete_by_idx"); /* Verify the attribute information for first attribute in appropriate order */ - HDmemset(&ainfo, 0, sizeof(ainfo)); + memset(&ainfo, 0, sizeof(ainfo)); ret = H5Aget_info_by_idx(my_dataset, ".", idx_type, order, (hsize_t)0, &ainfo, H5P_DEFAULT); if (new_format) { @@ -6509,7 +6509,7 @@ test_attr_delete_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) } /* end if */ /* Verify the name for first attribute in appropriate order */ - HDmemset(tmpname, 0, (size_t)NAME_BUF_SIZE); + memset(tmpname, 0, (size_t)NAME_BUF_SIZE); ret = (herr_t)H5Aget_name_by_idx(my_dataset, ".", idx_type, order, (hsize_t)0, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT); if (order == H5_ITER_INC) @@ -6545,7 +6545,7 @@ test_attr_delete_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) break; default: - HDassert(0 && "Too many datasets!"); + assert(0 && "Too many datasets!"); } /* end switch */ /* Create more attributes, to push into dense form */ @@ -6618,7 +6618,7 @@ test_attr_delete_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) break; default: - HDassert(0 && "Too many datasets!"); + assert(0 && "Too many datasets!"); } /* end switch */ /* Delete attributes from dense storage */ @@ -6628,7 +6628,7 @@ test_attr_delete_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) CHECK(ret, FAIL, "H5Adelete_by_idx"); /* Verify the attribute information for first attribute in appropriate order */ - HDmemset(&ainfo, 0, sizeof(ainfo)); + memset(&ainfo, 0, sizeof(ainfo)); ret = H5Aget_info_by_idx(my_dataset, ".", idx_type, order, (hsize_t)0, &ainfo, H5P_DEFAULT); if (new_format) { @@ -6641,7 +6641,7 @@ test_attr_delete_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) } /* end if */ /* Verify the name for first attribute in appropriate order */ - HDmemset(tmpname, 0, (size_t)NAME_BUF_SIZE); + memset(tmpname, 0, (size_t)NAME_BUF_SIZE); ret = (herr_t)H5Aget_name_by_idx(my_dataset, ".", idx_type, order, (hsize_t)0, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT); if (order == H5_ITER_INC) @@ -6688,7 +6688,7 @@ test_attr_delete_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) break; default: - HDassert(0 && "Too many datasets!"); + assert(0 && "Too many datasets!"); } /* end switch */ /* Create attributes, to push into dense form */ @@ -6735,7 +6735,7 @@ test_attr_delete_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) break; default: - HDassert(0 && "Too many datasets!"); + assert(0 && "Too many datasets!"); } /* end switch */ /* Delete every other attribute from dense storage, in appropriate order */ @@ -6745,7 +6745,7 @@ test_attr_delete_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) CHECK(ret, FAIL, "H5Adelete_by_idx"); /* Verify the attribute information for first attribute in appropriate order */ - HDmemset(&ainfo, 0, sizeof(ainfo)); + memset(&ainfo, 0, sizeof(ainfo)); ret = H5Aget_info_by_idx(my_dataset, ".", idx_type, order, (hsize_t)u, &ainfo, H5P_DEFAULT); if (new_format) { @@ -6759,7 +6759,7 @@ test_attr_delete_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) } /* end if */ /* Verify the name for first attribute in appropriate order */ - HDmemset(tmpname, 0, (size_t)NAME_BUF_SIZE); + memset(tmpname, 0, (size_t)NAME_BUF_SIZE); ret = (herr_t)H5Aget_name_by_idx(my_dataset, ".", idx_type, order, (hsize_t)u, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT); if (order == H5_ITER_INC) @@ -6788,7 +6788,7 @@ test_attr_delete_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) break; default: - HDassert(0 && "Too many datasets!"); + assert(0 && "Too many datasets!"); } /* end switch */ /* Delete remaining attributes from dense storage, in appropriate order */ @@ -6798,7 +6798,7 @@ test_attr_delete_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) CHECK(ret, FAIL, "H5Adelete_by_idx"); /* Verify the attribute information for first attribute in appropriate order */ - HDmemset(&ainfo, 0, sizeof(ainfo)); + memset(&ainfo, 0, sizeof(ainfo)); ret = H5Aget_info_by_idx(my_dataset, ".", idx_type, order, (hsize_t)0, &ainfo, H5P_DEFAULT); if (new_format) { @@ -6812,7 +6812,7 @@ test_attr_delete_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) } /* end if */ /* Verify the name for first attribute in appropriate order */ - HDmemset(tmpname, 0, (size_t)NAME_BUF_SIZE); + memset(tmpname, 0, (size_t)NAME_BUF_SIZE); ret = (herr_t)H5Aget_name_by_idx(my_dataset, ".", idx_type, order, (hsize_t)0, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT); if (order == H5_ITER_INC) @@ -6998,7 +6998,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 ? 0 : (max_attrs - 1); - HDmemset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); ret = H5Aiterate2(obj_id, idx_type, order, &skip, attr_iterate2_cb, iter_info); CHECK(ret, FAIL, "H5Aiterate2"); @@ -7013,7 +7013,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 ? 0 : (max_attrs - 1); - HDmemset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(hbool_t) * 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"); @@ -7028,7 +7028,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 ? 0 : (max_attrs - 1); - HDmemset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(hbool_t) * 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"); @@ -7044,7 +7044,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 ? 0 : (max_attrs - 1); - HDmemset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); ret = H5Aiterate1(obj_id, &oskip, attr_iterate1_cb, iter_info); CHECK(ret, FAIL, "H5Aiterate1"); @@ -7060,7 +7060,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); - HDmemset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); ret = H5Aiterate2(obj_id, idx_type, order, &skip, attr_iterate2_cb, iter_info); CHECK(ret, FAIL, "H5Aiterate2"); @@ -7077,7 +7077,7 @@ attr_iterate_check(hid_t fid, const char *dsetname, hid_t obj_id, H5_index_t idx else { unsigned nvisit = 0; /* # of links visited */ - HDassert(order == H5_ITER_NATIVE); + assert(order == H5_ITER_NATIVE); for (v = 0; v < max_attrs; v++) if (iter_info->visited[v] == TRUE) nvisit++; @@ -7091,7 +7091,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); - HDmemset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(hbool_t) * 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"); @@ -7108,7 +7108,7 @@ attr_iterate_check(hid_t fid, const char *dsetname, hid_t obj_id, H5_index_t idx else { unsigned nvisit = 0; /* # of links visited */ - HDassert(order == H5_ITER_NATIVE); + assert(order == H5_ITER_NATIVE); for (v = 0; v < max_attrs; v++) if (iter_info->visited[v] == TRUE) nvisit++; @@ -7122,7 +7122,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); - HDmemset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(hbool_t) * 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"); @@ -7139,7 +7139,7 @@ attr_iterate_check(hid_t fid, const char *dsetname, hid_t obj_id, H5_index_t idx else { unsigned nvisit = 0; /* # of links visited */ - HDassert(order == H5_ITER_NATIVE); + assert(order == H5_ITER_NATIVE); for (v = 0; v < max_attrs; v++) if (iter_info->visited[v] == TRUE) nvisit++; @@ -7154,7 +7154,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); - HDmemset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); ret = H5Aiterate1(obj_id, &oskip, attr_iterate1_cb, iter_info); CHECK(ret, FAIL, "H5Aiterate1"); @@ -7171,7 +7171,7 @@ attr_iterate_check(hid_t fid, const char *dsetname, hid_t obj_id, H5_index_t idx else { unsigned nvisit = 0; /* # of links visited */ - HDassert(order == H5_ITER_NATIVE); + assert(order == H5_ITER_NATIVE); for (v = 0; v < max_attrs; v++) if (iter_info->visited[v] == TRUE) nvisit++; @@ -7186,7 +7186,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); - HDmemset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(hbool_t) * 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"); @@ -7198,7 +7198,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); - HDmemset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(hbool_t) * 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"); @@ -7210,7 +7210,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); - HDmemset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(hbool_t) * 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"); @@ -7223,7 +7223,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); - HDmemset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); ret = H5Aiterate1(obj_id, &oskip, attr_iterate1_cb, iter_info); CHECK(ret, FAIL, "H5Aiterate1"); VERIFY(ret, CORDER_ITER_STOP, "H5Aiterate1"); @@ -7318,8 +7318,8 @@ 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 *)HDmalloc(sizeof(hbool_t) * iter_info.max_visit); - CHECK_PTR(visited, "HDmalloc"); + visited = (hbool_t *)malloc(sizeof(hbool_t) * iter_info.max_visit); + CHECK_PTR(visited, "malloc"); iter_info.visited = visited; /* Loop over operating on different indices on link fields */ @@ -7404,7 +7404,7 @@ test_attr_iterate2(hbool_t new_format, hid_t fcpl, hid_t fapl) break; default: - HDassert(0 && "Too many datasets!"); + assert(0 && "Too many datasets!"); } /* end switch */ /* Check on dataset's attribute storage status */ @@ -7506,7 +7506,7 @@ test_attr_iterate2(hbool_t new_format, hid_t fcpl, hid_t fapl) break; default: - HDassert(0 && "Too many datasets!"); + assert(0 && "Too many datasets!"); } /* end switch */ /* Create more attributes, to push into dense form */ @@ -7610,7 +7610,7 @@ test_attr_iterate2(hbool_t new_format, hid_t fcpl, hid_t fapl) CHECK(ret, FAIL, "H5Sclose"); /* Free the "visited link" array */ - HDfree(visited); + free(visited); } /* test_attr_iterate2() */ /*------------------------------------------------------------------------- @@ -7799,7 +7799,7 @@ test_attr_open_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) break; default: - HDassert(0 && "Too many datasets!"); + assert(0 && "Too many datasets!"); } /* end switch */ /* Check on dataset's attribute storage status */ @@ -7877,7 +7877,7 @@ test_attr_open_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) break; default: - HDassert(0 && "Too many datasets!"); + assert(0 && "Too many datasets!"); } /* end switch */ /* Create more attributes, to push into dense form */ @@ -8139,7 +8139,7 @@ test_attr_open_by_name(hbool_t new_format, hid_t fcpl, hid_t fapl) break; default: - HDassert(0 && "Too many datasets!"); + assert(0 && "Too many datasets!"); } /* end switch */ /* Check on dataset's attribute storage status */ @@ -8245,7 +8245,7 @@ test_attr_open_by_name(hbool_t new_format, hid_t fcpl, hid_t fapl) break; default: - HDassert(0 && "Too many datasets!"); + assert(0 && "Too many datasets!"); } /* end switch */ /* Create more attributes, to push into dense form */ @@ -8434,7 +8434,7 @@ test_attr_create_by_name(hbool_t new_format, hid_t fcpl, hid_t fapl) break; default: - HDassert(0 && "Too many datasets!"); + assert(0 && "Too many datasets!"); } /* end switch */ /* Check on dataset's attribute storage status */ @@ -8497,7 +8497,7 @@ test_attr_create_by_name(hbool_t new_format, hid_t fcpl, hid_t fapl) break; default: - HDassert(0 && "Too many datasets!"); + assert(0 && "Too many datasets!"); } /* end switch */ /* Create more attributes, to push into dense form */ @@ -8608,9 +8608,9 @@ test_attr_shared_write(hid_t fcpl, hid_t fapl) MESSAGE(5, ("Testing Writing Shared & Unshared Attributes in Compact & Dense Storage\n")); /* Allocate & initialize "big" attribute data */ - big_value = (unsigned *)HDmalloc((size_t)(SPACE1_DIM1 * SPACE1_DIM2 * SPACE1_DIM3) * sizeof(unsigned)); - CHECK_PTR(big_value, "HDmalloc"); - HDmemset(big_value, 1, sizeof(unsigned) * (size_t)(SPACE1_DIM1 * SPACE1_DIM2 * SPACE1_DIM3)); + big_value = (unsigned *)malloc((size_t)(SPACE1_DIM1 * SPACE1_DIM2 * SPACE1_DIM3) * sizeof(unsigned)); + CHECK_PTR(big_value, "malloc"); + memset(big_value, 1, sizeof(unsigned) * (size_t)(SPACE1_DIM1 * SPACE1_DIM2 * SPACE1_DIM3)); /* Create dataspace for dataset */ sid = H5Screate(H5S_SCALAR); @@ -8905,7 +8905,7 @@ test_attr_shared_write(hid_t fcpl, hid_t fapl) CHECK(ret, FAIL, "H5Sclose"); /* Release memory */ - HDfree(big_value); + free(big_value); } /* test_attr_shared_write() */ /**************************************************************** @@ -8945,9 +8945,9 @@ test_attr_shared_rename(hid_t fcpl, hid_t fapl) MESSAGE(5, ("Testing Renaming Shared & Unshared Attributes in Compact & Dense Storage\n")); /* Allocate & initialize "big" attribute data */ - big_value = (unsigned *)HDmalloc((size_t)(SPACE1_DIM1 * SPACE1_DIM2 * SPACE1_DIM3) * sizeof(unsigned)); - CHECK_PTR(big_value, "HDmalloc"); - HDmemset(big_value, 1, sizeof(unsigned) * (size_t)(SPACE1_DIM1 * SPACE1_DIM2 * SPACE1_DIM3)); + big_value = (unsigned *)malloc((size_t)(SPACE1_DIM1 * SPACE1_DIM2 * SPACE1_DIM3) * sizeof(unsigned)); + CHECK_PTR(big_value, "malloc"); + memset(big_value, 1, sizeof(unsigned) * (size_t)(SPACE1_DIM1 * SPACE1_DIM2 * SPACE1_DIM3)); /* Create dataspace for dataset */ sid = H5Screate(H5S_SCALAR); @@ -9353,7 +9353,7 @@ test_attr_shared_rename(hid_t fcpl, hid_t fapl) CHECK(ret, FAIL, "H5Sclose"); /* Release memory */ - HDfree(big_value); + free(big_value); } /* test_attr_shared_rename() */ /**************************************************************** @@ -9392,9 +9392,9 @@ test_attr_shared_delete(hid_t fcpl, hid_t fapl) MESSAGE(5, ("Testing Deleting Shared & Unshared Attributes in Compact & Dense Storage\n")); /* Allocate & initialize "big" attribute data */ - big_value = (unsigned *)HDmalloc((size_t)(SPACE1_DIM1 * SPACE1_DIM2 * SPACE1_DIM3) * sizeof(unsigned)); - CHECK_PTR(big_value, "HDmalloc"); - HDmemset(big_value, 1, sizeof(unsigned) * (size_t)(SPACE1_DIM1 * SPACE1_DIM2 * SPACE1_DIM3)); + big_value = (unsigned *)malloc((size_t)(SPACE1_DIM1 * SPACE1_DIM2 * SPACE1_DIM3) * sizeof(unsigned)); + CHECK_PTR(big_value, "malloc"); + memset(big_value, 1, sizeof(unsigned) * (size_t)(SPACE1_DIM1 * SPACE1_DIM2 * SPACE1_DIM3)); /* Create dataspace for dataset */ sid = H5Screate(H5S_SCALAR); @@ -9725,7 +9725,7 @@ test_attr_shared_delete(hid_t fcpl, hid_t fapl) CHECK(ret, FAIL, "H5Sclose"); /* Release memory */ - HDfree(big_value); + free(big_value); } /* test_attr_shared_delete() */ /**************************************************************** @@ -9764,9 +9764,9 @@ test_attr_shared_unlink(hid_t fcpl, hid_t fapl) MESSAGE(5, ("Testing Unlinking Object with Shared Attributes in Compact & Dense Storage\n")); /* Allocate & initialize "big" attribute data */ - big_value = (unsigned *)HDmalloc((size_t)(SPACE1_DIM1 * SPACE1_DIM2 * SPACE1_DIM3) * sizeof(unsigned)); - CHECK_PTR(big_value, "HDmalloc"); - HDmemset(big_value, 1, sizeof(unsigned) * (size_t)(SPACE1_DIM1 * SPACE1_DIM2 * SPACE1_DIM3)); + big_value = (unsigned *)malloc((size_t)(SPACE1_DIM1 * SPACE1_DIM2 * SPACE1_DIM3) * sizeof(unsigned)); + CHECK_PTR(big_value, "malloc"); + memset(big_value, 1, sizeof(unsigned) * (size_t)(SPACE1_DIM1 * SPACE1_DIM2 * SPACE1_DIM3)); /* Create dataspace for dataset */ sid = H5Screate(H5S_SCALAR); @@ -10084,7 +10084,7 @@ test_attr_shared_unlink(hid_t fcpl, hid_t fapl) CHECK(ret, FAIL, "H5Sclose"); /* Release memory */ - HDfree(big_value); + free(big_value); } /* test_attr_shared_unlink() */ /**************************************************************** @@ -11374,8 +11374,8 @@ test_attr_delete_last_dense(hid_t fcpl, hid_t fapl) CHECK(aid, FAIL, "H5Acreate2"); /* Allocate the data buffer */ - data = (double *)HDmalloc((size_t)(DIM0 * DIM1) * sizeof(double)); - CHECK_PTR(data, "HDmalloc"); + data = (double *)malloc((size_t)(DIM0 * DIM1) * sizeof(double)); + CHECK_PTR(data, "malloc"); /* Initialize the data */ for (i = 0; i < DIM0; i++) @@ -11416,7 +11416,7 @@ test_attr_delete_last_dense(hid_t fcpl, hid_t fapl) /* Free the data buffer */ if (data) - HDfree(data); + free(data); } /* test_attr_delete_last_dense() */ diff --git a/test/tcheck_version.c b/test/tcheck_version.c index 2d5c239..0065c06 100644 --- a/test/tcheck_version.c +++ b/test/tcheck_version.c @@ -45,13 +45,13 @@ unsigned release = H5_VERS_RELEASE; void showhelp(void) { - HDprintf("Usage: " progname " [-h] [-t<vers>]\n"); - HDprintf("\t-h\tShow this page and version information\n"); - HDprintf("\t-t<vers>: Test by changing (adding 1 to) the <vers> to trigger\n"); - HDprintf("\t\t the warning. <vers> can be:\n"); - HDprintf("\t\t\tM for Major version number (%d)\n", H5_VERS_MAJOR); - HDprintf("\t\t\tm for Minor version number (%d)\n", H5_VERS_MINOR); - HDprintf("\t\t\tr for Release number (%d)\n", H5_VERS_RELEASE); + printf("Usage: " progname " [-h] [-t<vers>]\n"); + printf("\t-h\tShow this page and version information\n"); + printf("\t-t<vers>: Test by changing (adding 1 to) the <vers> to trigger\n"); + printf("\t\t the warning. <vers> can be:\n"); + printf("\t\t\tM for Major version number (%d)\n", H5_VERS_MAJOR); + printf("\t\t\tm for Minor version number (%d)\n", H5_VERS_MINOR); + printf("\t\t\tr for Release number (%d)\n", H5_VERS_RELEASE); } void @@ -62,8 +62,8 @@ parse(int ac, char **av) while (--ac > 0) { pt = *(++av); if (*pt != '-') { - HDfprintf(stderr, "Unknown option(%s). Aborted.\n", *av); - HDexit(EXIT_FAILURE); + fprintf(stderr, "Unknown option(%s). Aborted.\n", *av); + exit(EXIT_FAILURE); } else { switch (*(++pt)) { @@ -79,16 +79,16 @@ parse(int ac, char **av) release++; break; default: - HDfprintf(stderr, "Unknown -v parameter (%s). Aborted.\n", *av); - HDexit(EXIT_FAILURE); + fprintf(stderr, "Unknown -v parameter (%s). Aborted.\n", *av); + exit(EXIT_FAILURE); } break; case 'h': /* help page */ showhelp(); - HDexit(EXIT_SUCCESS); + exit(EXIT_SUCCESS); default: - HDfprintf(stderr, "Unknown option(%s). Aborted.\n", *av); - HDexit(EXIT_FAILURE); + fprintf(stderr, "Unknown option(%s). Aborted.\n", *av); + exit(EXIT_FAILURE); } } } @@ -106,7 +106,7 @@ parse(int ac, char **av) H5_ATTR_NORETURN void abort_intercept(int H5_ATTR_UNUSED sig) { - HDexit(6); + exit(6); } #ifdef H5_HAVE_WIN32_API diff --git a/test/tchecksum.c b/test/tchecksum.c index a77ffcd..e1c2a1a 100644 --- a/test/tchecksum.c +++ b/test/tchecksum.c @@ -57,7 +57,7 @@ test_chksum_size_one(void) VERIFY(chksum, 0xa209c931, "H5_checksum_lookup3"); /* Buffer w/zero(s) for data */ - HDmemset(buf, 0, sizeof(buf)); + memset(buf, 0, sizeof(buf)); chksum = H5_checksum_fletcher32(buf, sizeof(buf)); VERIFY(chksum, 0, "H5_checksum_fletcher32"); @@ -90,7 +90,7 @@ test_chksum_size_two(void) VERIFY(chksum, 0x8ba7a6c9, "H5_checksum_lookup3"); /* Buffer w/zero(s) for data */ - HDmemset(buf, 0, sizeof(buf)); + memset(buf, 0, sizeof(buf)); chksum = H5_checksum_fletcher32(buf, sizeof(buf)); VERIFY(chksum, 0, "H5_checksum_fletcher32"); @@ -123,7 +123,7 @@ test_chksum_size_three(void) VERIFY(chksum, 0xcebdf4f0, "H5_checksum_lookup3"); /* Buffer w/zero(s) for data */ - HDmemset(buf, 0, sizeof(buf)); + memset(buf, 0, sizeof(buf)); chksum = H5_checksum_fletcher32(buf, sizeof(buf)); VERIFY(chksum, 0, "H5_checksum_fletcher32"); @@ -156,7 +156,7 @@ test_chksum_size_four(void) VERIFY(chksum, 0x2c88bb51, "H5_checksum_lookup3"); /* Buffer w/zero(s) for data */ - HDmemset(buf, 0, sizeof(buf)); + memset(buf, 0, sizeof(buf)); chksum = H5_checksum_fletcher32(buf, sizeof(buf)); VERIFY(chksum, 0, "H5_checksum_fletcher32"); @@ -180,8 +180,8 @@ test_chksum_large(void) size_t u; /* Local index variable */ /* Allocate the buffer */ - large_buf = (uint8_t *)HDmalloc((size_t)BUF_LEN); - CHECK_PTR(large_buf, "HDmalloc"); + large_buf = (uint8_t *)malloc((size_t)BUF_LEN); + CHECK_PTR(large_buf, "malloc"); /* Initialize buffer w/known data */ for (u = 0; u < BUF_LEN; u++) @@ -198,7 +198,7 @@ test_chksum_large(void) VERIFY(chksum, 0x1bd2ee7b, "H5_checksum_lookup3"); /* Buffer w/zero(s) for data */ - HDmemset(large_buf, 0, (size_t)BUF_LEN); + memset(large_buf, 0, (size_t)BUF_LEN); chksum = H5_checksum_fletcher32(large_buf, (size_t)BUF_LEN); VERIFY(chksum, 0, "H5_checksum_fletcher32"); @@ -209,7 +209,7 @@ test_chksum_large(void) VERIFY(chksum, 0x930c7afc, "H5_checksum_lookup3"); /* Release memory for buffer */ - HDfree(large_buf); + free(large_buf); } /* test_chksum_large() */ /**************************************************************** diff --git a/test/tcoords.c b/test/tcoords.c index 230db60..88931fc 100644 --- a/test/tcoords.c +++ b/test/tcoords.c @@ -86,7 +86,7 @@ test_singleEnd_selElements(hid_t file, hbool_t is_chunked) } /* Construct dataset's name */ - HDmemset(dset_name, 0, (size_t)NAME_LEN); + memset(dset_name, 0, (size_t)NAME_LEN); HDstrcat(dset_name, SINGLE_END_DSET); if (is_chunked) HDstrcat(dset_name, "_chunked"); @@ -258,7 +258,7 @@ test_singleEnd_selHyperslab(hid_t file, hbool_t is_chunked) hsize_t mem3_block[4] = {1, 3, 6, 1}; /* Construct dataset's name */ - HDmemset(dset_name, 0, NAME_LEN); + memset(dset_name, 0, NAME_LEN); HDstrcat(dset_name, SINGLE_END_DSET); if (is_chunked) HDstrcat(dset_name, "_chunked"); @@ -435,18 +435,18 @@ test_multiple_ends(hid_t file, hbool_t is_chunked) hsize_t mem5_block[8] = {4, 5, 1, 4, 2, 1, 6, 2}; /* Initialize dynamic arrays */ - data_buf = HDcalloc(1, sizeof(*data_buf)); - CHECK_PTR(data_buf, "HDcalloc"); - mem1_buffer = HDcalloc(1, sizeof(*mem1_buffer)); - CHECK_PTR(data_buf, "HDcalloc"); - mem2_buffer = HDcalloc(1, sizeof(*mem2_buffer)); - CHECK_PTR(data_buf, "HDcalloc"); - mem3_buffer = HDcalloc(1, sizeof(*mem3_buffer)); - CHECK_PTR(data_buf, "HDcalloc"); - mem4_buffer = HDcalloc(1, sizeof(*mem4_buffer)); - CHECK_PTR(data_buf, "HDcalloc"); - mem5_buffer = HDcalloc(1, sizeof(*mem5_buffer)); - CHECK_PTR(data_buf, "HDcalloc"); + data_buf = calloc(1, sizeof(*data_buf)); + CHECK_PTR(data_buf, "calloc"); + mem1_buffer = calloc(1, sizeof(*mem1_buffer)); + CHECK_PTR(data_buf, "calloc"); + mem2_buffer = calloc(1, sizeof(*mem2_buffer)); + CHECK_PTR(data_buf, "calloc"); + mem3_buffer = calloc(1, sizeof(*mem3_buffer)); + CHECK_PTR(data_buf, "calloc"); + mem4_buffer = calloc(1, sizeof(*mem4_buffer)); + CHECK_PTR(data_buf, "calloc"); + mem5_buffer = calloc(1, sizeof(*mem5_buffer)); + CHECK_PTR(data_buf, "calloc"); /* Create and write the dataset */ sid = H5Screate_simple(8, da_dims, da_dims); @@ -461,7 +461,7 @@ test_multiple_ends(hid_t file, hbool_t is_chunked) } /* Construct dataset's name */ - HDmemset(dset_name, 0, NAME_LEN); + memset(dset_name, 0, NAME_LEN); HDstrcat(dset_name, MULTI_ENDS_SEL_HYPER_DSET); if (is_chunked) HDstrcat(dset_name, "_chunked"); @@ -664,12 +664,12 @@ test_multiple_ends(hid_t file, hbool_t is_chunked) ret = H5Pclose(plid); CHECK(ret, FAIL, "H5Pclose"); - HDfree(data_buf); - HDfree(mem1_buffer); - HDfree(mem2_buffer); - HDfree(mem3_buffer); - HDfree(mem4_buffer); - HDfree(mem5_buffer); + free(data_buf); + free(mem1_buffer); + free(mem2_buffer); + free(mem3_buffer); + free(mem4_buffer); + free(mem5_buffer); } /**************************************************************** diff --git a/test/testframe.c b/test/testframe.c index f3cf781..1583c60 100644 --- a/test/testframe.c +++ b/test/testframe.c @@ -72,12 +72,12 @@ AddTest(const char *TheName, void (*TheCall)(void), void (*Cleanup)(void), const { /* Sanity checking */ if (HDstrlen(TheDescr) >= MAXTESTDESC) { - HDprintf("Test description ('%s') too long, increase MAXTESTDESC(%d).\n", TheDescr, MAXTESTDESC); - HDexit(EXIT_FAILURE); + printf("Test description ('%s') too long, increase MAXTESTDESC(%d).\n", TheDescr, MAXTESTDESC); + exit(EXIT_FAILURE); } /* end if */ if (HDstrlen(TheName) >= MAXTESTNAME) { - HDprintf("Test name too long, increase MAXTESTNAME(%d).\n", MAXTESTNAME); - HDexit(EXIT_FAILURE); + printf("Test name too long, increase MAXTESTNAME(%d).\n", MAXTESTNAME); + exit(EXIT_FAILURE); } /* end if */ /* Check for increasing the Test array size */ @@ -86,10 +86,10 @@ AddTest(const char *TheName, void (*TheCall)(void), void (*Cleanup)(void), const unsigned newAlloc = MAX(1, TestAlloc * 2); /* New array size */ /* Reallocate array */ - if (NULL == (newTest = (TestStruct *)HDrealloc(Test, newAlloc * sizeof(TestStruct)))) { - HDprintf("Out of memory for tests, Index = %u, TestAlloc = %u, newAlloc = %u\n", Index, TestAlloc, - newAlloc); - HDexit(EXIT_FAILURE); + if (NULL == (newTest = (TestStruct *)realloc(Test, newAlloc * sizeof(TestStruct)))) { + printf("Out of memory for tests, Index = %u, TestAlloc = %u, newAlloc = %u\n", Index, TestAlloc, + newAlloc); + exit(EXIT_FAILURE); } /* end if */ /* Update info */ @@ -230,7 +230,7 @@ TestParseCmdLine(int argc, char *argv[]) } else { TestUsage(); - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); } } else if (((HDstrcmp(*argv, "-exclude") == 0) || (HDstrcmp(*argv, "-x") == 0))) { @@ -241,7 +241,7 @@ TestParseCmdLine(int argc, char *argv[]) } else { TestUsage(); - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); } } else if (((HDstrcmp(*argv, "-begin") == 0) || (HDstrcmp(*argv, "-b") == 0))) { @@ -252,7 +252,7 @@ TestParseCmdLine(int argc, char *argv[]) } else { TestUsage(); - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); } } else if (((HDstrcmp(*argv, "-only") == 0) || (HDstrcmp(*argv, "-o") == 0))) { @@ -272,7 +272,7 @@ TestParseCmdLine(int argc, char *argv[]) } else { TestUsage(); - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); } } else if ((HDstrcmp(*argv, "-summary") == 0) || (HDstrcmp(*argv, "-s") == 0)) @@ -281,7 +281,7 @@ TestParseCmdLine(int argc, char *argv[]) enable_error_stack = 1; else if ((HDstrcmp(*argv, "-help") == 0) || (HDstrcmp(*argv, "-h") == 0)) { TestUsage(); - HDexit(EXIT_SUCCESS); + exit(EXIT_SUCCESS); } else if ((HDstrcmp(*argv, "-cleanoff") == 0) || (HDstrcmp(*argv, "-c") == 0)) SetTestNoCleanup(); @@ -295,7 +295,7 @@ TestParseCmdLine(int argc, char *argv[]) if (NULL != TestPrivateParser) { ret_code = TestPrivateParser(argc + 1, argv - 1); if (ret_code != 0) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); } } @@ -378,7 +378,7 @@ void TestShutdown(void) { if (Test) - HDfree(Test); + free(Test); } /* @@ -530,7 +530,7 @@ ParseTestVerbosity(char *argv) else if (*argv == 'h') SetTestVerbosity(VERBO_HI); else - SetTestVerbosity(HDatoi(argv)); + SetTestVerbosity(atoi(argv)); } /* @@ -574,9 +574,9 @@ TestErrPrintf(const char *format, ...) num_errs++; /* Print the requested information */ - HDva_start(arglist, format); + va_start(arglist, format); ret_value = HDvprintf(format, arglist); - HDva_end(arglist); + va_end(arglist); /* Return the length of the string produced (like printf() does) */ return ret_value; @@ -624,7 +624,7 @@ SetTest(const char *testname, int action) break; default: /* error */ - HDprintf("*** ERROR: Unknown action (%d) for SetTest\n", action); + printf("*** ERROR: Unknown action (%d) for SetTest\n", action); break; } } @@ -646,7 +646,7 @@ TestAlarmOn(void) alarm_sec = (unsigned)HDstrtoul(env_val, (char **)NULL, 10); /* Set the number of seconds before alarm goes off */ - HDalarm((unsigned)alarm_sec); + alarm((unsigned)alarm_sec); #endif } @@ -656,6 +656,6 @@ TestAlarmOff(void) { #ifdef H5_HAVE_ALARM /* Set the number of seconds to zero */ - HDalarm(0); + alarm(0); #endif } diff --git a/test/testhdf5.c b/test/testhdf5.c index 711c9dc..82bc2b6 100644 --- a/test/testhdf5.c +++ b/test/testhdf5.c @@ -89,7 +89,7 @@ main(int argc, char *argv[]) /* Exit failure if errors encountered; else exit success. */ /* No need to print anything since PerformTests() already does. */ if (GetTestNumErrs() > 0) - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); else - HDexit(EXIT_SUCCESS); + exit(EXIT_SUCCESS); } /* end main() */ diff --git a/test/testmeta.c b/test/testmeta.c index d844c2e..048e3a6 100644 --- a/test/testmeta.c +++ b/test/testmeta.c @@ -101,8 +101,8 @@ main(void) for (j = 0; j < NDATAOBJECTS; j++) { /* Removed print statement as it would lock system resources on Windows */ /* - * HDprintf("\rWriting Object #%d of %d", j+1, NDATAOBJECTS); - * HDfflush(stdout); + * printf("\rWriting Object #%d of %d", j+1, NDATAOBJECTS); + * fflush(stdout); */ floatval = (float)j; @@ -110,7 +110,7 @@ main(void) HDsnprintf(name, sizeof(name), "/DataArray/%06d", j); group_id = H5Gcreate2(file_id, name, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); if (group_id < 0) { - HDfprintf(stderr, "Failed to create DataArray group.\n"); + fprintf(stderr, "Failed to create DataArray group.\n"); status = H5Fclose(file_id); return -1; } @@ -127,7 +127,7 @@ main(void) dataset_id = H5Dcreate2(group_id, name, H5T_NATIVE_FLOAT, dataspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); if (dataset_id < 0) { - HDfprintf(stderr, "Failed to create DataArray dataset.\n"); + fprintf(stderr, "Failed to create DataArray dataset.\n"); status = H5Fclose(file_id); return -1; } @@ -135,7 +135,7 @@ main(void) /* Write the data array data */ status = H5Dwrite(dataset_id, H5T_NATIVE_FLOAT, H5S_ALL, H5S_ALL, H5P_DEFAULT, data); if (status < 0) { - HDfprintf(stderr, "Failed to write DataArray dataset.\n"); + fprintf(stderr, "Failed to write DataArray dataset.\n"); status = H5Fclose(file_id); return -1; } @@ -148,7 +148,7 @@ main(void) /* Open NumDataObj dataset */ dataset_id = H5Dopen2(file_id, "/NumDataObj", H5P_DEFAULT); if (dataset_id < 0) { - HDfprintf(stderr, "Failed to open NumDataObj dataset.\n"); + fprintf(stderr, "Failed to open NumDataObj dataset.\n"); status = H5Fclose(file_id); return -1; } @@ -157,7 +157,7 @@ main(void) numdataobj = j + 1; status = H5Dwrite(dataset_id, H5T_NATIVE_UINT, H5S_ALL, H5S_ALL, H5P_DEFAULT, &numdataobj); if (status < 0) { - HDfprintf(stderr, "Failed to write NumDataObj dataset.\n"); + fprintf(stderr, "Failed to write NumDataObj dataset.\n"); status = H5Fclose(file_id); return -1; } @@ -172,7 +172,7 @@ main(void) HDsnprintf(name, sizeof(name), "/ExtArray%06d", i); dataset_id = H5Dopen2(file_id, name, H5P_DEFAULT); if (dataset_id < 0) { - HDfprintf(stderr, "Failed to open ExtArray dataset.\n"); + fprintf(stderr, "Failed to open ExtArray dataset.\n"); status = H5Fclose(file_id); return -1; } /* end if */ @@ -181,7 +181,7 @@ main(void) dims[0] = (hsize_t)j + 1; status = H5Dset_extent(dataset_id, dims); if (status < 0) { - HDfprintf(stderr, "Failed to extend DataArray dataset.\n"); + fprintf(stderr, "Failed to extend DataArray dataset.\n"); status = H5Fclose(file_id); return -1; } /* end if */ @@ -198,7 +198,7 @@ main(void) status = H5Sselect_hyperslab(dataspace_id, H5S_SELECT_SET, start, stride, count, NULL); status = H5Dwrite(dataset_id, type_id, memspace_id, dataspace_id, H5P_DEFAULT, &floatval); if (status < 0) { - HDfprintf(stderr, "Failed to write DataArray dataset.\n"); + fprintf(stderr, "Failed to write DataArray dataset.\n"); status = H5Fclose(file_id); return -1; } @@ -214,7 +214,7 @@ main(void) /* Close the file */ status = H5Fclose(file_id); - HDprintf("\n"); + printf("\n"); return 0; } diff --git a/test/tfile.c b/test/tfile.c index 0556b81..66ae7d7 100644 --- a/test/tfile.c +++ b/test/tfile.c @@ -1205,8 +1205,8 @@ test_get_obj_ids(void) CHECK(oid_count, FAIL, "H5Fget_obj_count"); VERIFY(oid_count, (NGROUPS + NDSETS + 1), "H5Fget_obj_count"); - oid_list = (hid_t *)HDcalloc((size_t)oid_list_size, sizeof(hid_t)); - CHECK_PTR(oid_list, "HDcalloc"); + oid_list = (hid_t *)calloc((size_t)oid_list_size, sizeof(hid_t)); + CHECK_PTR(oid_list, "calloc"); /* Call the public function H5F_get_obj_ids to use H5F__get_objects. User reported having problem here. * that the returned size (ret_count) from H5Fget_obj_ids is one greater than the size passed in @@ -1246,7 +1246,7 @@ test_get_obj_ids(void) H5Sclose(filespace); H5Fclose(fid); - HDfree(oid_list); + free(oid_list); /* Reopen the file to check whether H5Fget_obj_count and H5Fget_obj_ids still works * when the file is closed first */ @@ -1268,8 +1268,8 @@ test_get_obj_ids(void) CHECK(oid_count, FAIL, "H5Fget_obj_count"); VERIFY(oid_count, NDSETS, "H5Fget_obj_count"); - oid_list = (hid_t *)HDcalloc((size_t)oid_count, sizeof(hid_t)); - CHECK_PTR(oid_list, "HDcalloc"); + oid_list = (hid_t *)calloc((size_t)oid_count, sizeof(hid_t)); + CHECK_PTR(oid_list, "calloc"); /* Get the list of all opened objects */ ret_count = H5Fget_obj_ids((hid_t)H5F_OBJ_ALL, H5F_OBJ_ALL, (size_t)oid_count, oid_list); @@ -1284,7 +1284,7 @@ test_get_obj_ids(void) } H5E_END_TRY; - HDfree(oid_list); + free(oid_list); } /**************************************************************** @@ -1503,7 +1503,7 @@ test_obj_count_and_id(hid_t fid1, hid_t fid2, hid_t did, hid_t gid1, hid_t gid2, if (oid_count > 0) { hid_t *oid_list; - oid_list = (hid_t *)HDcalloc((size_t)oid_count, sizeof(hid_t)); + oid_list = (hid_t *)calloc((size_t)oid_count, sizeof(hid_t)); if (oid_list != NULL) { int i; @@ -1553,7 +1553,7 @@ test_obj_count_and_id(hid_t fid1, hid_t fid2, hid_t did, hid_t gid1, hid_t gid2, } /* end switch */ } /* end for */ - HDfree(oid_list); + free(oid_list); } /* end if */ } /* end if */ @@ -2795,7 +2795,7 @@ test_file_double_file_dataset_open(hbool_t new_format) CHECK(tid1, FAIL, "H5Tcopy"); /* Second file's dataset read */ - HDmemset(buffer, 0, sizeof(char *) * 5); + memset(buffer, 0, sizeof(char *) * 5); ret = H5Dread(did2, tid2, H5S_ALL, H5S_ALL, H5P_DEFAULT, buffer); CHECK(ret, FAIL, "H5Dread"); ret = H5Treclaim(tid2, sid1, H5P_DEFAULT, buffer); @@ -2810,7 +2810,7 @@ test_file_double_file_dataset_open(hbool_t new_format) CHECK(ret, FAIL, "H5Fclose"); /* First file's dataset read */ - HDmemset(buffer, 0, sizeof(char *) * 5); + memset(buffer, 0, sizeof(char *) * 5); ret = H5Dread(did1, tid1, H5S_ALL, H5S_ALL, H5P_DEFAULT, buffer); CHECK(ret, FAIL, "H5Dread"); ret = H5Treclaim(tid2, sid1, H5P_DEFAULT, buffer); @@ -3181,19 +3181,19 @@ cal_chksum(const char *file, uint32_t *chksum) CHECK(fdes, FAIL, "HDfstat"); /* Allocate space for the file data */ - file_data = HDmalloc((size_t)sb.st_size); - CHECK_PTR(file_data, "HDmalloc"); + file_data = malloc((size_t)sb.st_size); + CHECK_PTR(file_data, "malloc"); 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, "HDmalloc"); + CHECK(bytes_read == sb.st_size, FALSE, "malloc"); /* Calculate checksum */ *chksum = H5_checksum_lookup3(file_data, sizeof(file_data), 0); /* Free memory */ - HDfree(file_data); + free(file_data); } /* Close the file */ @@ -4406,9 +4406,9 @@ set_multi_split(hid_t fapl, hsize_t pagesize, hbool_t split) hbool_t relax; H5FD_mem_t mt; - HDassert(split); + assert(split); - HDmemset(memb_name, 0, sizeof memb_name); + memset(memb_name, 0, sizeof memb_name); /* Get current split settings */ if (H5Pget_fapl_multi(fapl, memb_map, memb_fapl_arr, memb_name, memb_addr, &relax) < 0) @@ -4432,7 +4432,7 @@ set_multi_split(hid_t fapl, hsize_t pagesize, hbool_t split) /* Free memb_name */ for (mt = H5FD_MEM_DEFAULT; mt < H5FD_MEM_NTYPES; mt++) - HDfree(memb_name[mt]); + free(memb_name[mt]); return 0; @@ -4756,7 +4756,7 @@ test_sects_freespace(const char *env_h5_drvr, hbool_t new_format) VERIFY(nsects, FAIL, "H5Fget_free_sections"); /* Retrieve and verify free space info for all the sections */ - HDmemset(all_sect_info, 0, sizeof(all_sect_info)); + memset(all_sect_info, 0, sizeof(all_sect_info)); nsects = H5Fget_free_sections(file, H5FD_MEM_DEFAULT, (size_t)nall, all_sect_info); VERIFY(nsects, nall, "H5Fget_free_sections"); @@ -4769,7 +4769,7 @@ test_sects_freespace(const char *env_h5_drvr, hbool_t new_format) last_size = all_sect_info[nall - 1].size; /* Retrieve and verify free space info for -1 sections */ - HDmemset(sect_info, 0, sizeof(sect_info)); + memset(sect_info, 0, sizeof(sect_info)); nsects = H5Fget_free_sections(file, H5FD_MEM_DEFAULT, (size_t)(nall - 1), sect_info); VERIFY(nsects, nall, "H5Fget_free_sections"); @@ -4783,7 +4783,7 @@ test_sects_freespace(const char *env_h5_drvr, hbool_t new_format) VERIFY(((hsize_t)free_space - last_size), total, "H5Fget_free_sections"); /* Retrieve and verify free-space info for +1 sections */ - HDmemset(sect_info, 0, sizeof(sect_info)); + memset(sect_info, 0, sizeof(sect_info)); nsects = H5Fget_free_sections(file, H5FD_MEM_DEFAULT, (size_t)(nall + 1), sect_info); VERIFY(nsects, nall, "H5Fget_free_sections"); @@ -4798,7 +4798,7 @@ test_sects_freespace(const char *env_h5_drvr, hbool_t new_format) VERIFY(sect_info[nall].size, 0, "H5Fget_free_sections"); VERIFY(free_space, total, "H5Fget_free_sections"); - HDmemset(meta_sect_info, 0, sizeof(meta_sect_info)); + memset(meta_sect_info, 0, sizeof(meta_sect_info)); if (multi_vfd) { hssize_t ntmp; @@ -4831,7 +4831,7 @@ test_sects_freespace(const char *env_h5_drvr, hbool_t new_format) CHECK(nraw, FAIL, "H5Fget_free_sections"); /* Retrieve and verify free-space sections for raw data */ - HDmemset(raw_sect_info, 0, sizeof(raw_sect_info)); + memset(raw_sect_info, 0, sizeof(raw_sect_info)); nsects = H5Fget_free_sections(file, H5FD_MEM_DRAW, (size_t)nraw, raw_sect_info); VERIFY(nsects, nraw, "H5Fget_free_sections"); @@ -5631,7 +5631,7 @@ test_libver_bounds_copy(void) CHECK_I(ret, "h5_driver_is_default_vfd_compatible"); if (!driver_is_default_compatible) { - HDprintf("-- SKIPPED --\n"); + printf("-- SKIPPED --\n"); return; } diff --git a/test/tgenprop.c b/test/tgenprop.c index 5751ce7..51ca79a 100644 --- a/test/tgenprop.c +++ b/test/tgenprop.c @@ -703,8 +703,8 @@ test_genprop_basic_list(void) CHECK_I(ret, "H5Pget"); /* Verify the floating-poing value in this way to avoid compiler warning. */ if (!H5_FLT_ABS_EQUAL(prop2_value, *PROP2_DEF_VALUE)) - HDprintf("*** UNEXPECTED VALUE from %s should be %f, but is %f at line %4d in %s\n", "H5Pget", - (double)*PROP2_DEF_VALUE, (double)prop2_value, (int)__LINE__, __FILE__); + printf("*** UNEXPECTED VALUE from %s should be %f, but is %f at line %4d in %s\n", "H5Pget", + (double)*PROP2_DEF_VALUE, (double)prop2_value, (int)__LINE__, __FILE__); /* Close list */ ret = H5Pclose(lid1); @@ -796,20 +796,20 @@ test_genprop_basic_list_prop(void) CHECK_I(ret, "H5Pget"); /* Verify the floating-poing value in this way to avoid compiler warning. */ if (!H5_FLT_ABS_EQUAL(prop2_value, *PROP2_DEF_VALUE)) - HDprintf("*** UNEXPECTED VALUE from %s should be %f, but is %f at line %4d in %s\n", "H5Pget", - (double)*PROP2_DEF_VALUE, (double)prop2_value, (int)__LINE__, __FILE__); + printf("*** UNEXPECTED VALUE from %s should be %f, but is %f at line %4d in %s\n", "H5Pget", + (double)*PROP2_DEF_VALUE, (double)prop2_value, (int)__LINE__, __FILE__); /* Check values of temporary properties (set with regular values) */ ret = H5Pget(lid1, PROP3_NAME, &prop3_value); CHECK_I(ret, "H5Pget"); - if (HDmemcmp(&prop3_value, PROP3_DEF_VALUE, PROP3_SIZE) != 0) + if (memcmp(&prop3_value, PROP3_DEF_VALUE, PROP3_SIZE) != 0) TestErrPrintf("Property #3 doesn't match!, line=%d\n", __LINE__); ret = H5Pget(lid1, PROP4_NAME, &prop4_value); CHECK_I(ret, "H5Pget"); /* Verify the floating-poing value in this way to avoid compiler warning. */ if (!H5_DBL_ABS_EQUAL(prop4_value, *PROP4_DEF_VALUE)) - HDprintf("*** UNEXPECTED VALUE from %s should be %f, but is %f at line %4d in %s\n", "H5Pget", - *PROP4_DEF_VALUE, prop4_value, (int)__LINE__, __FILE__); + printf("*** UNEXPECTED VALUE from %s should be %f, but is %f at line %4d in %s\n", "H5Pget", + *PROP4_DEF_VALUE, prop4_value, (int)__LINE__, __FILE__); /* Delete permanent property */ ret = H5Premove(lid1, PROP2_NAME); @@ -845,8 +845,8 @@ test_genprop_basic_list_prop(void) CHECK_I(ret, "H5Pget"); /* Verify the floating-poing value in this way to avoid compiler warning. */ if (!H5_DBL_ABS_EQUAL(prop4_value, *PROP4_DEF_VALUE)) - HDprintf("*** UNEXPECTED VALUE from %s should be %f, but is %f at line %4d in %s\n", "H5Pget", - *PROP4_DEF_VALUE, prop4_value, (int)__LINE__, __FILE__); + printf("*** UNEXPECTED VALUE from %s should be %f, but is %f at line %4d in %s\n", "H5Pget", + *PROP4_DEF_VALUE, prop4_value, (int)__LINE__, __FILE__); /* Close list */ ret = H5Pclose(lid1); @@ -1027,8 +1027,8 @@ test_genprop_prop_crt_cb1(const char *name, size_t size, void *def_value) /* Set the information from the creation call */ prop1_cb_info.crt_count++; prop1_cb_info.crt_name = HDstrdup(name); - prop1_cb_info.crt_value = HDmalloc(size); - HDmemcpy(prop1_cb_info.crt_value, def_value, size); + prop1_cb_info.crt_value = malloc(size); + memcpy(prop1_cb_info.crt_value, def_value, size); return (SUCCEED); } @@ -1047,8 +1047,8 @@ test_genprop_prop_set_cb1(hid_t plist_id, const char *name, size_t size, void *v if (prop1_cb_info.set_name == NULL) prop1_cb_info.set_name = HDstrdup(name); if (prop1_cb_info.set_value == NULL) - prop1_cb_info.set_value = HDmalloc(size); - HDmemcpy(prop1_cb_info.set_value, value, size); + prop1_cb_info.set_value = malloc(size); + memcpy(prop1_cb_info.set_value, value, size); return (SUCCEED); } @@ -1067,8 +1067,8 @@ test_genprop_prop_get_cb1(hid_t plist_id, const char *name, size_t size, void *v if (prop1_cb_info.get_name == NULL) prop1_cb_info.get_name = HDstrdup(name); if (prop1_cb_info.get_value == NULL) - prop1_cb_info.get_value = HDmalloc(size); - HDmemcpy(prop1_cb_info.get_value, value, size); + prop1_cb_info.get_value = malloc(size); + memcpy(prop1_cb_info.get_value, value, size); return (SUCCEED); } @@ -1086,8 +1086,8 @@ test_genprop_prop_cop_cb1(const char *name, size_t size, void *value) if (prop1_cb_info.cop_name == NULL) prop1_cb_info.cop_name = HDstrdup(name); if (prop1_cb_info.cop_value == NULL) - prop1_cb_info.cop_value = HDmalloc(size); - HDmemcpy(prop1_cb_info.cop_value, value, size); + prop1_cb_info.cop_value = malloc(size); + memcpy(prop1_cb_info.cop_value, value, size); return (SUCCEED); } @@ -1103,7 +1103,7 @@ test_genprop_prop_cmp_cb1(const void *value1, const void *value2, size_t size) /* Set the information from the comparison call */ prop1_cb_info.cmp_count++; - return (HDmemcmp(value1, value2, size)); + return (memcmp(value1, value2, size)); } /**************************************************************** @@ -1117,7 +1117,7 @@ test_genprop_prop_cmp_cb3(const void *value1, const void *value2, size_t size) /* Set the information from the comparison call */ prop3_cb_info.cmp_count++; - return (HDmemcmp(value1, value2, size)); + return (memcmp(value1, value2, size)); } /**************************************************************** @@ -1133,8 +1133,8 @@ test_genprop_prop_cls_cb1(const char *name, size_t size, void *value) if (prop1_cb_info.cls_name == NULL) prop1_cb_info.cls_name = HDstrdup(name); if (prop1_cb_info.cls_value == NULL) - prop1_cb_info.cls_value = HDmalloc(size); - HDmemcpy(prop1_cb_info.cls_value, value, size); + prop1_cb_info.cls_value = malloc(size); + memcpy(prop1_cb_info.cls_value, value, size); return (SUCCEED); } @@ -1151,8 +1151,8 @@ test_genprop_prop_del_cb2(hid_t plist_id, const char *name, size_t size, void *v prop2_cb_info.del_count++; prop2_cb_info.del_plist_id = plist_id; prop2_cb_info.del_name = HDstrdup(name); - prop2_cb_info.del_value = HDmalloc(size); - HDmemcpy(prop2_cb_info.del_value, value, size); + prop2_cb_info.del_value = malloc(size); + memcpy(prop2_cb_info.del_value, value, size); return (SUCCEED); } @@ -1221,9 +1221,9 @@ test_genprop_list_callback(void) cop_cb_struct.id = (-1); /* Initialize callback information for properties tracked */ - HDmemset(&prop1_cb_info, 0, sizeof(prop_cb_info)); - HDmemset(&prop2_cb_info, 0, sizeof(prop_cb_info)); - HDmemset(&prop3_cb_info, 0, sizeof(prop_cb_info)); + memset(&prop1_cb_info, 0, sizeof(prop_cb_info)); + memset(&prop2_cb_info, 0, sizeof(prop_cb_info)); + memset(&prop3_cb_info, 0, sizeof(prop_cb_info)); /* Create a property list from the class */ lid1 = H5Pcreate(cid1); @@ -1240,7 +1240,7 @@ test_genprop_list_callback(void) VERIFY(prop1_cb_info.crt_count, 1, "H5Pcreate"); if (HDstrcmp(prop1_cb_info.crt_name, PROP1_NAME) != 0) TestErrPrintf("Property #1 name doesn't match!, line=%d\n", __LINE__); - if (HDmemcmp(prop1_cb_info.crt_value, PROP1_DEF_VALUE, PROP1_SIZE) != 0) + if (memcmp(prop1_cb_info.crt_value, PROP1_DEF_VALUE, PROP1_SIZE) != 0) TestErrPrintf("Property #1 value doesn't match!, line=%d\n", __LINE__); /* Check values of permanent properties (set with default values) */ @@ -1253,13 +1253,13 @@ test_genprop_list_callback(void) CHECK_I(ret, "H5Pget"); /* Verify the floating-poing value in this way to avoid compiler warning. */ if (!H5_FLT_ABS_EQUAL(prop2_value, *PROP2_DEF_VALUE)) - HDprintf("*** UNEXPECTED VALUE from %s should be %f, but is %f at line %4d in %s\n", "H5Pget", - (double)*PROP2_DEF_VALUE, (double)prop2_value, (int)__LINE__, __FILE__); + printf("*** UNEXPECTED VALUE from %s should be %f, but is %f at line %4d in %s\n", "H5Pget", + (double)*PROP2_DEF_VALUE, (double)prop2_value, (int)__LINE__, __FILE__); /* Check values of temporary properties (set with regular values) */ ret = H5Pget(lid1, PROP3_NAME, &prop3_value); CHECK_I(ret, "H5Pget"); - if (HDmemcmp(&prop3_value, PROP3_DEF_VALUE, PROP3_SIZE) != 0) + if (memcmp(&prop3_value, PROP3_DEF_VALUE, PROP3_SIZE) != 0) TestErrPrintf("Property #3 doesn't match!, line=%d\n", __LINE__); /* The compare callback should not have been called, as there is no get * callback for this property */ @@ -1268,15 +1268,15 @@ test_genprop_list_callback(void) CHECK_I(ret, "H5Pget"); /* Verify the floating-poing value in this way to avoid compiler warning. */ if (!H5_DBL_ABS_EQUAL(prop4_value, *PROP4_DEF_VALUE)) - HDprintf("*** UNEXPECTED VALUE from %s should be %f, but is %f at line %4d in %s\n", "H5Pget", - *PROP4_DEF_VALUE, prop4_value, (int)__LINE__, __FILE__); + printf("*** UNEXPECTED VALUE from %s should be %f, but is %f at line %4d in %s\n", "H5Pget", + *PROP4_DEF_VALUE, prop4_value, (int)__LINE__, __FILE__); /* Verify get callback information for properties tracked */ VERIFY(prop1_cb_info.get_count, 1, "H5Pget"); VERIFY(prop1_cb_info.get_plist_id, lid1, "H5Pget"); if (HDstrcmp(prop1_cb_info.get_name, PROP1_NAME) != 0) TestErrPrintf("Property #1 name doesn't match!, line=%d\n", __LINE__); - if (HDmemcmp(prop1_cb_info.get_value, PROP1_DEF_VALUE, PROP1_SIZE) != 0) + if (memcmp(prop1_cb_info.get_value, PROP1_DEF_VALUE, PROP1_SIZE) != 0) TestErrPrintf("Property #1 value doesn't match!, line=%d\n", __LINE__); /* Set value of property #1 to different value */ @@ -1288,7 +1288,7 @@ test_genprop_list_callback(void) VERIFY(prop1_cb_info.set_plist_id, lid1, "H5Pset"); if (HDstrcmp(prop1_cb_info.set_name, PROP1_NAME) != 0) TestErrPrintf("Property #1 name doesn't match!, line=%d\n", __LINE__); - if (HDmemcmp(prop1_cb_info.set_value, &prop1_new_value, PROP1_SIZE) != 0) + if (memcmp(prop1_cb_info.set_value, &prop1_new_value, PROP1_SIZE) != 0) TestErrPrintf("Property #1 value doesn't match!, line=%d\n", __LINE__); /* The compare callback should not have been called */ @@ -1311,7 +1311,7 @@ test_genprop_list_callback(void) VERIFY(prop1_cb_info.get_plist_id, lid1, "H5Pget"); if (HDstrcmp(prop1_cb_info.get_name, PROP1_NAME) != 0) TestErrPrintf("Property #1 name doesn't match!, line=%d\n", __LINE__); - if (HDmemcmp(prop1_cb_info.get_value, &prop1_new_value, PROP1_SIZE) != 0) + if (memcmp(prop1_cb_info.get_value, &prop1_new_value, PROP1_SIZE) != 0) TestErrPrintf("Property #1 value doesn't match!, line=%d\n", __LINE__); /* Delete property #2 */ @@ -1323,7 +1323,7 @@ test_genprop_list_callback(void) VERIFY(prop2_cb_info.del_plist_id, lid1, "H5Premove"); if (HDstrcmp(prop2_cb_info.del_name, PROP2_NAME) != 0) TestErrPrintf("Property #2 name doesn't match!, line=%d\n", __LINE__); - if (HDmemcmp(prop2_cb_info.del_value, PROP2_DEF_VALUE, PROP2_SIZE) != 0) + if (memcmp(prop2_cb_info.del_value, PROP2_DEF_VALUE, PROP2_SIZE) != 0) TestErrPrintf("Property #2 value doesn't match!, line=%d\n", __LINE__); /* Copy first list */ @@ -1334,7 +1334,7 @@ test_genprop_list_callback(void) VERIFY(prop1_cb_info.cop_count, 1, "H5Pcopy"); if (HDstrcmp(prop1_cb_info.cop_name, PROP1_NAME) != 0) TestErrPrintf("Property #1 name doesn't match!, line=%d\n", __LINE__); - if (HDmemcmp(prop1_cb_info.cop_value, &prop1_new_value, PROP1_SIZE) != 0) + if (memcmp(prop1_cb_info.cop_value, &prop1_new_value, PROP1_SIZE) != 0) TestErrPrintf("Property #1 value doesn't match!, line=%d\n", __LINE__); /* Verify that the class creation callback occurred */ @@ -1357,7 +1357,7 @@ test_genprop_list_callback(void) VERIFY(prop1_cb_info.cls_count, 1, "H5Pclose"); if (HDstrcmp(prop1_cb_info.cls_name, PROP1_NAME) != 0) TestErrPrintf("Property #1 name doesn't match!, line=%d\n", __LINE__); - if (HDmemcmp(prop1_cb_info.cls_value, &prop1_new_value, PROP1_SIZE) != 0) + if (memcmp(prop1_cb_info.cls_value, &prop1_new_value, PROP1_SIZE) != 0) TestErrPrintf("Property #1 value doesn't match!, line=%d\n", __LINE__); /* Close second list */ @@ -1368,18 +1368,18 @@ test_genprop_list_callback(void) VERIFY(prop1_cb_info.cls_count, 2, "H5Pclose"); /* Free memory allocated for tracking properties */ - HDfree(prop1_cb_info.crt_name); - HDfree(prop1_cb_info.crt_value); - HDfree(prop1_cb_info.get_name); - HDfree(prop1_cb_info.get_value); - HDfree(prop1_cb_info.set_name); - HDfree(prop1_cb_info.set_value); - HDfree(prop1_cb_info.cop_name); - HDfree(prop1_cb_info.cop_value); - HDfree(prop1_cb_info.cls_name); - HDfree(prop1_cb_info.cls_value); - HDfree(prop2_cb_info.del_name); - HDfree(prop2_cb_info.del_value); + free(prop1_cb_info.crt_name); + free(prop1_cb_info.crt_value); + free(prop1_cb_info.get_name); + free(prop1_cb_info.get_value); + free(prop1_cb_info.set_name); + free(prop1_cb_info.set_value); + free(prop1_cb_info.cop_name); + free(prop1_cb_info.cop_value); + free(prop1_cb_info.cls_name); + free(prop1_cb_info.cls_value); + free(prop2_cb_info.del_name); + free(prop2_cb_info.del_value); /* Close class */ ret = H5Pclose_class(cid1); diff --git a/test/th5_system.c b/test/th5_system.c index 4c652c1..7d500bd 100644 --- a/test/th5_system.c +++ b/test/th5_system.c @@ -33,8 +33,8 @@ test_h5_dirname(void) MESSAGE(5, ("Testing H5_dirname\n")); - path = HDmalloc(H5_SYSTEM_TEST_PATH_MAX); - CHECK_PTR(path, "HDmalloc"); + path = malloc(H5_SYSTEM_TEST_PATH_MAX); + CHECK_PTR(path, "malloc"); if (!path) return; @@ -225,7 +225,7 @@ test_h5_dirname(void) "comparing H5_dirname with contrived path to proper dirname"); H5MM_free(dirname); - HDfree(path); + free(path); } static void @@ -237,8 +237,8 @@ test_h5_basename(void) MESSAGE(5, ("Testing H5_basename\n")); - path = HDmalloc(H5_SYSTEM_TEST_PATH_MAX); - CHECK_PTR(path, "HDmalloc"); + path = malloc(H5_SYSTEM_TEST_PATH_MAX); + CHECK_PTR(path, "malloc"); if (!path) return; @@ -434,7 +434,7 @@ test_h5_basename(void) VERIFY_STR(basename, "finaldir", "comparing H5_basename with contrived path to proper basename"); H5MM_free(basename); - HDfree(path); + free(path); } static void diff --git a/test/th5o.c b/test/th5o.c index 027445e..9568a4c 100644 --- a/test/th5o.c +++ b/test/th5o.c @@ -957,10 +957,10 @@ test_h5o_link(void) /* Allocate memory buffers */ /* (These are treated as 2-D buffers) */ - wdata = (int *)HDmalloc((size_t)(TEST6_DIM1 * TEST6_DIM2) * sizeof(int)); - CHECK_PTR(wdata, "HDmalloc"); - rdata = (int *)HDmalloc((size_t)(TEST6_DIM1 * TEST6_DIM2) * sizeof(int)); - CHECK_PTR(rdata, "HDmalloc"); + wdata = (int *)malloc((size_t)(TEST6_DIM1 * TEST6_DIM2) * sizeof(int)); + CHECK_PTR(wdata, "malloc"); + rdata = (int *)malloc((size_t)(TEST6_DIM1 * TEST6_DIM2) * sizeof(int)); + CHECK_PTR(rdata, "malloc"); /* Initialize the raw data */ for (i = n = 0; i < (TEST6_DIM1 * TEST6_DIM2); i++) @@ -1083,8 +1083,8 @@ test_h5o_link(void) CHECK(ret, FAIL, "H5Pclose"); /* Release buffers */ - HDfree(wdata); - HDfree(rdata); + free(wdata); + free(rdata); } /* end test_h5o_link() */ /**************************************************************** @@ -1456,8 +1456,8 @@ test_h5o_getinfo_same_file(void) CHECK(gid2, FAIL, "H5Gcreate2"); /* Reset object info */ - HDmemset(&oinfo1, 0, sizeof(oinfo1)); - HDmemset(&oinfo2, 0, sizeof(oinfo2)); + memset(&oinfo1, 0, sizeof(oinfo1)); + memset(&oinfo2, 0, sizeof(oinfo2)); /* Query the object info for each object, through group IDs */ ret = H5Oget_info3(gid1, &oinfo1, H5O_INFO_BASIC); @@ -1468,8 +1468,8 @@ test_h5o_getinfo_same_file(void) VERIFY(oinfo1.fileno, oinfo2.fileno, "file number from H5Oget_info3"); /* Reset object info */ - HDmemset(&oinfo1, 0, sizeof(oinfo1)); - HDmemset(&oinfo2, 0, sizeof(oinfo2)); + memset(&oinfo1, 0, sizeof(oinfo1)); + memset(&oinfo2, 0, sizeof(oinfo2)); /* Query the object info for each object, by name */ ret = H5Oget_info_by_name3(fid1, "group1", &oinfo1, H5O_INFO_BASIC, H5P_DEFAULT); @@ -1500,8 +1500,8 @@ test_h5o_getinfo_same_file(void) CHECK(gid2, FAIL, "H5Gopen2"); /* Reset object info */ - HDmemset(&oinfo1, 0, sizeof(oinfo1)); - HDmemset(&oinfo2, 0, sizeof(oinfo2)); + memset(&oinfo1, 0, sizeof(oinfo1)); + memset(&oinfo2, 0, sizeof(oinfo2)); /* Query the object info for each object, through group IDs */ ret = H5Oget_info3(gid1, &oinfo1, H5O_INFO_BASIC); @@ -1512,8 +1512,8 @@ test_h5o_getinfo_same_file(void) VERIFY(oinfo1.fileno, oinfo2.fileno, "file number from H5Oget_info3"); /* Reset object info */ - HDmemset(&oinfo1, 0, sizeof(oinfo1)); - HDmemset(&oinfo2, 0, sizeof(oinfo2)); + memset(&oinfo1, 0, sizeof(oinfo1)); + memset(&oinfo2, 0, sizeof(oinfo2)); /* Query the object info for each object, by name */ ret = H5Oget_info_by_name3(fid1, "group1", &oinfo1, H5O_INFO_BASIC, H5P_DEFAULT); @@ -1775,8 +1775,8 @@ test_h5o_getinfo_visit(void) CHECK(gid2, FAIL, "H5Gcreate2"); /* Reset object info */ - HDmemset(&oinfo1, 0, sizeof(oinfo1)); - HDmemset(&oinfo2, 0, sizeof(oinfo2)); + memset(&oinfo1, 0, sizeof(oinfo1)); + memset(&oinfo2, 0, sizeof(oinfo2)); /* Query the object info for "group1" via H5Oget_info1 and H5Oget_info2 */ ret = H5Oget_info1(gid1, &oinfo1); @@ -1789,8 +1789,8 @@ test_h5o_getinfo_visit(void) VERIFY(oinfo1.num_attrs, oinfo2.num_attrs, "obj info from H5Oget_info1/2"); /* Reset object info */ - HDmemset(&oinfo1, 0, sizeof(oinfo1)); - HDmemset(&oinfo2, 0, sizeof(oinfo2)); + memset(&oinfo1, 0, sizeof(oinfo1)); + memset(&oinfo2, 0, sizeof(oinfo2)); /* Query the object info for "group2" via H5Oget_info1 and H5Oget_info2 */ ret = H5Oget_info_by_name1(fid, "group2", &oinfo1, H5P_DEFAULT); diff --git a/test/th5s.c b/test/th5s.c index 40d8b06..60aeb2c 100644 --- a/test/th5s.c +++ b/test/th5s.c @@ -144,7 +144,7 @@ test_h5s_basic(void) rank = H5Sget_simple_extent_dims(sid1, tdims, NULL); CHECK(rank, FAIL, "H5Sget_simple_extent_dims"); - VERIFY(HDmemcmp(tdims, dims1, SPACE1_RANK * sizeof(hsize_t)), 0, "H5Sget_simple_extent_dims"); + VERIFY(memcmp(tdims, dims1, SPACE1_RANK * sizeof(hsize_t)), 0, "H5Sget_simple_extent_dims"); sid2 = H5Screate_simple(SPACE2_RANK, dims2, max2); CHECK(sid2, FAIL, "H5Screate_simple"); @@ -159,16 +159,16 @@ test_h5s_basic(void) rank = H5Sget_simple_extent_dims(sid2, tdims, tmax); CHECK(rank, FAIL, "H5Sget_simple_extent_dims"); - VERIFY(HDmemcmp(tdims, dims2, SPACE2_RANK * sizeof(hsize_t)), 0, "H5Sget_simple_extent_dims"); - VERIFY(HDmemcmp(tmax, max2, SPACE2_RANK * sizeof(hsize_t)), 0, "H5Sget_simple_extent_dims"); + VERIFY(memcmp(tdims, dims2, SPACE2_RANK * sizeof(hsize_t)), 0, "H5Sget_simple_extent_dims"); + VERIFY(memcmp(tmax, max2, SPACE2_RANK * sizeof(hsize_t)), 0, "H5Sget_simple_extent_dims"); /* Change max dims to be equal to the dimensions */ ret = H5Sset_extent_simple(sid1, SPACE1_RANK, dims1, NULL); CHECK(ret, FAIL, "H5Sset_extent_simple"); rank = H5Sget_simple_extent_dims(sid1, tdims, tmax); CHECK(rank, FAIL, "H5Sget_simple_extent_dims"); - VERIFY(HDmemcmp(tdims, dims1, SPACE1_RANK * sizeof(hsize_t)), 0, "H5Sget_simple_extent_dims"); - VERIFY(HDmemcmp(tmax, dims1, SPACE1_RANK * sizeof(hsize_t)), 0, "H5Sget_simple_extent_dims"); + VERIFY(memcmp(tdims, dims1, SPACE1_RANK * sizeof(hsize_t)), 0, "H5Sget_simple_extent_dims"); + VERIFY(memcmp(tmax, dims1, SPACE1_RANK * sizeof(hsize_t)), 0, "H5Sget_simple_extent_dims"); ret = H5Sclose(sid1); CHECK(ret, FAIL, "H5Sclose"); @@ -209,7 +209,7 @@ test_h5s_basic(void) CHECK_I(ret, "H5Fclose"); } else - HDprintf("***cannot open the pre-created H5S_MAX_RANK test file (%s)\n", testfile); + printf("***cannot open the pre-created H5S_MAX_RANK test file (%s)\n", testfile); } /* Verify that incorrect dimensions don't work */ @@ -710,7 +710,7 @@ test_h5s_zero_dim(void) for (j = 0; j < SPACE1_DIM3; j++) { if (rdata[i][j] != 7) { H5_FAILED(); - HDprintf("element [%d][%d] is %d but should have been 7\n", i, j, rdata[i][j]); + printf("element [%d][%d] is %d but should have been 7\n", i, j, rdata[i][j]); } } } @@ -731,7 +731,7 @@ test_h5s_zero_dim(void) for (j = 0; j < SPACE1_DIM3; j++) { if (rdata_short[i][j] != 7) { H5_FAILED(); - HDprintf("element [%d][%d] is %d but should have been 7\n", i, j, rdata_short[i][j]); + printf("element [%d][%d] is %d but should have been 7\n", i, j, rdata_short[i][j]); } } } @@ -804,7 +804,7 @@ test_h5s_zero_dim(void) for (j = 0; j < SPACE1_DIM3; j++) { if (rdata[i][j] != 7) { H5_FAILED(); - HDprintf("element [%d][%d] is %d but should have been 7\n", i, j, rdata[i][j]); + printf("element [%d][%d] is %d but should have been 7\n", i, j, rdata[i][j]); } } @@ -829,8 +829,8 @@ test_h5s_zero_dim(void) for (k = 0; k < SPACE1_DIM3; k++) { if (rdata_real[i][j][k] != wdata_real[i][j][k]) { H5_FAILED(); - HDprintf("element [%d][%d][%d] is %d but should have been %d\n", i, j, k, - rdata_real[i][j][k], wdata_real[i][j][k]); + printf("element [%d][%d][%d] is %d but should have been %d\n", i, j, k, + rdata_real[i][j][k], wdata_real[i][j][k]); } } } @@ -853,7 +853,7 @@ test_h5s_zero_dim(void) for (j = 0; j < SPACE1_DIM3; j++) { if (rdata[i][j] != 7) { H5_FAILED(); - HDprintf("element [%d][%d] is %d but should have been 7\n", i, j, rdata[i][j]); + printf("element [%d][%d] is %d but should have been 7\n", i, j, rdata[i][j]); } } @@ -901,7 +901,7 @@ test_h5s_zero_dim(void) for (j = 0; j < SPACE1_DIM3; j++) { if (rdata[i][j] != 7) { H5_FAILED(); - HDprintf("element [%d][%d] is %d but should have been 7\n", i, j, rdata[i][j]); + printf("element [%d][%d] is %d but should have been 7\n", i, j, rdata[i][j]); } } @@ -944,7 +944,7 @@ test_h5s_zero_dim(void) for (j = 0; j < SPACE1_DIM3; j++) { if (rdata[i][j] != 7) { H5_FAILED(); - HDprintf("element [%d][%d] is %d but should have been 7\n", i, j, rdata[i][j]); + printf("element [%d][%d] is %d but should have been 7\n", i, j, rdata[i][j]); } } } @@ -975,7 +975,7 @@ test_h5s_zero_dim(void) for (j = 0; j < SPACE1_DIM3; j++) { if (rdata[i][j] != 7) { H5_FAILED(); - HDprintf("element [%d][%d] is %d but should have been 7\n", i, j, rdata[i][j]); + printf("element [%d][%d] is %d but should have been 7\n", i, j, rdata[i][j]); } } } @@ -996,7 +996,7 @@ test_h5s_zero_dim(void) for (j = 0; j < SPACE1_DIM3; j++) { if (rdata_short[i][j] != 7) { H5_FAILED(); - HDprintf("element [%d][%d] is %d but should have been 7\n", i, j, rdata_short[i][j]); + printf("element [%d][%d] is %d but should have been 7\n", i, j, rdata_short[i][j]); } } } @@ -1025,7 +1025,7 @@ test_h5s_zero_dim(void) rank = H5Sget_simple_extent_dims(sid_chunk, tdims, NULL); CHECK(rank, FAIL, "H5Sget_simple_extent_dims"); - VERIFY(HDmemcmp(tdims, dims1, SPACE1_RANK * sizeof(hsize_t)), 0, "H5Sget_simple_extent_dims"); + VERIFY(memcmp(tdims, dims1, SPACE1_RANK * sizeof(hsize_t)), 0, "H5Sget_simple_extent_dims"); /* Set it to chunked dataset */ plist_id = H5Pcreate(H5P_DATASET_CREATE); @@ -1056,8 +1056,8 @@ test_h5s_zero_dim(void) for (k = 0; k < SPACE1_DIM3; k++) { if (rdata_real[i][j][k] != wdata_real[i][j][k]) { H5_FAILED(); - HDprintf("element [%d][%d][%d] is %d but should have been %d\n", i, j, k, - rdata_real[i][j][k], wdata_real[i][j][k]); + printf("element [%d][%d][%d] is %d but should have been %d\n", i, j, k, + rdata_real[i][j][k], wdata_real[i][j][k]); } } } @@ -1143,7 +1143,7 @@ test_h5s_zero_dim(void) for (j = 0; j < SPACE1_DIM3; j++) { if (rdata[i][j] != 7) { H5_FAILED(); - HDprintf("element [%d][%d] is %d but should have been 7\n", i, j, rdata[i][j]); + printf("element [%d][%d] is %d but should have been 7\n", i, j, rdata[i][j]); } } } @@ -1180,7 +1180,7 @@ test_h5s_zero_dim(void) for (j = 0; j < SPACE1_DIM3; j++) { if (rdata_short[i][j] != 7) { H5_FAILED(); - HDprintf("element [%d][%d] is %d but should have been 7\n", i, j, rdata_short[i][j]); + printf("element [%d][%d] is %d but should have been 7\n", i, j, rdata_short[i][j]); } } } @@ -1256,8 +1256,8 @@ test_h5s_encode(H5F_libver_t low, H5F_libver_t high) CHECK(ret, FAIL, "H5Sencode2"); if (sbuf_size > 0) { - sbuf = (unsigned char *)HDcalloc((size_t)1, sbuf_size); - CHECK_PTR(sbuf, "HDcalloc"); + sbuf = (unsigned char *)calloc((size_t)1, sbuf_size); + CHECK_PTR(sbuf, "calloc"); } /* Try decoding bogus buffer */ @@ -1289,7 +1289,7 @@ test_h5s_encode(H5F_libver_t low, H5F_libver_t high) /* Retrieve and verify the dataspace dimensions */ rank = H5Sget_simple_extent_dims(decoded_sid1, tdims, NULL); CHECK(rank, FAIL, "H5Sget_simple_extent_dims"); - VERIFY(HDmemcmp(tdims, dims1, SPACE1_RANK * sizeof(hsize_t)), 0, "H5Sget_simple_extent_dims"); + VERIFY(memcmp(tdims, dims1, SPACE1_RANK * sizeof(hsize_t)), 0, "H5Sget_simple_extent_dims"); /* Verify the type of dataspace selection */ sel_type = H5Sget_select_type(decoded_sid1); @@ -1318,8 +1318,8 @@ test_h5s_encode(H5F_libver_t low, H5F_libver_t high) CHECK(ret, FAIL, "H5Sencode"); if (null_size > 0) { - null_sbuf = (unsigned char *)HDcalloc((size_t)1, null_size); - CHECK_PTR(null_sbuf, "HDcalloc"); + null_sbuf = (unsigned char *)calloc((size_t)1, null_size); + CHECK_PTR(null_sbuf, "calloc"); } /* Encode the null dataspace in the buffer */ @@ -1354,8 +1354,8 @@ test_h5s_encode(H5F_libver_t low, H5F_libver_t high) CHECK(ret, FAIL, "H5Sencode"); if (scalar_size > 0) { - scalar_buf = (unsigned char *)HDcalloc((size_t)1, scalar_size); - CHECK_PTR(scalar_buf, "HDcalloc"); + scalar_buf = (unsigned char *)calloc((size_t)1, scalar_size); + CHECK_PTR(scalar_buf, "calloc"); } /* Encode the scalar dataspace in the buffer */ @@ -1393,11 +1393,11 @@ test_h5s_encode(H5F_libver_t low, H5F_libver_t high) /* Release resources */ if (sbuf) - HDfree(sbuf); + free(sbuf); if (null_sbuf) - HDfree(null_sbuf); + free(null_sbuf); if (scalar_buf) - HDfree(scalar_buf); + free(scalar_buf); } /* test_h5s_encode() */ #ifndef H5_NO_DEPRECATED_SYMBOLS @@ -1448,8 +1448,8 @@ test_h5s_encode1(void) CHECK(ret, FAIL, "H5Sencode2"); if (sbuf_size > 0) { - sbuf = (unsigned char *)HDcalloc((size_t)1, sbuf_size); - CHECK_PTR(sbuf, "HDcalloc"); + sbuf = (unsigned char *)calloc((size_t)1, sbuf_size); + CHECK_PTR(sbuf, "calloc"); } /* Try decoding bogus buffer */ @@ -1481,7 +1481,7 @@ test_h5s_encode1(void) /* Retrieve and verify the dataspace dimensions */ rank = H5Sget_simple_extent_dims(decoded_sid1, tdims, NULL); CHECK(rank, FAIL, "H5Sget_simple_extent_dims"); - VERIFY(HDmemcmp(tdims, dims1, SPACE1_RANK * sizeof(hsize_t)), 0, "H5Sget_simple_extent_dims"); + VERIFY(memcmp(tdims, dims1, SPACE1_RANK * sizeof(hsize_t)), 0, "H5Sget_simple_extent_dims"); /* Verify the type of dataspace selection */ sel_type = H5Sget_select_type(decoded_sid1); @@ -1510,8 +1510,8 @@ test_h5s_encode1(void) CHECK(ret, FAIL, "H5Sencode"); if (null_size > 0) { - null_sbuf = (unsigned char *)HDcalloc((size_t)1, null_size); - CHECK_PTR(null_sbuf, "HDcalloc"); + null_sbuf = (unsigned char *)calloc((size_t)1, null_size); + CHECK_PTR(null_sbuf, "calloc"); } /* Encode the null dataspace in the buffer */ @@ -1546,8 +1546,8 @@ test_h5s_encode1(void) CHECK(ret, FAIL, "H5Sencode"); if (scalar_size > 0) { - scalar_buf = (unsigned char *)HDcalloc((size_t)1, scalar_size); - CHECK_PTR(scalar_buf, "HDcalloc"); + scalar_buf = (unsigned char *)calloc((size_t)1, scalar_size); + CHECK_PTR(scalar_buf, "calloc"); } /* Encode the scalar dataspace in the buffer */ @@ -1581,11 +1581,11 @@ test_h5s_encode1(void) /* Release resources */ if (sbuf) - HDfree(sbuf); + free(sbuf); if (null_sbuf) - HDfree(null_sbuf); + free(null_sbuf); if (scalar_buf) - HDfree(scalar_buf); + free(scalar_buf); } /* test_h5s_encode1() */ #endif /* H5_NO_DEPRECATED_SYMBOLS */ @@ -1633,8 +1633,8 @@ test_h5s_check_encoding(hid_t in_fapl, hid_t in_sid, uint32_t expected_version, CHECK(ret, FAIL, "H5Sencode2"); /* Allocate the buffer for encoding */ - buf = (char *)HDmalloc(buf_size); - CHECK_PTR(buf, "HDmalloc"); + buf = (char *)malloc(buf_size); + CHECK_PTR(buf, "malloc"); /* Encode according to the setting in in_fapl */ ret = H5Sencode2(in_sid, buf, &buf_size, in_fapl); @@ -1693,7 +1693,7 @@ test_h5s_check_encoding(hid_t in_fapl, hid_t in_sid, uint32_t expected_version, ret = H5Sclose(d_sid); CHECK(ret, FAIL, "H5Sclose"); if (buf) - HDfree(buf); + free(buf); } return (0); @@ -1772,7 +1772,7 @@ test_h5s_encode_regular_hyper(H5F_libver_t low, H5F_libver_t high) break; default: - HDassert(0); + assert(0); break; } /* end switch */ @@ -1797,7 +1797,7 @@ test_h5s_encode_regular_hyper(H5F_libver_t low, H5F_libver_t high) expected_enc_size = (uint8_t)(expected_version == 3 ? 4 : 8); break; default: - HDassert(0); + assert(0); break; } /* end switch */ @@ -1822,7 +1822,7 @@ test_h5s_encode_regular_hyper(H5F_libver_t low, H5F_libver_t high) expected_enc_size = 8; break; default: - HDassert(0); + assert(0); break; } @@ -1847,7 +1847,7 @@ test_h5s_encode_regular_hyper(H5F_libver_t low, H5F_libver_t high) expected_enc_size = 8; break; default: - HDassert(0); + assert(0); break; } /* end switch */ @@ -1872,7 +1872,7 @@ test_h5s_encode_regular_hyper(H5F_libver_t low, H5F_libver_t high) expected_enc_size = 8; break; default: - HDassert(0); + assert(0); break; } @@ -1966,7 +1966,7 @@ test_h5s_encode_irregular_hyper(H5F_libver_t low, H5F_libver_t high) break; default: - HDassert(0); + assert(0); break; } @@ -1995,7 +1995,7 @@ test_h5s_encode_irregular_hyper(H5F_libver_t low, H5F_libver_t high) break; default: - HDassert(0); + assert(0); break; } @@ -2008,7 +2008,7 @@ test_h5s_encode_irregular_hyper(H5F_libver_t low, H5F_libver_t high) VERIFY(is_regular, FALSE, "H5Sis_regular_hyperslab"); /* Verify the version and encoded size expected for the configuration */ - HDassert(expected_enc_size <= 255); + assert(expected_enc_size <= 255); ret = test_h5s_check_encoding(fapl, sid, expected_version, (uint8_t)expected_enc_size, expected_to_fail); CHECK(ret, FAIL, "test_h5s_check_encoding"); @@ -2159,7 +2159,7 @@ test_h5s_encode_length(void) /* Allocate the buffer */ if (sbuf_size > 0) { - sbuf = (unsigned char *)HDcalloc((size_t)1, sbuf_size); + sbuf = (unsigned char *)calloc((size_t)1, sbuf_size); CHECK_PTR(sbuf, "H5Sencode2"); } @@ -2184,7 +2184,7 @@ test_h5s_encode_length(void) /* Free the buffer */ if (sbuf) - HDfree(sbuf); + free(sbuf); /* Close the original dataspace */ ret = H5Sclose(sid); @@ -2460,11 +2460,11 @@ test_h5s_compound_scalar_read(void) ret = H5Dread(dataset, type, H5S_ALL, H5S_ALL, H5P_DEFAULT, &rdata); CHECK(ret, FAIL, "H5Dread"); - if (HDmemcmp(&space4_data, &rdata, sizeof(struct space4_struct)) != 0) { - HDprintf("scalar data different: space4_data.c1=%c, read_data4.c1=%c\n", space4_data.c1, rdata.c1); - HDprintf("scalar data different: space4_data.u=%u, read_data4.u=%u\n", space4_data.u, rdata.u); - HDprintf("scalar data different: space4_data.f=%f, read_data4.f=%f\n", (double)space4_data.f, - (double)rdata.f); + if (memcmp(&space4_data, &rdata, sizeof(struct space4_struct)) != 0) { + printf("scalar data different: space4_data.c1=%c, read_data4.c1=%c\n", space4_data.c1, rdata.c1); + printf("scalar data different: space4_data.u=%u, read_data4.u=%u\n", space4_data.u, rdata.u); + printf("scalar data different: space4_data.f=%f, read_data4.f=%f\n", (double)space4_data.f, + (double)rdata.f); TestErrPrintf("scalar data different: space4_data.c1=%c, read_data4.c1=%c\n", space4_data.c1, rdata.c2); } /* end if */ @@ -2513,17 +2513,17 @@ test_h5s_chunk(void) int i, j; /* Allocate memory */ - chunk_data_dbl_data = (double *)HDcalloc(CHUNK_DATA_NX * CHUNK_DATA_NY, sizeof(double)); - CHECK_PTR(chunk_data_dbl_data, "HDcalloc"); - chunk_data_dbl = (double **)HDcalloc(CHUNK_DATA_NX, sizeof(chunk_data_dbl_data)); - CHECK_PTR(chunk_data_dbl, "HDcalloc"); + chunk_data_dbl_data = (double *)calloc(CHUNK_DATA_NX * CHUNK_DATA_NY, sizeof(double)); + CHECK_PTR(chunk_data_dbl_data, "calloc"); + chunk_data_dbl = (double **)calloc(CHUNK_DATA_NX, sizeof(chunk_data_dbl_data)); + CHECK_PTR(chunk_data_dbl, "calloc"); for (i = 0; i < CHUNK_DATA_NX; i++) chunk_data_dbl[i] = chunk_data_dbl_data + (i * CHUNK_DATA_NY); - chunk_data_flt_data = (float *)HDcalloc(CHUNK_DATA_NX * CHUNK_DATA_NY, sizeof(float)); - CHECK_PTR(chunk_data_flt_data, "HDcalloc"); - chunk_data_flt = (float **)HDcalloc(CHUNK_DATA_NX, sizeof(chunk_data_flt_data)); - CHECK_PTR(chunk_data_flt, "HDcalloc"); + chunk_data_flt_data = (float *)calloc(CHUNK_DATA_NX * CHUNK_DATA_NY, sizeof(float)); + CHECK_PTR(chunk_data_flt_data, "calloc"); + chunk_data_flt = (float **)calloc(CHUNK_DATA_NX, sizeof(chunk_data_flt_data)); + CHECK_PTR(chunk_data_flt, "calloc"); for (i = 0; i < CHUNK_DATA_NX; i++) chunk_data_flt[i] = chunk_data_flt_data + (i * CHUNK_DATA_NY); @@ -2565,8 +2565,8 @@ test_h5s_chunk(void) CHECK(status, FAIL, "H5Fclose"); /* Reset/initialize the data arrays to read in */ - HDmemset(chunk_data_dbl_data, 0, sizeof(double) * CHUNK_DATA_NX * CHUNK_DATA_NY); - HDmemset(chunk_data_flt_data, 0, sizeof(float) * CHUNK_DATA_NX * CHUNK_DATA_NY); + memset(chunk_data_dbl_data, 0, sizeof(double) * CHUNK_DATA_NX * CHUNK_DATA_NY); + memset(chunk_data_flt_data, 0, sizeof(float) * CHUNK_DATA_NX * CHUNK_DATA_NY); fileID = H5Fopen(DATAFILE, H5F_ACC_RDONLY, H5P_DEFAULT); CHECK(fileID, FAIL, "H5Fopen"); @@ -2593,10 +2593,10 @@ test_h5s_chunk(void) } /* end for */ } /* end for */ - HDfree(chunk_data_dbl); - HDfree(chunk_data_dbl_data); - HDfree(chunk_data_flt); - HDfree(chunk_data_flt_data); + free(chunk_data_dbl); + free(chunk_data_dbl_data); + free(chunk_data_flt); + free(chunk_data_flt_data); } /* test_h5s_chunk() */ /**************************************************************** diff --git a/test/thread_id.c b/test/thread_id.c index c7b2b44..d42a483 100644 --- a/test/thread_id.c +++ b/test/thread_id.c @@ -34,12 +34,12 @@ my_errx(int code, const char *fmt, ...) { va_list ap; - (void)HDfprintf(stderr, "thread_id: "); - HDva_start(ap, fmt); + (void)fprintf(stderr, "thread_id: "); + va_start(ap, fmt); (void)HDvfprintf(stderr, fmt, ap); - HDva_end(ap); + va_end(ap); (void)HDfputc('\n', stderr); - HDexit(code); + exit(code); } #if defined(H5_HAVE_DARWIN) @@ -73,7 +73,7 @@ pthread_barrier_init(pthread_barrier_t *barrier, const pthread_barrierattr_t *at if (attr != NULL) return EINVAL; - HDmemset(barrier, 0, sizeof(*barrier)); + memset(barrier, 0, sizeof(*barrier)); barrier->count = count; @@ -176,12 +176,12 @@ my_err(int code, const char *fmt, ...) va_list ap; int errno_copy = errno; - (void)HDfprintf(stderr, "thread_id: "); - HDva_start(ap, fmt); + (void)fprintf(stderr, "thread_id: "); + va_start(ap, fmt); (void)HDvfprintf(stderr, fmt, ap); - HDva_end(ap); - (void)HDfprintf(stderr, ": %s\n", HDstrerror(errno_copy)); - HDexit(code); + va_end(ap); + (void)fprintf(stderr, ": %s\n", HDstrerror(errno_copy)); + exit(code); } #define threads_failure(_call, _result) \ @@ -203,9 +203,9 @@ atomic_printf(const char *fmt, ...) va_list ap; ssize_t nprinted, nwritten; - HDva_start(ap, fmt); + va_start(ap, fmt); nprinted = HDvsnprintf(buf, sizeof(buf), fmt, ap); - HDva_end(ap); + va_end(ap); if (nprinted == -1) my_err(EXIT_FAILURE, "%s.%d: vsnprintf", __func__, __LINE__); @@ -318,7 +318,7 @@ main(void) int main(void) { - HDfprintf(stderr, "not implemented in this configuration.\n"); + fprintf(stderr, "not implemented in this configuration.\n"); return EXIT_SUCCESS; } #endif /*H5_HAVE_THREADSAFE && !H5_HAVE_WIN_THREADS*/ @@ -21,7 +21,7 @@ static herr_t free_wrapper(void *p, void H5_ATTR_UNUSED **_ctx) { - HDfree(p); + free(p); return SUCCEED; } @@ -85,12 +85,12 @@ basic_id_test(void) * Once the ID has been registered, testObj will be freed when * its ID type is destroyed. */ - testObj = HDmalloc(7 * sizeof(int)); + testObj = malloc(7 * sizeof(int)); arrayID = H5Iregister(myType, testObj); CHECK(arrayID, H5I_INVALID_HID, "H5Iregister"); if (arrayID == H5I_INVALID_HID) { - HDfree(testObj); + free(testObj); goto out; } @@ -179,12 +179,12 @@ basic_id_test(void) * freed when the previous type was destroyed. Allocate new * memory for it. */ - testObj = HDmalloc(7 * sizeof(int)); + testObj = malloc(7 * sizeof(int)); arrayID = H5Iregister(myType, testObj); CHECK(arrayID, H5I_INVALID_HID, "H5Iregister"); if (arrayID == H5I_INVALID_HID) { - HDfree(testObj); + free(testObj); goto out; } @@ -259,7 +259,7 @@ id_predefined_test(void) void *testPtr; herr_t testErr; - testObj = HDmalloc(sizeof(int)); + testObj = malloc(sizeof(int)); /* * Attempt to perform public functions on various library types @@ -350,14 +350,14 @@ id_predefined_test(void) /* testObj was never registered as an atom, so it will not be * automatically freed. */ - HDfree(testObj); + free(testObj); return 0; out: if (typeID != H5I_INVALID_HID) H5Tclose(typeID); if (testObj != NULL) - HDfree(testObj); + free(testObj); return -1; } @@ -703,8 +703,8 @@ test_remove_clear_type(void) /* Create an array to hold the objects in the master list */ list_size = RCT_MAX_NOBJS * sizeof(rct_obj_t); - obj_list.objects = HDmalloc(list_size); - CHECK_PTR(obj_list.objects, "HDcalloc"); + obj_list.objects = malloc(list_size); + CHECK_PTR(obj_list.objects, "calloc"); if (NULL == obj_list.objects) goto error; @@ -723,7 +723,7 @@ test_remove_clear_type(void) * Build object list * *********************/ - HDmemset(obj_list.objects, 0, list_size); + memset(obj_list.objects, 0, list_size); /* The number of objects used is a random number between the min and max */ obj_list.count = obj_list.remaining = @@ -849,7 +849,7 @@ test_remove_clear_type(void) goto error; /* Free the object array */ - HDfree(obj_list.objects); + free(obj_list.objects); return 0; @@ -861,7 +861,7 @@ error: } H5E_END_TRY - HDfree(obj_list.objects); + free(obj_list.objects); return -1; } /* end test_remove_clear_type() */ @@ -883,7 +883,7 @@ free_actual_object(void *_p, void H5_ATTR_UNUSED **_ctx) if (7 != *p) return FAIL; - HDfree(p); + free(p); return SUCCEED; } @@ -916,7 +916,7 @@ realize_future_cb(void *_future_obj, hid_t *actual_id) } else { /* Create a new object (the 'actual object') of the correct type */ - if (NULL == (actual_obj = HDmalloc(sizeof(int)))) + if (NULL == (actual_obj = malloc(sizeof(int)))) return FAIL; *actual_obj = 7; @@ -937,7 +937,7 @@ discard_future_cb(void *future_obj) if (NULL == future_obj) return FAIL; - HDfree(future_obj); + free(future_obj); return SUCCEED; } @@ -952,7 +952,7 @@ realize_future_generate_cb(void *_future_obj, hid_t *actual_id) if (NULL != future_obj) return FAIL; /* Create a new object (the 'actual object') of the correct type */ - if (NULL == (actual_obj = HDmalloc(sizeof(int)))) + if (NULL == (actual_obj = malloc(sizeof(int)))) return FAIL; *actual_obj = 7; @@ -1036,7 +1036,7 @@ test_future_ids(void) /* Test base use-case: create a future object and destroy type without * realizing the future object. */ - future_obj = HDmalloc(sizeof(future_obj_t)); + future_obj = malloc(sizeof(future_obj_t)); future_obj->obj_type = obj_type; future_id = H5Iregister_future(obj_type, future_obj, realize_future_cb, discard_future_cb); CHECK(future_id, H5I_INVALID_HID, "H5Iregister_future"); @@ -1056,7 +1056,7 @@ test_future_ids(void) goto error; /* Test base use-case: create a future object and realize the actual object. */ - future_obj = HDmalloc(sizeof(future_obj_t)); + future_obj = malloc(sizeof(future_obj_t)); future_obj->obj_type = obj_type; future_id = H5Iregister_future(obj_type, future_obj, realize_future_cb, discard_future_cb); CHECK(future_id, H5I_INVALID_HID, "H5Iregister_future"); @@ -1142,7 +1142,7 @@ test_future_ids(void) /* Test base use-case: create a future object for a pre-defined type */ /* (DATASPACE) */ - future_obj = HDmalloc(sizeof(future_obj_t)); + future_obj = malloc(sizeof(future_obj_t)); future_obj->obj_type = H5I_DATASPACE; future_id = H5Iregister_future(H5I_DATASPACE, future_obj, realize_future_cb, discard_future_cb); CHECK(future_id, H5I_INVALID_HID, "H5Iregister_future"); @@ -1160,7 +1160,7 @@ test_future_ids(void) goto error; /* Test base use-case: create a future object for a pre-defined type */ - future_obj = HDmalloc(sizeof(future_obj_t)); + future_obj = malloc(sizeof(future_obj_t)); future_obj->obj_type = H5I_DATASPACE; future_id = H5Iregister_future(H5I_DATASPACE, future_obj, realize_future_cb, discard_future_cb); CHECK(future_id, H5I_INVALID_HID, "H5Iregister_future"); @@ -1183,7 +1183,7 @@ test_future_ids(void) goto error; /* Test base use-case: create a future object for a pre-defined type */ - future_obj = HDmalloc(sizeof(future_obj_t)); + future_obj = malloc(sizeof(future_obj_t)); future_obj->obj_type = H5I_DATASPACE; future_id = H5Iregister_future(H5I_DATASPACE, future_obj, realize_future_cb, discard_future_cb); CHECK(future_id, H5I_INVALID_HID, "H5Iregister_future"); @@ -1214,7 +1214,7 @@ test_future_ids(void) /* Test base use-case: create a future object for a pre-defined type */ /* (DATATYPE) */ - future_obj = HDmalloc(sizeof(future_obj_t)); + future_obj = malloc(sizeof(future_obj_t)); future_obj->obj_type = H5I_DATATYPE; future_id = H5Iregister_future(H5I_DATATYPE, future_obj, realize_future_cb, discard_future_cb); CHECK(future_id, H5I_INVALID_HID, "H5Iregister_future"); @@ -1232,7 +1232,7 @@ test_future_ids(void) goto error; /* Test base use-case: create a future object for a pre-defined type */ - future_obj = HDmalloc(sizeof(future_obj_t)); + future_obj = malloc(sizeof(future_obj_t)); future_obj->obj_type = H5I_DATATYPE; future_id = H5Iregister_future(H5I_DATATYPE, future_obj, realize_future_cb, discard_future_cb); CHECK(future_id, H5I_INVALID_HID, "H5Iregister_future"); @@ -1255,7 +1255,7 @@ test_future_ids(void) goto error; /* Test base use-case: create a future object for a pre-defined type */ - future_obj = HDmalloc(sizeof(future_obj_t)); + future_obj = malloc(sizeof(future_obj_t)); future_obj->obj_type = H5I_DATATYPE; future_id = H5Iregister_future(H5I_DATATYPE, future_obj, realize_future_cb, discard_future_cb); CHECK(future_id, H5I_INVALID_HID, "H5Iregister_future"); @@ -1286,7 +1286,7 @@ test_future_ids(void) /* Test base use-case: create a future object for a pre-defined type */ /* (PROPERTY LIST) */ - future_obj = HDmalloc(sizeof(future_obj_t)); + future_obj = malloc(sizeof(future_obj_t)); future_obj->obj_type = H5I_GENPROP_LST; future_id = H5Iregister_future(H5I_GENPROP_LST, future_obj, realize_future_cb, discard_future_cb); CHECK(future_id, H5I_INVALID_HID, "H5Iregister_future"); @@ -1304,7 +1304,7 @@ test_future_ids(void) goto error; /* Test base use-case: create a future object for a pre-defined type */ - future_obj = HDmalloc(sizeof(future_obj_t)); + future_obj = malloc(sizeof(future_obj_t)); future_obj->obj_type = H5I_GENPROP_LST; future_id = H5Iregister_future(H5I_GENPROP_LST, future_obj, realize_future_cb, discard_future_cb); CHECK(future_id, H5I_INVALID_HID, "H5Iregister_future"); @@ -1327,7 +1327,7 @@ test_future_ids(void) goto error; /* Test base use-case: create a future object for a pre-defined type */ - future_obj = HDmalloc(sizeof(future_obj_t)); + future_obj = malloc(sizeof(future_obj_t)); future_obj->obj_type = H5I_GENPROP_LST; future_id = H5Iregister_future(H5I_GENPROP_LST, future_obj, realize_future_cb, discard_future_cb); CHECK(future_id, H5I_INVALID_HID, "H5Iregister_future"); diff --git a/test/timer.c b/test/timer.c index 9254596..7231534 100644 --- a/test/timer.c +++ b/test/timer.c @@ -43,62 +43,62 @@ test_time_formatting(void) s = H5_timer_get_time_string(-1.0); if (NULL == s || HDstrcmp(s, "N/A") != 0) TEST_ERROR; - HDfree(s); + free(s); /* 0 0 */ s = H5_timer_get_time_string(0.0); if (NULL == s || HDstrcmp(s, "0.0 s") != 0) TEST_ERROR; - HDfree(s); + free(s); /* < 1 us nanoseconds */ s = H5_timer_get_time_string(123.0E-9); if (NULL == s || HDstrcmp(s, "123 ns") != 0) TEST_ERROR; - HDfree(s); + free(s); /* < 1 ms microseconds */ s = H5_timer_get_time_string(23.456E-6); if (NULL == s || HDstrcmp(s, "23.5 us") != 0) TEST_ERROR; - HDfree(s); + free(s); /* < 1 s milliseconds */ s = H5_timer_get_time_string(4.56789E-3); if (NULL == s || HDstrcmp(s, "4.6 ms") != 0) TEST_ERROR; - HDfree(s); + free(s); /* < 1 min seconds */ s = H5_timer_get_time_string(3.14); if (NULL == s || HDstrcmp(s, "3.14 s") != 0) TEST_ERROR; - HDfree(s); + free(s); /* < 1 hr mins, secs */ s = H5_timer_get_time_string(2521.0); if (NULL == s || HDstrcmp(s, "42 m 1 s") != 0) TEST_ERROR; - HDfree(s); + free(s); /* < 1 d hrs, mins, secs */ s = H5_timer_get_time_string(9756.0); if (NULL == s || HDstrcmp(s, "2 h 42 m 36 s") != 0) TEST_ERROR; - HDfree(s); + free(s); /* > 1 d days, hrs, mins, secs */ s = H5_timer_get_time_string(280802.0); if (NULL == s || HDstrcmp(s, "3 d 6 h 0 m 2 s") != 0) TEST_ERROR; - HDfree(s); + free(s); PASSED(); return 0; error: if (s) - HDfree(s); + free(s); return -1; } @@ -143,14 +143,14 @@ test_timer_system_user(void) */ if (timer.initial.system < 0.0 || timer.initial.user < 0.0) { SKIPPED(); - HDprintf("NOTE: No suitable way to get system/user times on this platform.\n"); + printf("NOTE: No suitable way to get system/user times on this platform.\n"); return 0; } /* Do some fake work */ for (i = 0; i < 1024; i++) { - buf = (char *)HDmalloc(1024 * (size_t)i); - HDfree(buf); + buf = (char *)malloc(1024 * (size_t)i); + free(buf); } err = H5_timer_stop(&timer); @@ -208,8 +208,8 @@ test_timer_elapsed(void) /* Do some fake work */ for (i = 0; i < 1024; i++) { - buf = (char *)HDmalloc(1024 * (size_t)i); - HDfree(buf); + buf = (char *)malloc(1024 * (size_t)i); + free(buf); } err = H5_timer_stop(&timer); @@ -275,8 +275,8 @@ test_timer_functionality(void) /* Do some fake work */ for (i = 0; i < 1024; i++) { - buf = (char *)HDmalloc(1024 * (size_t)i); - HDfree(buf); + buf = (char *)malloc(1024 * (size_t)i); + free(buf); } /* Running state should change after stop */ @@ -317,8 +317,8 @@ test_timer_functionality(void) /* Do some fake work */ for (i = 0; i < 1024; i++) { - buf = (char *)HDmalloc(1024 * (size_t)i); - HDfree(buf); + buf = (char *)malloc(1024 * (size_t)i); + free(buf); } /* Times should be non-negative */ @@ -334,8 +334,8 @@ test_timer_functionality(void) /* Do some fake work */ for (i = 0; i < 1024; i++) { - buf = (char *)HDmalloc(1024 * (size_t)i); - HDfree(buf); + buf = (char *)malloc(1024 * (size_t)i); + free(buf); } /* State should flip on stop */ @@ -380,7 +380,7 @@ main(void) h5_reset(); - HDprintf("Testing platform-independent timer functionality.\n"); + printf("Testing platform-independent timer functionality.\n"); nerrors += test_time_formatting() < 0 ? 1 : 0; nerrors += test_timer_system_user() < 0 ? 1 : 0; @@ -388,12 +388,11 @@ main(void) nerrors += test_timer_functionality() < 0 ? 1 : 0; if (nerrors) { - HDprintf("***** %d platform-independent timer TEST%s FAILED! *****\n", nerrors, - nerrors > 1 ? "S" : ""); + printf("***** %d platform-independent timer TEST%s FAILED! *****\n", nerrors, nerrors > 1 ? "S" : ""); return 1; } else { - HDprintf("All platform-independent timer tests passed.\n"); + printf("All platform-independent timer tests passed.\n"); return 0; } } diff --git a/test/titerate.c b/test/titerate.c index 82d8e9f..5fedef8 100644 --- a/test/titerate.c +++ b/test/titerate.c @@ -108,7 +108,7 @@ liter_cb(hid_t H5_ATTR_UNUSED group, const char *name, const H5L_info2_t H5_ATTR return (count2 > 10 ? 1 : 0); default: - HDprintf("invalid iteration command"); + printf("invalid iteration command"); return (-1); } /* end switch */ } /* end liter_cb() */ @@ -364,7 +364,7 @@ test_iter_group(hid_t fapl, hbool_t new_format) /* Free the dataset names */ for (i = 0; i < (NDATASETS + 2); i++) - HDfree(lnames[i]); + free(lnames[i]); } /* test_iter_group() */ /**************************************************************** @@ -397,7 +397,7 @@ aiter_cb(hid_t H5_ATTR_UNUSED group, const char *name, const H5A_info_t H5_ATTR_ return (count2 > 10 ? 1 : 0); default: - HDprintf("invalid iteration command"); + printf("invalid iteration command"); return (-1); } /* end switch */ } /* end aiter_cb() */ @@ -557,7 +557,7 @@ test_iter_attr(hid_t fapl, hbool_t new_format) /* Free the attribute names */ for (i = 0; i < NATTR; i++) - HDfree(anames[i]); + free(anames[i]); } /* test_iter_attr() */ @@ -632,8 +632,8 @@ test_iter_group_large(hid_t fapl) } s1_t; /* Allocate & initialize array */ - names = (iter_info *)HDcalloc(sizeof(iter_info), (ITER_NGROUPS + 2)); - CHECK_PTR(names, "HDcalloc"); + names = (iter_info *)calloc(sizeof(iter_info), (ITER_NGROUPS + 2)); + CHECK_PTR(names, "calloc"); /* Output message about test being performed */ MESSAGE(5, ("Testing Large Group Iteration Functionality\n")); @@ -725,7 +725,7 @@ test_iter_group_large(hid_t fapl) CHECK(ret, FAIL, "H5Fclose"); /* Release memory */ - HDfree(names); + free(names); } /* test_iterate_group_large() */ /**************************************************************** @@ -877,8 +877,8 @@ test_grp_memb_funcs(hid_t fapl) /* Free the dataset names */ for (i = 0; i < (NDATASETS + 2); i++) { - HDfree(dnames[i]); - HDfree(obj_names[i]); + free(dnames[i]); + free(obj_names[i]); } /* end for */ } /* test_grp_memb_funcs() */ @@ -1024,7 +1024,7 @@ test_corrupted_attnamelen(void) CHECK(ret, FAIL, "h5_driver_is_default_vfd_compatible"); if (!driver_is_default_compatible) { - HDprintf("-- SKIPPED --\n"); + printf("-- SKIPPED --\n"); return; } diff --git a/test/tmeta.c b/test/tmeta.c index d55882d..57a9e0d 100644 --- a/test/tmeta.c +++ b/test/tmeta.c @@ -76,7 +76,7 @@ test_metadata(void) UINT32ENCODE(p, eu32); /* Encode the uint32 value */ /* Check if we got what we asked for */ - if (HDmemcmp(encode_buffer, compar_buffer, sizeof(compar_buffer)) != 0) { + if (memcmp(encode_buffer, compar_buffer, sizeof(compar_buffer)) != 0) { unsigned u; /* local counting variable */ for (u = 0; u < sizeof(compar_buffer); u++) { diff --git a/test/tmisc.c b/test/tmisc.c index 0b04b2c..0042c65 100644 --- a/test/tmisc.c +++ b/test/tmisc.c @@ -520,8 +520,8 @@ test_misc2_write_attribute(void) ret = H5Fclose(file2); CHECK(ret, FAIL, "H5Fclose"); - HDfree(string_att1); - HDfree(string_att2); + free(string_att1); + free(string_att2); } static void @@ -734,7 +734,7 @@ create_struct3(void) misc5_struct3_hndl *str3hndl; /* New 'struct3' created */ herr_t ret; /* For error checking */ - str3hndl = (misc5_struct3_hndl *)HDmalloc(sizeof(misc5_struct3_hndl)); + str3hndl = (misc5_struct3_hndl *)malloc(sizeof(misc5_struct3_hndl)); CHECK_PTR(str3hndl, "malloc"); str3hndl->st3h_base = H5Tcreate(H5T_COMPOUND, sizeof(misc5_struct3)); @@ -760,7 +760,7 @@ delete_struct3(misc5_struct3_hndl *str3hndl) ret = H5Tclose(str3hndl->st3h_base); CHECK(ret, FAIL, "H5Tclose"); - HDfree(str3hndl); + free(str3hndl); } static void @@ -777,8 +777,8 @@ create_struct2(void) misc5_struct2_hndl *str2hndl; /* New 'struct2' created */ herr_t ret; /* For error checking */ - str2hndl = (misc5_struct2_hndl *)HDmalloc(sizeof(misc5_struct2_hndl)); - CHECK_PTR(str2hndl, "HDmalloc"); + str2hndl = (misc5_struct2_hndl *)malloc(sizeof(misc5_struct2_hndl)); + CHECK_PTR(str2hndl, "malloc"); str2hndl->st2h_base = H5Tcreate(H5T_COMPOUND, sizeof(misc5_struct2)); CHECK(str2hndl->st2h_base, FAIL, "H5Tcreate"); @@ -812,7 +812,7 @@ delete_struct2(misc5_struct2_hndl *str2hndl) H5Tclose(str2hndl->st2h_base); CHECK(ret, FAIL, "H5Tclose"); - HDfree(str2hndl); + free(str2hndl); } static void @@ -823,8 +823,8 @@ set_struct2(misc5_struct2 *buf) buf->st2_el1 = MISC5_DBGELVAL2; buf->st2_el2.len = MISC5_DBGNELM3; - buf->st2_el2.p = HDmalloc((buf->st2_el2.len) * sizeof(misc5_struct3)); - CHECK_PTR(buf->st2_el2.p, "HDmalloc"); + buf->st2_el2.p = malloc((buf->st2_el2.len) * sizeof(misc5_struct3)); + CHECK_PTR(buf->st2_el2.p, "malloc"); for (i = 0; i < (buf->st2_el2.len); i++) set_struct3(&(((misc5_struct3 *)(buf->st2_el2.p))[i])); @@ -833,7 +833,7 @@ set_struct2(misc5_struct2 *buf) static void clear_struct2(misc5_struct2 *buf) { - HDfree(buf->st2_el2.p); + free(buf->st2_el2.p); } /*********************** struct1 ***********************/ @@ -844,8 +844,8 @@ create_struct1(void) misc5_struct1_hndl *str1hndl; /* New 'struct1' created */ herr_t ret; /* For error checking */ - str1hndl = (misc5_struct1_hndl *)HDmalloc(sizeof(misc5_struct1_hndl)); - CHECK_PTR(str1hndl, "HDmalloc"); + str1hndl = (misc5_struct1_hndl *)malloc(sizeof(misc5_struct1_hndl)); + CHECK_PTR(str1hndl, "malloc"); str1hndl->st1h_base = H5Tcreate(H5T_COMPOUND, sizeof(misc5_struct1)); CHECK(str1hndl->st1h_base, FAIL, "H5Tcreate"); @@ -879,7 +879,7 @@ delete_struct1(misc5_struct1_hndl *str1hndl) ret = H5Tclose(str1hndl->st1h_base); CHECK(ret, FAIL, "H5Tclose"); - HDfree(str1hndl); + free(str1hndl); } static void @@ -890,8 +890,8 @@ set_struct1(misc5_struct1 *buf) buf->st1_el1 = MISC5_DBGELVAL1; buf->st1_el2.len = MISC5_DBGNELM2; - buf->st1_el2.p = HDmalloc((buf->st1_el2.len) * sizeof(misc5_struct2)); - CHECK_PTR(buf->st1_el2.p, "HDmalloc"); + buf->st1_el2.p = malloc((buf->st1_el2.len) * sizeof(misc5_struct2)); + CHECK_PTR(buf->st1_el2.p, "malloc"); for (i = 0; i < (buf->st1_el2.len); i++) set_struct2(&(((misc5_struct2 *)(buf->st1_el2.p))[i])); @@ -904,7 +904,7 @@ clear_struct1(misc5_struct1 *buf) for (i = 0; i < buf->st1_el2.len; i++) clear_struct2(&(((misc5_struct2 *)(buf->st1_el2.p))[i])); - HDfree(buf->st1_el2.p); + free(buf->st1_el2.p); } static void @@ -941,8 +941,8 @@ test_misc5(void) /* Create the variable-length buffer */ buf.len = MISC5_DBGNELM1; - buf.p = HDmalloc((buf.len) * sizeof(misc5_struct1)); - CHECK_PTR(buf.p, "HDmalloc"); + buf.p = malloc((buf.len) * sizeof(misc5_struct1)); + CHECK_PTR(buf.p, "malloc"); /* Create the top-level VL information */ for (i = 0; i < MISC5_DBGNELM1; i++) @@ -957,7 +957,7 @@ test_misc5(void) clear_struct1(&(((misc5_struct1 *)(buf.p))[j])); /* Free the variable-length buffer */ - HDfree(buf.p); + free(buf.p); /* Close dataset */ ret = H5Dclose(dataset_id); @@ -996,16 +996,16 @@ test_misc5(void) /* Verify the correct information was read in */ for (i = 0; i < (buf.len); i++) { - /* HDprintf("[%d]=%d\n",i, ((misc5_struct1 *)(buf.p))[i].st1_el1); */ + /* printf("[%d]=%d\n",i, ((misc5_struct1 *)(buf.p))[i].st1_el1); */ VERIFY(((misc5_struct1 *)(buf.p))[i].st1_el1, MISC5_DBGELVAL1, "H5Dread"); for (j = 0; j < (((misc5_struct1 *)(buf.p))[i].st1_el2.len); j++) { - /* HDprintf(" [%d]=%d\n",j, ((misc5_struct2 *)(((misc5_struct1 *) + /* printf(" [%d]=%d\n",j, ((misc5_struct2 *)(((misc5_struct1 *) * (buf.p))[i].st1_el2.p))[j].st2_el1); */ VERIFY(((misc5_struct2 *)(((misc5_struct1 *)(buf.p))[i].st1_el2.p))[j].st2_el1, MISC5_DBGELVAL2, "H5Dread"); for (k = 0; k < (((misc5_struct2 *)(((misc5_struct1 *)(buf.p))[i].st1_el2.p))[j].st2_el2.len); k++) { - /* HDprintf(" [%d]=%d\n",k, ((misc5_struct3 *)(((misc5_struct2 *) (((misc5_struct1 + /* printf(" [%d]=%d\n",k, ((misc5_struct3 *)(((misc5_struct2 *) (((misc5_struct1 * *)(buf.p))[i]. st1_el2.p))[j].st2_el2.p))[k].st3_el1); */ VERIFY(((misc5_struct3 *)(((misc5_struct2 *)(((misc5_struct1 *)(buf.p))[i].st1_el2.p))[j] .st2_el2.p))[k] @@ -1272,11 +1272,11 @@ test_misc8(void) MESSAGE(5, ("Testing dataset storage sizes\n")); /* Allocate space for the data to write & read */ - wdata = (int *)HDmalloc(sizeof(int) * MISC8_DIM0 * MISC8_DIM1); - CHECK_PTR(wdata, "HDmalloc"); + wdata = (int *)malloc(sizeof(int) * MISC8_DIM0 * MISC8_DIM1); + CHECK_PTR(wdata, "malloc"); #ifdef VERIFY_DATA - rdata = (int *)HDmalloc(sizeof(int) * MISC8_DIM0 * MISC8_DIM1); - CHECK_PTR(rdata, "HDmalloc"); + rdata = (int *)malloc(sizeof(int) * MISC8_DIM0 * MISC8_DIM1); + CHECK_PTR(rdata, "malloc"); #endif /* VERIFY_DATA */ /* Initialize values */ @@ -1743,9 +1743,9 @@ test_misc8(void) CHECK(ret, FAIL, "H5Fclose"); /* Free the read & write buffers */ - HDfree(wdata); + free(wdata); #ifdef VERIFY_DATA - HDfree(rdata); + free(rdata); #endif /* VERIFY_DATA */ } /* end test_misc8() */ @@ -1810,7 +1810,7 @@ test_misc10(void) CHECK(ret, FAIL, "h5_driver_is_default_vfd_compatible"); if (!driver_is_default_compatible) { - HDprintf("-- SKIPPED --\n"); + printf("-- SKIPPED --\n"); return; } @@ -2208,8 +2208,8 @@ misc13_verify_dataset(hid_t loc_id, const char *name, const unsigned *data) herr_t ret; /* Generic return value */ /* Create a data buffer for the dataset read */ - read_data = (unsigned *)HDcalloc(MISC13_DIM1, sizeof(unsigned)); - CHECK_PTR(read_data, "HDcalloc"); + read_data = (unsigned *)calloc(MISC13_DIM1, sizeof(unsigned)); + CHECK_PTR(read_data, "calloc"); /* Open the contiguous dataset in the root group */ dsid = H5Dopen2(loc_id, name, H5P_DEFAULT); @@ -2228,7 +2228,7 @@ misc13_verify_dataset(hid_t loc_id, const char *name, const unsigned *data) CHECK(ret, FAIL, "H5Dclose"); /* Free the dataset read buffer */ - HDfree(read_data); + free(read_data); } /* end misc13_verify_dataset() */ @@ -2334,27 +2334,27 @@ misc13_insert_user_block(const char *old_name, const char *new_name, const char int ret; /* Generic status value */ /* Allocate space for the user block */ - user_block = HDcalloc(size, (size_t)1); - CHECK_PTR(user_block, "HDcalloc"); + user_block = calloc(size, (size_t)1); + CHECK_PTR(user_block, "calloc"); /* Copy in the user block data */ - HDmemcpy(user_block, str, HDstrlen(str)); + memcpy(user_block, str, HDstrlen(str)); /* Open the new file */ - new_fp = HDfopen(new_name, "wb"); - CHECK_PTR(new_fp, "HDfopen"); + new_fp = fopen(new_name, "wb"); + CHECK_PTR(new_fp, "fopen"); /* Write the user block to the new file */ written = HDfwrite(user_block, (size_t)1, size, new_fp); VERIFY(written, size, "HDfwrite"); /* Open the old file */ - old_fp = HDfopen(old_name, "rb"); - CHECK_PTR(old_fp, "HDfopen"); + old_fp = fopen(old_name, "rb"); + CHECK_PTR(old_fp, "fopen"); /* Allocate space for the copy buffer */ - copy_buf = HDmalloc((size_t)MISC13_COPY_BUF_SIZE); - CHECK_PTR(copy_buf, "HDmalloc"); + copy_buf = malloc((size_t)MISC13_COPY_BUF_SIZE); + CHECK_PTR(copy_buf, "malloc"); /* Copy data from the old file to the new file */ while ((read_in = HDfread(copy_buf, (size_t)1, (size_t)MISC13_COPY_BUF_SIZE, old_fp)) > 0) { @@ -2372,10 +2372,10 @@ misc13_insert_user_block(const char *old_name, const char *new_name, const char VERIFY(ret, 0, "HDfclose"); /* Free the copy buffer */ - HDfree(copy_buf); + free(copy_buf); /* Free the user block */ - HDfree(user_block); + free(user_block); } /* end misc13_insert_user_block() */ @@ -2503,8 +2503,8 @@ test_misc13(void) hbool_t check_for_new_dataset; /* Whether to check for the post-userblock-creation dataset */ /* Create a data buffer for the datasets */ - data = (unsigned *)HDcalloc(MISC13_DIM1, sizeof(unsigned)); - CHECK_PTR(data, "HDcalloc"); + data = (unsigned *)calloc(MISC13_DIM1, sizeof(unsigned)); + CHECK_PTR(data, "calloc"); /* Initialize data to write */ misc13_init_data(data); @@ -2534,7 +2534,7 @@ test_misc13(void) misc13_verify_file(MISC13_FILE_2, data, userblock_size, check_for_new_dataset); /* Free the dataset buffer */ - HDfree(data); + free(data); } /* end test_misc13() */ @@ -2833,10 +2833,10 @@ test_misc16(void) /* Initialize the data */ /* (Note that these are supposed to stress the code, so are a little weird) */ - HDmemcpy(wdata[0], "1234567", MISC16_STR_SIZE); - HDmemcpy(wdata[1], "1234567\0", MISC16_STR_SIZE); - HDmemcpy(wdata[2], "12345678", MISC16_STR_SIZE); - HDmemcpy(wdata[3], "\0\0\0\0\0\0\0\0", MISC16_STR_SIZE); + memcpy(wdata[0], "1234567", MISC16_STR_SIZE); + memcpy(wdata[1], "1234567\0", MISC16_STR_SIZE); + memcpy(wdata[2], "12345678", MISC16_STR_SIZE); + memcpy(wdata[3], "\0\0\0\0\0\0\0\0", MISC16_STR_SIZE); /* Create the file */ file = H5Fcreate(MISC16_FILE, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT); @@ -2921,10 +2921,10 @@ test_misc17(void) /* Initialize the data */ /* (Note that these are supposed to stress the code, so are a little weird) */ - HDmemcpy(wdata[0], "1234567", MISC17_SPACE_DIM2); - HDmemcpy(wdata[1], "1234567\0", MISC17_SPACE_DIM2); - HDmemcpy(wdata[2], "12345678", MISC17_SPACE_DIM2); - HDmemcpy(wdata[3], "\0\0\0\0\0\0\0\0", MISC17_SPACE_DIM2); + memcpy(wdata[0], "1234567", MISC17_SPACE_DIM2); + memcpy(wdata[1], "1234567\0", MISC17_SPACE_DIM2); + memcpy(wdata[2], "12345678", MISC17_SPACE_DIM2); + memcpy(wdata[3], "\0\0\0\0\0\0\0\0", MISC17_SPACE_DIM2); /* Create the file */ file = H5Fcreate(MISC17_FILE, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT); @@ -3640,7 +3640,7 @@ test_misc19(void) H5E_END_TRY; VERIFY(ret, FAIL, "H5FDunregister"); - HDfree(vfd_cls); + free(vfd_cls); /* Check H5I operations on virtual object connectors */ @@ -3680,7 +3680,7 @@ test_misc19(void) H5E_END_TRY; VERIFY(ret, FAIL, "H5VLunregister_connector"); - HDfree(vol_cls); + free(vol_cls); } /* end test_misc19() */ @@ -3713,7 +3713,7 @@ test_misc20(void) CHECK(ret, FAIL, "h5_driver_is_default_vfd_compatible"); if (!driver_is_default_compatible) { - HDprintf("-- SKIPPED --\n"); + printf("-- SKIPPED --\n"); return; } @@ -3888,8 +3888,8 @@ test_misc21(void) MESSAGE(5, ("Testing late allocation time w/chunks & filters\n")); /* Allocate space for the buffer */ - buf = (char *)HDcalloc(MISC21_SPACE_DIM0 * MISC21_SPACE_DIM1, 1); - CHECK(buf, NULL, "HDcalloc"); + buf = (char *)calloc(MISC21_SPACE_DIM0 * MISC21_SPACE_DIM1, 1); + CHECK(buf, NULL, "calloc"); /* Create the file */ fid = H5Fcreate(MISC21_FILE, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT); @@ -3929,7 +3929,7 @@ test_misc21(void) ret = H5Fclose(fid); CHECK(ret, FAIL, "H5Fclose"); - HDfree(buf); + free(buf); } /* end test_misc21() */ /**************************************************************** @@ -3973,8 +3973,8 @@ test_misc22(void) MESSAGE(5, ("Testing datatypes with SZIP filter\n")); /* Allocate space for the buffer */ - buf = (char *)HDcalloc(MISC22_SPACE_DIM0 * MISC22_SPACE_DIM1, 8); - CHECK(buf, NULL, "HDcalloc"); + buf = (char *)calloc(MISC22_SPACE_DIM0 * MISC22_SPACE_DIM1, 8); + CHECK(buf, NULL, "calloc"); /* Create the file */ fid = H5Fcreate(MISC22_FILE, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT); @@ -4080,7 +4080,7 @@ test_misc22(void) ret = H5Fclose(fid); CHECK(ret, FAIL, "H5Fclose"); - HDfree(buf); + free(buf); } /* end test_misc22() */ #endif /* H5_HAVE_FILTER_SZIP */ @@ -5009,7 +5009,7 @@ test_misc25b(void) CHECK(ret, FAIL, "h5_driver_is_default_vfd_compatible"); if (!driver_is_default_compatible) { - HDprintf("-- SKIPPED --\n"); + printf("-- SKIPPED --\n"); return; } @@ -5270,7 +5270,7 @@ test_misc27(void) CHECK(ret, FAIL, "h5_driver_is_default_vfd_compatible"); if (!driver_is_default_compatible) { - HDprintf("-- SKIPPED --\n"); + printf("-- SKIPPED --\n"); return; } @@ -5494,7 +5494,7 @@ test_misc29(void) CHECK(ret, FAIL, "h5_driver_is_default_vfd_compatible"); if (!driver_is_default_compatible) { - HDprintf("-- SKIPPED --\n"); + printf("-- SKIPPED --\n"); return; } @@ -5785,7 +5785,7 @@ test_misc33(void) CHECK(ret, FAIL, "h5_driver_is_default_vfd_compatible"); if (!driver_is_default_compatible) { - HDprintf("-- SKIPPED --\n"); + printf("-- SKIPPED --\n"); return; } @@ -6084,7 +6084,7 @@ test_misc37(void) CHECK(ret, FAIL, "h5_driver_is_default_vfd_compatible"); if (!driver_is_default_compatible) { - HDprintf("-- SKIPPED --\n"); + printf("-- SKIPPED --\n"); return; } diff --git a/test/trefer.c b/test/trefer.c index 2c62234..bc005bd 100644 --- a/test/trefer.c +++ b/test/trefer.c @@ -110,10 +110,10 @@ test_reference_params(void) MESSAGE(5, ("Testing Reference Parameters\n")); /* Allocate write & read buffers */ - wbuf = (H5R_ref_t *)HDcalloc(sizeof(H5R_ref_t), SPACE1_DIM1); - rbuf = (H5R_ref_t *)HDcalloc(sizeof(H5R_ref_t), SPACE1_DIM1); - tbuf = (H5R_ref_t *)HDcalloc(sizeof(H5R_ref_t), SPACE1_DIM1); - obuf = HDcalloc(sizeof(unsigned), SPACE1_DIM1); + wbuf = (H5R_ref_t *)calloc(sizeof(H5R_ref_t), SPACE1_DIM1); + rbuf = (H5R_ref_t *)calloc(sizeof(H5R_ref_t), SPACE1_DIM1); + tbuf = (H5R_ref_t *)calloc(sizeof(H5R_ref_t), SPACE1_DIM1); + obuf = calloc(sizeof(unsigned), SPACE1_DIM1); for (i = 0; i < SPACE1_DIM1; i++) obuf[i] = i * 3; @@ -409,10 +409,10 @@ test_reference_params(void) CHECK(ret, FAIL, "H5Fclose"); /* Free memory buffers */ - HDfree(wbuf); - HDfree(rbuf); - HDfree(tbuf); - HDfree(obuf); + free(wbuf); + free(rbuf); + free(tbuf); + free(obuf); } /* test_reference_params() */ /**************************************************************** @@ -443,10 +443,10 @@ test_reference_obj(void) MESSAGE(5, ("Testing Object Reference Functions\n")); /* Allocate write & read buffers */ - wbuf = HDcalloc(sizeof(H5R_ref_t), SPACE1_DIM1); - rbuf = HDcalloc(sizeof(H5R_ref_t), SPACE1_DIM1); - ibuf = HDcalloc(sizeof(unsigned), SPACE1_DIM1); - obuf = HDcalloc(sizeof(unsigned), SPACE1_DIM1); + wbuf = calloc(sizeof(H5R_ref_t), SPACE1_DIM1); + rbuf = calloc(sizeof(H5R_ref_t), SPACE1_DIM1); + ibuf = calloc(sizeof(unsigned), SPACE1_DIM1); + obuf = calloc(sizeof(unsigned), SPACE1_DIM1); for (i = 0; i < SPACE1_DIM1; i++) obuf[i] = i * 3; @@ -643,10 +643,10 @@ test_reference_obj(void) } /* Free memory buffers */ - HDfree(wbuf); - HDfree(rbuf); - HDfree(ibuf); - HDfree(obuf); + free(wbuf); + free(rbuf); + free(ibuf); + free(obuf); } /* test_reference_obj() */ /**************************************************************** @@ -680,9 +680,9 @@ test_reference_vlen_obj(void) MESSAGE(5, ("Testing Object Reference Functions within VLEN type\n")); /* Allocate write & read buffers */ - wbuf = HDcalloc(sizeof(H5R_ref_t), SPACE1_DIM1); - ibuf = HDcalloc(sizeof(unsigned), SPACE1_DIM1); - obuf = HDcalloc(sizeof(unsigned), SPACE1_DIM1); + wbuf = calloc(sizeof(H5R_ref_t), SPACE1_DIM1); + ibuf = calloc(sizeof(unsigned), SPACE1_DIM1); + obuf = calloc(sizeof(unsigned), SPACE1_DIM1); for (i = 0; i < SPACE1_DIM1; i++) obuf[i] = i * 3; @@ -909,10 +909,10 @@ test_reference_vlen_obj(void) } /* Free memory buffers */ - HDfree(wbuf); - HDfree(rbuf); - HDfree(ibuf); - HDfree(obuf); + free(wbuf); + free(rbuf); + free(ibuf); + free(obuf); } /* test_reference_vlen_obj() */ /**************************************************************** @@ -944,8 +944,8 @@ test_reference_cmpnd_obj(void) MESSAGE(5, ("Testing Object Reference Functions within compound type\n")); /* Allocate write & read buffers */ - ibuf = HDcalloc(sizeof(unsigned), SPACE1_DIM1); - obuf = HDcalloc(sizeof(unsigned), SPACE1_DIM1); + ibuf = calloc(sizeof(unsigned), SPACE1_DIM1); + obuf = calloc(sizeof(unsigned), SPACE1_DIM1); for (i = 0; i < SPACE1_DIM1; i++) obuf[i] = i * 3; @@ -1045,7 +1045,7 @@ test_reference_cmpnd_obj(void) CHECK(dataset, H5I_INVALID_HID, "H5Dcreate2"); /* Reset buffer for writing */ - HDmemset(&cmpnd_wbuf, 0, sizeof(cmpnd_wbuf)); + memset(&cmpnd_wbuf, 0, sizeof(cmpnd_wbuf)); /* Create reference to dataset */ ret = H5Rcreate_object(fid1, "/Group1/Dataset1", H5P_DEFAULT, &cmpnd_wbuf.ref0); @@ -1200,8 +1200,8 @@ test_reference_cmpnd_obj(void) CHECK(ret, FAIL, "H5Rdestroy"); /* Free memory buffers */ - HDfree(ibuf); - HDfree(obuf); + free(ibuf); + free(obuf); } /* test_reference_cmpnd_obj() */ /**************************************************************** @@ -1253,10 +1253,10 @@ test_reference_region(H5F_libver_t libver_low, H5F_libver_t libver_high) MESSAGE(5, ("Testing Dataset Region Reference Functions\n")); /* Allocate write & read buffers */ - wbuf = HDcalloc(sizeof(H5R_ref_t), SPACE1_DIM1); - rbuf = HDcalloc(sizeof(H5R_ref_t), SPACE1_DIM1); - dwbuf = (uint8_t *)HDcalloc(sizeof(uint8_t), (size_t)(SPACE2_DIM1 * SPACE2_DIM2)); - drbuf = (uint8_t *)HDcalloc(sizeof(uint8_t), (size_t)(SPACE2_DIM1 * SPACE2_DIM2)); + wbuf = calloc(sizeof(H5R_ref_t), SPACE1_DIM1); + rbuf = calloc(sizeof(H5R_ref_t), SPACE1_DIM1); + dwbuf = (uint8_t *)calloc(sizeof(uint8_t), (size_t)(SPACE2_DIM1 * SPACE2_DIM2)); + drbuf = (uint8_t *)calloc(sizeof(uint8_t), (size_t)(SPACE2_DIM1 * SPACE2_DIM2)); for (tu8 = dwbuf, i = 0; i < (SPACE2_DIM1 * SPACE2_DIM2); i++) *tu8++ = (uint8_t)(i * 3); @@ -1527,7 +1527,7 @@ test_reference_region(H5F_libver_t libver_low, H5F_libver_t libver_high) VERIFY(ret, 1, "H5Sget_select_hyper_nblocks"); /* allocate space for the hyperslab blocks */ - coords = (hsize_t *)HDmalloc((size_t)ret * SPACE2_RANK * sizeof(hsize_t) * 2); + coords = (hsize_t *)malloc((size_t)ret * SPACE2_RANK * sizeof(hsize_t) * 2); ret = H5Sget_select_hyper_blocklist(sid2, (hsize_t)0, (hsize_t)ret, coords); CHECK(ret, FAIL, "H5Sget_select_hyper_blocklist"); @@ -1535,7 +1535,7 @@ test_reference_region(H5F_libver_t libver_low, H5F_libver_t libver_high) VERIFY(coords[1], 2, "Hyperslab Coordinates"); VERIFY(coords[2], 7, "Hyperslab Coordinates"); VERIFY(coords[3], 7, "Hyperslab Coordinates"); - HDfree(coords); + free(coords); ret = H5Sget_select_bounds(sid2, low, high); CHECK(ret, FAIL, "H5Sget_select_bounds"); VERIFY(low[0], 2, "Selection Bounds"); @@ -1558,7 +1558,7 @@ test_reference_region(H5F_libver_t libver_low, H5F_libver_t libver_high) VERIFY(ret, SPACE2_DIM2, "H5Sget_select_elem_npoints"); /* allocate space for the element points */ - coords = (hsize_t *)HDmalloc((size_t)ret * SPACE2_RANK * sizeof(hsize_t)); + coords = (hsize_t *)malloc((size_t)ret * SPACE2_RANK * sizeof(hsize_t)); ret = H5Sget_select_elem_pointlist(sid2, (hsize_t)0, (hsize_t)ret, coords); CHECK(ret, FAIL, "H5Sget_select_elem_pointlist"); @@ -1582,7 +1582,7 @@ test_reference_region(H5F_libver_t libver_low, H5F_libver_t libver_high) VERIFY(coords[17], coord1[8][1], "Element Coordinates"); VERIFY(coords[18], coord1[9][0], "Element Coordinates"); VERIFY(coords[19], coord1[9][1], "Element Coordinates"); - HDfree(coords); + free(coords); ret = H5Sget_select_bounds(sid2, low, high); CHECK(ret, FAIL, "H5Sget_select_bounds"); VERIFY(low[0], 0, "Selection Bounds"); @@ -1659,10 +1659,10 @@ test_reference_region(H5F_libver_t libver_low, H5F_libver_t libver_high) } /* Free memory buffers */ - HDfree(wbuf); - HDfree(rbuf); - HDfree(dwbuf); - HDfree(drbuf); + free(wbuf); + free(rbuf); + free(dwbuf); + free(drbuf); } /* test_reference_region() */ @@ -1709,10 +1709,10 @@ test_reference_region_1D(H5F_libver_t libver_low, H5F_libver_t libver_high) MESSAGE(5, ("Testing 1-D Dataset Region Reference Functions\n")); /* Allocate write & read buffers */ - wbuf = HDcalloc(sizeof(H5R_ref_t), (size_t)SPACE1_DIM1); - rbuf = HDcalloc(sizeof(H5R_ref_t), (size_t)SPACE1_DIM1); - dwbuf = (uint8_t *)HDcalloc(sizeof(uint8_t), (size_t)SPACE3_DIM1); - drbuf = (uint8_t *)HDcalloc(sizeof(uint8_t), (size_t)SPACE3_DIM1); + wbuf = calloc(sizeof(H5R_ref_t), (size_t)SPACE1_DIM1); + rbuf = calloc(sizeof(H5R_ref_t), (size_t)SPACE1_DIM1); + dwbuf = (uint8_t *)calloc(sizeof(uint8_t), (size_t)SPACE3_DIM1); + drbuf = (uint8_t *)calloc(sizeof(uint8_t), (size_t)SPACE3_DIM1); for (tu8 = dwbuf, i = 0; i < SPACE3_DIM1; i++) *tu8++ = (uint8_t)(i * 3); @@ -1887,7 +1887,7 @@ test_reference_region_1D(H5F_libver_t libver_low, H5F_libver_t libver_high) VERIFY(ret, 15, "H5Sget_select_hyper_nblocks"); /* allocate space for the hyperslab blocks */ - coords = (hsize_t *)HDmalloc((size_t)ret * SPACE3_RANK * sizeof(hsize_t) * 2); + coords = (hsize_t *)malloc((size_t)ret * SPACE3_RANK * sizeof(hsize_t) * 2); ret = H5Sget_select_hyper_blocklist(sid3, (hsize_t)0, (hsize_t)ret, coords); CHECK(ret, FAIL, "H5Sget_select_hyper_blocklist"); @@ -1921,7 +1921,7 @@ test_reference_region_1D(H5F_libver_t libver_low, H5F_libver_t libver_high) VERIFY(coords[27], 68, "Hyperslab Coordinates"); VERIFY(coords[28], 72, "Hyperslab Coordinates"); VERIFY(coords[29], 73, "Hyperslab Coordinates"); - HDfree(coords); + free(coords); ret = H5Sget_select_bounds(sid3, low, high); CHECK(ret, FAIL, "H5Sget_select_bounds"); VERIFY(low[0], 2, "Selection Bounds"); @@ -1942,7 +1942,7 @@ test_reference_region_1D(H5F_libver_t libver_low, H5F_libver_t libver_high) VERIFY(ret, 10, "H5Sget_select_elem_npoints"); /* allocate space for the element points */ - coords = (hsize_t *)HDmalloc((size_t)ret * SPACE3_RANK * sizeof(hsize_t)); + coords = (hsize_t *)malloc((size_t)ret * SPACE3_RANK * sizeof(hsize_t)); ret = H5Sget_select_elem_pointlist(sid3, (hsize_t)0, (hsize_t)ret, coords); CHECK(ret, FAIL, "H5Sget_select_elem_pointlist"); @@ -1956,7 +1956,7 @@ test_reference_region_1D(H5F_libver_t libver_low, H5F_libver_t libver_high) VERIFY(coords[7], coord1[7][0], "Element Coordinates"); VERIFY(coords[8], coord1[8][0], "Element Coordinates"); VERIFY(coords[9], coord1[9][0], "Element Coordinates"); - HDfree(coords); + free(coords); ret = H5Sget_select_bounds(sid3, low, high); CHECK(ret, FAIL, "H5Sget_select_bounds"); VERIFY(low[0], 3, "Selection Bounds"); @@ -2000,10 +2000,10 @@ test_reference_region_1D(H5F_libver_t libver_low, H5F_libver_t libver_high) } /* Free memory buffers */ - HDfree(wbuf); - HDfree(rbuf); - HDfree(dwbuf); - HDfree(drbuf); + free(wbuf); + free(rbuf); + free(dwbuf); + free(drbuf); } /* test_reference_region_1D() */ @@ -2855,10 +2855,10 @@ test_reference_compat_conv(void) MESSAGE(5, ("Testing Deprecated Object Reference Functions\n")); /* Allocate write & read buffers */ - wbuf_obj = (hobj_ref_t *)HDcalloc(sizeof(hobj_ref_t), SPACE1_DIM1); - rbuf_obj = HDcalloc(sizeof(H5R_ref_t), SPACE1_DIM1); - wbuf_reg = HDcalloc(sizeof(hdset_reg_ref_t), SPACE1_DIM1); - rbuf_reg = HDcalloc(sizeof(H5R_ref_t), SPACE1_DIM1); + wbuf_obj = (hobj_ref_t *)calloc(sizeof(hobj_ref_t), SPACE1_DIM1); + rbuf_obj = calloc(sizeof(H5R_ref_t), SPACE1_DIM1); + wbuf_reg = calloc(sizeof(hdset_reg_ref_t), SPACE1_DIM1); + rbuf_reg = calloc(sizeof(H5R_ref_t), SPACE1_DIM1); /* Create file */ fid1 = H5Fcreate(FILE_REF_COMPAT, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT); @@ -3125,10 +3125,10 @@ test_reference_compat_conv(void) } /* Free memory buffers */ - HDfree(wbuf_obj); - HDfree(rbuf_obj); - HDfree(wbuf_reg); - HDfree(rbuf_reg); + free(wbuf_obj); + free(rbuf_obj); + free(wbuf_reg); + free(rbuf_reg); } /* test_reference_compat() */ /**************************************************************** @@ -3167,17 +3167,17 @@ test_reference_perf(void) MESSAGE(5, ("Testing Object Reference Performance\n")); /* Allocate write & read buffers */ - wbuf = HDcalloc(sizeof(H5R_ref_t), SPACE1_DIM1); - obuf = HDcalloc(sizeof(unsigned), SPACE1_DIM1); - ibuf = HDcalloc(sizeof(unsigned), SPACE1_DIM1); - wbuf_deprec = (hobj_ref_t *)HDcalloc(sizeof(hobj_ref_t), SPACE1_DIM1); - rbuf = (H5R_ref_t *)HDcalloc(sizeof(H5R_ref_t), SPACE1_DIM1); - rbuf_deprec = (hobj_ref_t *)HDcalloc(sizeof(hobj_ref_t), SPACE1_DIM1); - tbuf = (H5R_ref_t *)HDcalloc(sizeof(H5R_ref_t), SPACE1_DIM1); - wbuf_reg = (H5R_ref_t *)HDcalloc(sizeof(H5R_ref_t), SPACE1_DIM1); - rbuf_reg = (H5R_ref_t *)HDcalloc(sizeof(H5R_ref_t), SPACE1_DIM1); - wbuf_reg_deprec = (hdset_reg_ref_t *)HDcalloc(sizeof(hdset_reg_ref_t), SPACE1_DIM1); - rbuf_reg_deprec = (hdset_reg_ref_t *)HDcalloc(sizeof(hdset_reg_ref_t), SPACE1_DIM1); + wbuf = calloc(sizeof(H5R_ref_t), SPACE1_DIM1); + obuf = calloc(sizeof(unsigned), SPACE1_DIM1); + ibuf = calloc(sizeof(unsigned), SPACE1_DIM1); + wbuf_deprec = (hobj_ref_t *)calloc(sizeof(hobj_ref_t), SPACE1_DIM1); + rbuf = (H5R_ref_t *)calloc(sizeof(H5R_ref_t), SPACE1_DIM1); + rbuf_deprec = (hobj_ref_t *)calloc(sizeof(hobj_ref_t), SPACE1_DIM1); + tbuf = (H5R_ref_t *)calloc(sizeof(H5R_ref_t), SPACE1_DIM1); + wbuf_reg = (H5R_ref_t *)calloc(sizeof(H5R_ref_t), SPACE1_DIM1); + rbuf_reg = (H5R_ref_t *)calloc(sizeof(H5R_ref_t), SPACE1_DIM1); + wbuf_reg_deprec = (hdset_reg_ref_t *)calloc(sizeof(hdset_reg_ref_t), SPACE1_DIM1); + rbuf_reg_deprec = (hdset_reg_ref_t *)calloc(sizeof(hdset_reg_ref_t), SPACE1_DIM1); for (i = 0; i < SPACE1_DIM1; i++) obuf[i] = i * 3; @@ -3259,7 +3259,7 @@ test_reference_perf(void) CHECK(ret, FAIL, "H5Rdestroy"); } if (VERBOSE_MED) - HDprintf("--- Object reference create time: %lfs\n", t / MAX_ITER_CREATE); + printf("--- Object reference create time: %lfs\n", t / MAX_ITER_CREATE); /* Create reference to dataset */ ret = H5Rcreate_object(fid1, "/Group1/Dataset1", H5P_DEFAULT, &wbuf[0]); @@ -3278,7 +3278,7 @@ test_reference_perf(void) t += t2 - t1; } if (VERBOSE_MED) - HDprintf("--- Object reference write time: %lfs\n", t / MAX_ITER_WRITE); + printf("--- Object reference write time: %lfs\n", t / MAX_ITER_WRITE); /* Close Dataset */ ret = H5Dclose(dataset); @@ -3297,7 +3297,7 @@ test_reference_perf(void) t += t2 - t1; } if (VERBOSE_MED) - HDprintf("--- Deprecated object reference create time: %lfs\n", t / MAX_ITER_CREATE); + printf("--- Deprecated object reference create time: %lfs\n", t / MAX_ITER_CREATE); /* Create reference to dataset */ ret = H5Rcreate(&wbuf_deprec[0], fid1, "/Group1/Dataset1", H5R_OBJECT1, H5I_INVALID_HID); @@ -3313,7 +3313,7 @@ test_reference_perf(void) t += t2 - t1; } if (VERBOSE_MED) - HDprintf("--- Deprecated object reference write time: %lfs\n", t / MAX_ITER_WRITE); + printf("--- Deprecated object reference write time: %lfs\n", t / MAX_ITER_WRITE); /* Close Dataset */ ret = H5Dclose(dataset); @@ -3335,7 +3335,7 @@ test_reference_perf(void) CHECK(ret, FAIL, "H5Rdestroy"); } if (VERBOSE_MED) - HDprintf("--- Region reference create time: %lfs\n", t / MAX_ITER_CREATE); + printf("--- Region reference create time: %lfs\n", t / MAX_ITER_CREATE); /* Store first dataset region */ ret = H5Rcreate_region(fid1, "/Group1/Dataset1", sid1, H5P_DEFAULT, &wbuf_reg[0]); @@ -3351,7 +3351,7 @@ test_reference_perf(void) t += t2 - t1; } if (VERBOSE_MED) - HDprintf("--- Region reference write time: %lfs\n", t / MAX_ITER_WRITE); + printf("--- Region reference write time: %lfs\n", t / MAX_ITER_WRITE); /* Close Dataset */ ret = H5Dclose(dataset); @@ -3371,7 +3371,7 @@ test_reference_perf(void) t += t2 - t1; } if (VERBOSE_MED) - HDprintf("--- Deprecated region reference create time: %lfs\n", t / MAX_ITER_CREATE); + printf("--- Deprecated region reference create time: %lfs\n", t / MAX_ITER_CREATE); t = 0; for (i = 0; i < MAX_ITER_WRITE; i++) { @@ -3383,7 +3383,7 @@ test_reference_perf(void) t += t2 - t1; } if (VERBOSE_MED) - HDprintf("--- Deprecated region reference write time: %lfs\n", t / MAX_ITER_WRITE); + printf("--- Deprecated region reference write time: %lfs\n", t / MAX_ITER_WRITE); /* Close Dataset */ ret = H5Dclose(dataset); @@ -3417,7 +3417,7 @@ test_reference_perf(void) CHECK(ret, FAIL, "H5Rdestroy"); } if (VERBOSE_MED) - HDprintf("--- Object reference read time: %lfs\n", t / MAX_ITER_READ); + printf("--- Object reference read time: %lfs\n", t / MAX_ITER_READ); /* Read selection from disk */ ret = H5Dread(dataset, H5T_STD_REF, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf); @@ -3463,7 +3463,7 @@ test_reference_perf(void) t += t2 - t1; } if (VERBOSE_MED) - HDprintf("--- Deprecated object reference read time: %lfs\n", t / MAX_ITER_READ); + printf("--- Deprecated object reference read time: %lfs\n", t / MAX_ITER_READ); /* Close Dataset */ ret = H5Dclose(dataset); @@ -3485,7 +3485,7 @@ test_reference_perf(void) CHECK(ret, FAIL, "H5Rdestroy"); } if (VERBOSE_MED) - HDprintf("--- Region reference read time: %lfs\n", t / MAX_ITER_READ); + printf("--- Region reference read time: %lfs\n", t / MAX_ITER_READ); /* Read selection from disk */ ret = H5Dread(dataset, H5T_STD_REF, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf_reg); @@ -3509,7 +3509,7 @@ test_reference_perf(void) t += t2 - t1; } if (VERBOSE_MED) - HDprintf("--- Deprecated region reference read time: %lfs\n", t / MAX_ITER_READ); + printf("--- Deprecated region reference read time: %lfs\n", t / MAX_ITER_READ); /* Close Dataset */ ret = H5Dclose(dataset); @@ -3536,17 +3536,17 @@ test_reference_perf(void) } /* Free memory buffers */ - HDfree(wbuf); - HDfree(rbuf); - HDfree(wbuf_reg); - HDfree(rbuf_reg); - HDfree(wbuf_deprec); - HDfree(rbuf_deprec); - HDfree(wbuf_reg_deprec); - HDfree(rbuf_reg_deprec); - HDfree(tbuf); - HDfree(ibuf); - HDfree(obuf); + free(wbuf); + free(rbuf); + free(wbuf_reg); + free(rbuf_reg); + free(wbuf_deprec); + free(rbuf_deprec); + free(wbuf_reg_deprec); + free(rbuf_reg_deprec); + free(tbuf); + free(ibuf); + free(obuf); } /* test_reference_perf() */ /**************************************************************** diff --git a/test/trefer_deprec.c b/test/trefer_deprec.c index 8d75fed..3bc3ff3 100644 --- a/test/trefer_deprec.c +++ b/test/trefer_deprec.c @@ -85,12 +85,12 @@ test_reference_params(void) MESSAGE(5, ("Testing Reference Parameters\n")); /* Allocate write & read buffers */ - wbuf = (hobj_ref_t *)HDmalloc(MAX(sizeof(unsigned), sizeof(hobj_ref_t)) * SPACE1_DIM1); - CHECK_PTR(wbuf, "HDmalloc"); - rbuf = (hobj_ref_t *)HDmalloc(MAX(sizeof(unsigned), sizeof(hobj_ref_t)) * SPACE1_DIM1); - CHECK_PTR(rbuf, "HDmalloc"); - tbuf = (hobj_ref_t *)HDmalloc(MAX(sizeof(unsigned), sizeof(hobj_ref_t)) * SPACE1_DIM1); - CHECK_PTR(tbuf, "HDmalloc"); + wbuf = (hobj_ref_t *)malloc(MAX(sizeof(unsigned), sizeof(hobj_ref_t)) * SPACE1_DIM1); + CHECK_PTR(wbuf, "malloc"); + rbuf = (hobj_ref_t *)malloc(MAX(sizeof(unsigned), sizeof(hobj_ref_t)) * SPACE1_DIM1); + CHECK_PTR(rbuf, "malloc"); + tbuf = (hobj_ref_t *)malloc(MAX(sizeof(unsigned), sizeof(hobj_ref_t)) * SPACE1_DIM1); + CHECK_PTR(tbuf, "malloc"); /* Create file */ fid1 = H5Fcreate(FILE1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT); @@ -232,9 +232,9 @@ test_reference_params(void) CHECK(ret, FAIL, "H5Fclose"); /* Free memory buffers */ - HDfree(wbuf); - HDfree(rbuf); - HDfree(tbuf); + free(wbuf); + free(rbuf); + free(tbuf); } /* test_reference_obj() */ /**************************************************************** @@ -270,12 +270,12 @@ test_reference_obj(void) MESSAGE(5, ("Testing Object Reference Functions\n")); /* Allocate write & read buffers */ - wbuf = (hobj_ref_t *)HDmalloc(MAX(sizeof(unsigned), sizeof(hobj_ref_t)) * SPACE1_DIM1); - CHECK_PTR(wbuf, "HDmalloc"); - rbuf = (hobj_ref_t *)HDmalloc(MAX(sizeof(unsigned), sizeof(hobj_ref_t)) * SPACE1_DIM1); - CHECK_PTR(rbuf, "HDmalloc"); - tbuf = (hobj_ref_t *)HDmalloc(MAX(sizeof(unsigned), sizeof(hobj_ref_t)) * SPACE1_DIM1); - CHECK_PTR(tbuf, "HDmalloc"); + wbuf = (hobj_ref_t *)malloc(MAX(sizeof(unsigned), sizeof(hobj_ref_t)) * SPACE1_DIM1); + CHECK_PTR(wbuf, "malloc"); + rbuf = (hobj_ref_t *)malloc(MAX(sizeof(unsigned), sizeof(hobj_ref_t)) * SPACE1_DIM1); + CHECK_PTR(rbuf, "malloc"); + tbuf = (hobj_ref_t *)malloc(MAX(sizeof(unsigned), sizeof(hobj_ref_t)) * SPACE1_DIM1); + CHECK_PTR(tbuf, "malloc"); /* Create file */ fid1 = H5Fcreate(FILE1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT); @@ -486,9 +486,9 @@ test_reference_obj(void) CHECK(ret, FAIL, "H5Fclose"); /* Free memory buffers */ - HDfree(wbuf); - HDfree(rbuf); - HDfree(tbuf); + free(wbuf); + free(rbuf); + free(tbuf); } /* test_reference_obj() */ /**************************************************************** @@ -542,10 +542,10 @@ test_reference_region(H5F_libver_t libver_low, H5F_libver_t libver_high) MESSAGE(5, ("Testing Dataset Region Reference Functions\n")); /* Allocate write & read buffers */ - wbuf = (hdset_reg_ref_t *)HDcalloc(sizeof(hdset_reg_ref_t), (size_t)SPACE1_DIM1); - rbuf = (hdset_reg_ref_t *)HDmalloc(sizeof(hdset_reg_ref_t) * SPACE1_DIM1); - dwbuf = (uint8_t *)HDmalloc(sizeof(uint8_t) * SPACE2_DIM1 * SPACE2_DIM2); - drbuf = (uint8_t *)HDcalloc(sizeof(uint8_t), (size_t)(SPACE2_DIM1 * SPACE2_DIM2)); + wbuf = (hdset_reg_ref_t *)calloc(sizeof(hdset_reg_ref_t), (size_t)SPACE1_DIM1); + rbuf = (hdset_reg_ref_t *)malloc(sizeof(hdset_reg_ref_t) * SPACE1_DIM1); + dwbuf = (uint8_t *)malloc(sizeof(uint8_t) * SPACE2_DIM1 * SPACE2_DIM2); + drbuf = (uint8_t *)calloc(sizeof(uint8_t), (size_t)(SPACE2_DIM1 * SPACE2_DIM2)); /* Create file access property list */ fapl = H5Pcreate(H5P_FILE_ACCESS); @@ -807,15 +807,15 @@ test_reference_region(H5F_libver_t libver_low, H5F_libver_t libver_high) VERIFY(ret, 36, "H5Sget_select_npoints"); ret = (int)H5Sget_select_hyper_nblocks(sid2); VERIFY(ret, 1, "H5Sget_select_hyper_nblocks"); - coords = (hsize_t *)HDmalloc((size_t)ret * SPACE2_RANK * sizeof(hsize_t) * - 2); /* allocate space for the hyperslab blocks */ + coords = (hsize_t *)malloc((size_t)ret * SPACE2_RANK * sizeof(hsize_t) * + 2); /* allocate space for the hyperslab blocks */ ret = H5Sget_select_hyper_blocklist(sid2, (hsize_t)0, (hsize_t)ret, coords); CHECK(ret, FAIL, "H5Sget_select_hyper_blocklist"); VERIFY(coords[0], 2, "Hyperslab Coordinates"); VERIFY(coords[1], 2, "Hyperslab Coordinates"); VERIFY(coords[2], 7, "Hyperslab Coordinates"); VERIFY(coords[3], 7, "Hyperslab Coordinates"); - HDfree(coords); + free(coords); ret = H5Sget_select_bounds(sid2, low, high); CHECK(ret, FAIL, "H5Sget_select_bounds"); VERIFY(low[0], 2, "Selection Bounds"); @@ -836,8 +836,8 @@ test_reference_region(H5F_libver_t libver_low, H5F_libver_t libver_high) VERIFY(ret, 10, "H5Sget_select_npoints"); ret = (int)H5Sget_select_elem_npoints(sid2); VERIFY(ret, 10, "H5Sget_select_elem_npoints"); - coords = (hsize_t *)HDmalloc((size_t)ret * SPACE2_RANK * - sizeof(hsize_t)); /* allocate space for the element points */ + coords = (hsize_t *)malloc((size_t)ret * SPACE2_RANK * + sizeof(hsize_t)); /* allocate space for the element points */ ret = H5Sget_select_elem_pointlist(sid2, (hsize_t)0, (hsize_t)ret, coords); CHECK(ret, FAIL, "H5Sget_select_elem_pointlist"); VERIFY(coords[0], coord1[0][0], "Element Coordinates"); @@ -860,7 +860,7 @@ test_reference_region(H5F_libver_t libver_low, H5F_libver_t libver_high) VERIFY(coords[17], coord1[8][1], "Element Coordinates"); VERIFY(coords[18], coord1[9][0], "Element Coordinates"); VERIFY(coords[19], coord1[9][1], "Element Coordinates"); - HDfree(coords); + free(coords); ret = H5Sget_select_bounds(sid2, low, high); CHECK(ret, FAIL, "H5Sget_select_bounds"); VERIFY(low[0], 0, "Selection Bounds"); @@ -930,10 +930,10 @@ test_reference_region(H5F_libver_t libver_low, H5F_libver_t libver_high) CHECK(ret, FAIL, "H5Fclose"); /* Free memory buffers */ - HDfree(wbuf); - HDfree(rbuf); - HDfree(dwbuf); - HDfree(drbuf); + free(wbuf); + free(rbuf); + free(dwbuf); + free(drbuf); } /* test_reference_region() */ /**************************************************************** @@ -978,10 +978,10 @@ test_reference_region_1D(H5F_libver_t libver_low, H5F_libver_t libver_high) MESSAGE(5, ("Testing 1-D Dataset Region Reference Functions\n")); /* Allocate write & read buffers */ - wbuf = (hdset_reg_ref_t *)HDcalloc(sizeof(hdset_reg_ref_t), (size_t)SPACE1_DIM1); - rbuf = (hdset_reg_ref_t *)HDmalloc(sizeof(hdset_reg_ref_t) * SPACE1_DIM1); - dwbuf = (uint8_t *)HDmalloc(sizeof(uint8_t) * SPACE3_DIM1); - drbuf = (uint8_t *)HDcalloc(sizeof(uint8_t), (size_t)SPACE3_DIM1); + wbuf = (hdset_reg_ref_t *)calloc(sizeof(hdset_reg_ref_t), (size_t)SPACE1_DIM1); + rbuf = (hdset_reg_ref_t *)malloc(sizeof(hdset_reg_ref_t) * SPACE1_DIM1); + dwbuf = (uint8_t *)malloc(sizeof(uint8_t) * SPACE3_DIM1); + drbuf = (uint8_t *)calloc(sizeof(uint8_t), (size_t)SPACE3_DIM1); /* Create the file access property list */ fapl = H5Pcreate(H5P_FILE_ACCESS); @@ -1131,8 +1131,8 @@ test_reference_region_1D(H5F_libver_t libver_low, H5F_libver_t libver_high) VERIFY(ret, 30, "H5Sget_select_npoints"); ret = (int)H5Sget_select_hyper_nblocks(sid3); VERIFY(ret, 15, "H5Sget_select_hyper_nblocks"); - coords = (hsize_t *)HDmalloc((size_t)ret * SPACE3_RANK * sizeof(hsize_t) * - 2); /* allocate space for the hyperslab blocks */ + coords = (hsize_t *)malloc((size_t)ret * SPACE3_RANK * sizeof(hsize_t) * + 2); /* allocate space for the hyperslab blocks */ ret = H5Sget_select_hyper_blocklist(sid3, (hsize_t)0, (hsize_t)ret, coords); CHECK(ret, FAIL, "H5Sget_select_hyper_blocklist"); VERIFY(coords[0], 2, "Hyperslab Coordinates"); @@ -1165,7 +1165,7 @@ test_reference_region_1D(H5F_libver_t libver_low, H5F_libver_t libver_high) VERIFY(coords[27], 68, "Hyperslab Coordinates"); VERIFY(coords[28], 72, "Hyperslab Coordinates"); VERIFY(coords[29], 73, "Hyperslab Coordinates"); - HDfree(coords); + free(coords); ret = H5Sget_select_bounds(sid3, low, high); CHECK(ret, FAIL, "H5Sget_select_bounds"); VERIFY(low[0], 2, "Selection Bounds"); @@ -1184,8 +1184,8 @@ test_reference_region_1D(H5F_libver_t libver_low, H5F_libver_t libver_high) VERIFY(ret, 10, "H5Sget_select_npoints"); ret = (int)H5Sget_select_elem_npoints(sid3); VERIFY(ret, 10, "H5Sget_select_elem_npoints"); - coords = (hsize_t *)HDmalloc((size_t)ret * SPACE3_RANK * - sizeof(hsize_t)); /* allocate space for the element points */ + coords = (hsize_t *)malloc((size_t)ret * SPACE3_RANK * + sizeof(hsize_t)); /* allocate space for the element points */ ret = H5Sget_select_elem_pointlist(sid3, (hsize_t)0, (hsize_t)ret, coords); CHECK(ret, FAIL, "H5Sget_select_elem_pointlist"); VERIFY(coords[0], coord1[0][0], "Element Coordinates"); @@ -1198,7 +1198,7 @@ test_reference_region_1D(H5F_libver_t libver_low, H5F_libver_t libver_high) VERIFY(coords[7], coord1[7][0], "Element Coordinates"); VERIFY(coords[8], coord1[8][0], "Element Coordinates"); VERIFY(coords[9], coord1[9][0], "Element Coordinates"); - HDfree(coords); + free(coords); ret = H5Sget_select_bounds(sid3, low, high); CHECK(ret, FAIL, "H5Sget_select_bounds"); VERIFY(low[0], 3, "Selection Bounds"); @@ -1233,10 +1233,10 @@ test_reference_region_1D(H5F_libver_t libver_low, H5F_libver_t libver_high) CHECK(ret, FAIL, "H5Fclose"); /* Free memory buffers */ - HDfree(wbuf); - HDfree(rbuf); - HDfree(dwbuf); - HDfree(drbuf); + free(wbuf); + free(rbuf); + free(dwbuf); + free(drbuf); } /* test_reference_region_1D() */ /**************************************************************** @@ -1317,7 +1317,7 @@ test_reference_obj_deleted(void) VERIFY(dset2, FAIL, "H5Rdereference2"); /* Read selection from disk */ - HDmemset(&oref, 0, sizeof(hobj_ref_t)); + memset(&oref, 0, sizeof(hobj_ref_t)); ret = H5Dread(dataset, H5T_STD_REF_OBJ, H5S_ALL, H5S_ALL, H5P_DEFAULT, &oref); CHECK(ret, FAIL, "H5Dread"); @@ -1326,7 +1326,7 @@ test_reference_obj_deleted(void) VERIFY(dset2, FAIL, "H5Rdereference2"); /* Open nonsense reference */ - HDmemset(&oref, 0, sizeof(hobj_ref_t)); + memset(&oref, 0, sizeof(hobj_ref_t)); dset2 = H5Rdereference2(dataset, H5P_DEFAULT, H5R_OBJECT, &oref); VERIFY(dset2, FAIL, "H5Rdereference2"); @@ -1426,9 +1426,9 @@ test_reference_group(void) /* Create bottom dataset */ did = H5Dcreate2(gid, DSETNAME2, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); - HDassert(did > 0); + assert(did > 0); ret = H5Dclose(did); - HDassert(ret >= 0); + assert(ret >= 0); ret = H5Gclose(gid); CHECK(ret, FAIL, "H5Gclose"); @@ -1538,10 +1538,10 @@ test_reference_compat(void) MESSAGE(5, ("Testing Deprecated Object Reference Functions\n")); /* Allocate write & read buffers */ - wbuf_obj = (hobj_ref_t *)HDcalloc(sizeof(hobj_ref_t), SPACE1_DIM1); - rbuf_obj = (hobj_ref_t *)HDmalloc(sizeof(hobj_ref_t) * SPACE1_DIM1); - wbuf_reg = (hdset_reg_ref_t *)HDcalloc(sizeof(hdset_reg_ref_t), SPACE1_DIM1); - rbuf_reg = (hdset_reg_ref_t *)HDmalloc(sizeof(hdset_reg_ref_t) * SPACE1_DIM1); + wbuf_obj = (hobj_ref_t *)calloc(sizeof(hobj_ref_t), SPACE1_DIM1); + rbuf_obj = (hobj_ref_t *)malloc(sizeof(hobj_ref_t) * SPACE1_DIM1); + wbuf_reg = (hdset_reg_ref_t *)calloc(sizeof(hdset_reg_ref_t), SPACE1_DIM1); + rbuf_reg = (hdset_reg_ref_t *)malloc(sizeof(hdset_reg_ref_t) * SPACE1_DIM1); /* Create file */ fid1 = H5Fcreate(FILE1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT); @@ -1798,10 +1798,10 @@ test_reference_compat(void) CHECK(ret, FAIL, "H5Fclose"); /* Free memory buffers */ - HDfree(wbuf_obj); - HDfree(rbuf_obj); - HDfree(wbuf_reg); - HDfree(rbuf_reg); + free(wbuf_obj); + free(rbuf_obj); + free(wbuf_reg); + free(rbuf_reg); } /* test_reference_compat() */ #endif /* H5_NO_DEPRECATED_SYMBOLS */ diff --git a/test/trefer_shutdown.c b/test/trefer_shutdown.c index 50bdb26..118d660 100644 --- a/test/trefer_shutdown.c +++ b/test/trefer_shutdown.c @@ -10,39 +10,39 @@ main(int argc, char **argv) int i; if ((fid = H5Fcreate("HDFFV-10992.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - HDfprintf(stderr, "H5Fcreate failed\n"); + fprintf(stderr, "H5Fcreate failed\n"); return 1; } if ((sid = H5Screate(H5S_SCALAR)) < 0) { - HDfprintf(stderr, "H5Screate failed\n"); + fprintf(stderr, "H5Screate failed\n"); return 1; } /* Create a dataset of object references */ if ((did = H5Dcreate2(fid, "dset", H5T_STD_REF, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - HDfprintf(stderr, "H5Dcreate failed\n"); + fprintf(stderr, "H5Dcreate failed\n"); return 1; } for (i = 0; i < 100; i++) { /* Create reference to the root group */ if (H5Rcreate_object(fid, "/dset", H5P_DEFAULT, &write_ref) < 0) { - HDfprintf(stderr, "H5Rcreate_object failed\n"); + fprintf(stderr, "H5Rcreate_object failed\n"); return 1; } } /* Write reference to dataset */ if (H5Dwrite(did, H5T_STD_REF, H5S_ALL, H5S_ALL, H5P_DEFAULT, &write_ref) < 0) { - HDfprintf(stderr, "H5Dwrite failed\n"); + fprintf(stderr, "H5Dwrite failed\n"); return 1; } for (i = 0; i < 500; i++) { /* Read reference back into different reference buffer */ if (H5Dread(did, H5T_STD_REF, H5S_ALL, H5S_ALL, H5P_DEFAULT, &read_ref) < 0) { - HDfprintf(stderr, "H5Dread failed\n"); + fprintf(stderr, "H5Dread failed\n"); return 1; } } @@ -55,27 +55,27 @@ main(int argc, char **argv) */ #if 0 if (H5Rdestroy(&write_ref) < 0) { - HDfprintf(stderr, "H5Rdestroy on reference write buffer failed\n"); + fprintf(stderr, "H5Rdestroy on reference write buffer failed\n"); return 1; } if (H5Rdestroy(&read_ref) < 0) { - HDfprintf(stderr, "H5Rdestroy on reference read buffer failed\n"); + fprintf(stderr, "H5Rdestroy on reference read buffer failed\n"); return 1; } #endif if (H5Sclose(sid) < 0) { - HDfprintf(stderr, "H5Sclose failed\n"); + fprintf(stderr, "H5Sclose failed\n"); return 1; } if (H5Dclose(did) < 0) { - HDfprintf(stderr, "H5Dclose failed\n"); + fprintf(stderr, "H5Dclose failed\n"); return 1; } if (H5Fclose(fid) < 0) { - HDfprintf(stderr, "H5Fclose failed\n"); + fprintf(stderr, "H5Fclose failed\n"); return 1; } diff --git a/test/trefstr.c b/test/trefstr.c index 9019ce6..e556c3c 100644 --- a/test/trefstr.c +++ b/test/trefstr.c @@ -375,9 +375,9 @@ test_refstr_acat(void) VERIFY(cmp, 0, "HDstrcmp"); /* Append a large string to ref-counted string */ - large_str = HDmalloc(1024); - CHECK_PTR(large_str, "HDmalloc"); - HDmemset(large_str, 'a', 1024); + large_str = malloc(1024); + CHECK_PTR(large_str, "malloc"); + memset(large_str, 'a', 1024); large_str[1023] = '\0'; ret = H5RS_acat(rs, large_str); CHECK(ret, FAIL, "H5RS_acat"); @@ -386,10 +386,10 @@ test_refstr_acat(void) s = H5RS_get_str(rs); CHECK_PTR(s, "H5RS_get_str"); HDsnprintf(buf, sizeof(buf), "%s", "foobar"); - large_str2 = HDmalloc(1024 + 6); - CHECK_PTR(large_str2, "HDmalloc"); + large_str2 = malloc(1024 + 6); + CHECK_PTR(large_str2, "malloc"); HDstrcpy(large_str2, "foobar"); - HDmemset(&large_str2[6], 'a', 1024); + memset(&large_str2[6], 'a', 1024); large_str2[1029] = '\0'; cmp = HDstrcmp(s, large_str2); VERIFY(cmp, 0, "HDstrcmp"); @@ -399,8 +399,8 @@ test_refstr_acat(void) CHECK(ret, FAIL, "H5RS_decr"); /* Free large strings */ - HDfree(large_str); - HDfree(large_str2); + free(large_str); + free(large_str2); } /* end test_refstr_acat() */ /**************************************************************** diff --git a/test/tselect.c b/test/tselect.c index d67e5bd..70c9d6a 100644 --- a/test/tselect.c +++ b/test/tselect.c @@ -247,10 +247,10 @@ test_select_hyper(hid_t xfer_plist) MESSAGE(5, ("Testing Hyperslab Selection Functions\n")); /* Allocate write & read buffers */ - wbuf = (uint8_t *)HDmalloc(sizeof(uint8_t) * SPACE2_DIM1 * SPACE2_DIM2); - CHECK_PTR(wbuf, "HDmalloc"); - rbuf = (uint8_t *)HDcalloc(sizeof(uint8_t), (size_t)(SPACE3_DIM1 * SPACE3_DIM2)); - CHECK_PTR(rbuf, "HDcalloc"); + wbuf = (uint8_t *)malloc(sizeof(uint8_t) * SPACE2_DIM1 * SPACE2_DIM2); + CHECK_PTR(wbuf, "malloc"); + rbuf = (uint8_t *)calloc(sizeof(uint8_t), (size_t)(SPACE3_DIM1 * SPACE3_DIM2)); + CHECK_PTR(rbuf, "calloc"); /* Initialize write buffer */ for (i = 0, tbuf = wbuf; i < SPACE2_DIM1; i++) @@ -434,8 +434,8 @@ test_select_hyper(hid_t xfer_plist) CHECK(ret, FAIL, "H5Fclose"); /* Free memory buffers */ - HDfree(wbuf); - HDfree(rbuf); + free(wbuf); + free(rbuf); } /* test_select_hyper() */ struct pnt_iter { @@ -501,10 +501,10 @@ test_select_point(hid_t xfer_plist) MESSAGE(5, ("Testing Element Selection Functions\n")); /* Allocate write & read buffers */ - wbuf = (uint8_t *)HDmalloc(sizeof(uint8_t) * SPACE2_DIM1 * SPACE2_DIM2); - CHECK_PTR(wbuf, "HDmalloc"); - rbuf = (uint8_t *)HDcalloc(sizeof(uint8_t), (size_t)(SPACE3_DIM1 * SPACE3_DIM2)); - CHECK_PTR(rbuf, "HDcalloc"); + wbuf = (uint8_t *)malloc(sizeof(uint8_t) * SPACE2_DIM1 * SPACE2_DIM2); + CHECK_PTR(wbuf, "malloc"); + rbuf = (uint8_t *)calloc(sizeof(uint8_t), (size_t)(SPACE3_DIM1 * SPACE3_DIM2)); + CHECK_PTR(rbuf, "calloc"); /* Initialize write buffer */ for (i = 0, tbuf = wbuf; i < SPACE2_DIM1; i++) @@ -648,7 +648,7 @@ test_select_point(hid_t xfer_plist) /* Save points for later iteration */ /* (these are in the second half of the buffer, because we are prepending */ /* the next list of points to the beginning of the point selection list) */ - HDmemcpy(((char *)pi.coord) + sizeof(coord2), coord2, sizeof(coord2)); + memcpy(((char *)pi.coord) + sizeof(coord2), coord2, sizeof(coord2)); ret = (int)H5Sget_select_npoints(sid2); VERIFY(ret, 10, "H5Sget_select_npoints"); @@ -688,7 +688,7 @@ test_select_point(hid_t xfer_plist) VERIFY(ret, 20, "H5Sget_select_npoints"); /* Save points for later iteration */ - HDmemcpy(pi.coord, coord2, sizeof(coord2)); + memcpy(pi.coord, coord2, sizeof(coord2)); /* Create a dataset */ dataset = H5Dcreate2(fid1, SPACE1_NAME, H5T_NATIVE_UCHAR, sid1, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); @@ -801,8 +801,8 @@ test_select_point(hid_t xfer_plist) CHECK(ret, FAIL, "H5Fclose"); /* Free memory buffers */ - HDfree(wbuf); - HDfree(rbuf); + free(wbuf); + free(rbuf); } /* test_select_point() */ /**************************************************************** @@ -863,10 +863,10 @@ test_select_all(hid_t xfer_plist) MESSAGE(5, ("Testing 'All' Selection Functions\n")); /* Allocate write & read buffers */ - wbuf = (uint8_t *)HDmalloc(sizeof(uint8_t) * SPACE4_DIM1 * SPACE4_DIM2 * SPACE4_DIM3); - CHECK_PTR(wbuf, "HDmalloc"); - rbuf = (uint8_t *)HDcalloc(sizeof(uint8_t), (size_t)(SPACE4_DIM1 * SPACE4_DIM2 * SPACE4_DIM3)); - CHECK_PTR(rbuf, "HDcalloc"); + wbuf = (uint8_t *)malloc(sizeof(uint8_t) * SPACE4_DIM1 * SPACE4_DIM2 * SPACE4_DIM3); + CHECK_PTR(wbuf, "malloc"); + rbuf = (uint8_t *)calloc(sizeof(uint8_t), (size_t)(SPACE4_DIM1 * SPACE4_DIM2 * SPACE4_DIM3)); + CHECK_PTR(rbuf, "calloc"); /* Initialize write buffer */ for (i = 0, tbuf = wbuf; i < SPACE4_DIM1; i++) @@ -916,8 +916,8 @@ test_select_all(hid_t xfer_plist) CHECK(ret, FAIL, "H5Fclose"); /* Free memory buffers */ - HDfree(wbuf); - HDfree(rbuf); + free(wbuf); + free(rbuf); } /* test_select_all() */ /**************************************************************** @@ -950,10 +950,10 @@ test_select_all_hyper(hid_t xfer_plist) MESSAGE(5, ("Testing 'All' Selection Functions\n")); /* Allocate write & read buffers */ - wbuf = (uint8_t *)HDmalloc(sizeof(uint8_t) * SPACE2_DIM1 * SPACE2_DIM2); - CHECK_PTR(wbuf, "HDmalloc"); - rbuf = (uint8_t *)HDcalloc(sizeof(uint8_t), (size_t)(SPACE3_DIM1 * SPACE3_DIM2)); - CHECK_PTR(rbuf, "HDcalloc"); + wbuf = (uint8_t *)malloc(sizeof(uint8_t) * SPACE2_DIM1 * SPACE2_DIM2); + CHECK_PTR(wbuf, "malloc"); + rbuf = (uint8_t *)calloc(sizeof(uint8_t), (size_t)(SPACE3_DIM1 * SPACE3_DIM2)); + CHECK_PTR(rbuf, "calloc"); /* Initialize write buffer */ for (i = 0, tbuf = wbuf; i < SPACE2_DIM1; i++) @@ -1068,8 +1068,8 @@ test_select_all_hyper(hid_t xfer_plist) CHECK(ret, FAIL, "H5Fclose"); /* Free memory buffers */ - HDfree(wbuf); - HDfree(rbuf); + free(wbuf); + free(rbuf); } /* test_select_all_hyper() */ /**************************************************************** @@ -1104,10 +1104,10 @@ test_select_combo(void) MESSAGE(5, ("Testing Combination of Hyperslab & Element Selection Functions\n")); /* Allocate write & read buffers */ - wbuf = (uint8_t *)HDmalloc(sizeof(uint8_t) * SPACE2_DIM1 * SPACE2_DIM2); - CHECK_PTR(wbuf, "HDmalloc"); - rbuf = (uint8_t *)HDcalloc(sizeof(uint8_t), (size_t)(SPACE3_DIM1 * SPACE3_DIM2)); - CHECK_PTR(rbuf, "HDcalloc"); + wbuf = (uint8_t *)malloc(sizeof(uint8_t) * SPACE2_DIM1 * SPACE2_DIM2); + CHECK_PTR(wbuf, "malloc"); + rbuf = (uint8_t *)calloc(sizeof(uint8_t), (size_t)(SPACE3_DIM1 * SPACE3_DIM2)); + CHECK_PTR(rbuf, "calloc"); /* Initialize write buffer */ for (i = 0, tbuf = wbuf; i < SPACE2_DIM1; i++) @@ -1229,8 +1229,8 @@ test_select_combo(void) CHECK(ret, FAIL, "H5Fclose"); /* Free memory buffers */ - HDfree(wbuf); - HDfree(rbuf); + free(wbuf); + free(rbuf); } /* test_select_combo() */ static int @@ -1299,10 +1299,10 @@ test_select_hyper_stride(hid_t xfer_plist) MESSAGE(5, ("Testing Hyperslabs with Strides Functionality\n")); /* Allocate write & read buffers */ - wbuf = (uint16_t *)HDmalloc(sizeof(uint16_t) * SPACE2_DIM1 * SPACE2_DIM2); - CHECK_PTR(wbuf, "HDmalloc"); - rbuf = (uint16_t *)HDcalloc(sizeof(uint16_t), (size_t)(SPACE3_DIM1 * SPACE3_DIM2)); - CHECK_PTR(rbuf, "HDcalloc"); + wbuf = (uint16_t *)malloc(sizeof(uint16_t) * SPACE2_DIM1 * SPACE2_DIM2); + CHECK_PTR(wbuf, "malloc"); + rbuf = (uint16_t *)calloc(sizeof(uint16_t), (size_t)(SPACE3_DIM1 * SPACE3_DIM2)); + CHECK_PTR(rbuf, "calloc"); /* Initialize write buffer */ for (i = 0, tbuf = wbuf; i < SPACE2_DIM1; i++) @@ -1389,10 +1389,10 @@ test_select_hyper_stride(hid_t xfer_plist) tbuf = wbuf + loc1[i]; tbuf2 = rbuf + loc2[i]; if (*tbuf != *tbuf2) { - HDprintf("%d: hyperslab values don't match!, loc1[%d]=%d, loc2[%d]=%d\n", __LINE__, i, - (int)loc1[i], i, (int)loc2[i]); - HDprintf("wbuf=%p, tbuf=%p, rbuf=%p, tbuf2=%p\n", (void *)wbuf, (void *)tbuf, (void *)rbuf, - (void *)tbuf2); + printf("%d: hyperslab values don't match!, loc1[%d]=%d, loc2[%d]=%d\n", __LINE__, i, (int)loc1[i], + i, (int)loc2[i]); + printf("wbuf=%p, tbuf=%p, rbuf=%p, tbuf2=%p\n", (void *)wbuf, (void *)tbuf, (void *)rbuf, + (void *)tbuf2); TestErrPrintf("*tbuf=%u, *tbuf2=%u\n", (unsigned)*tbuf, (unsigned)*tbuf2); } /* end if */ } /* end for */ @@ -1414,8 +1414,8 @@ test_select_hyper_stride(hid_t xfer_plist) CHECK(ret, FAIL, "H5Fclose"); /* Free memory buffers */ - HDfree(wbuf); - HDfree(rbuf); + free(wbuf); + free(rbuf); } /* test_select_hyper_stride() */ /**************************************************************** @@ -1445,10 +1445,10 @@ test_select_hyper_contig(hid_t dset_type, hid_t xfer_plist) MESSAGE(5, ("Testing Contiguous Hyperslabs Functionality\n")); /* Allocate write & read buffers */ - wbuf = (uint16_t *)HDmalloc(sizeof(uint16_t) * SPACE2_DIM1 * SPACE2_DIM2); - CHECK_PTR(wbuf, "HDmalloc"); - rbuf = (uint16_t *)HDcalloc(sizeof(uint16_t), (size_t)(SPACE2_DIM1 * SPACE2_DIM2)); - CHECK_PTR(rbuf, "HDcalloc"); + wbuf = (uint16_t *)malloc(sizeof(uint16_t) * SPACE2_DIM1 * SPACE2_DIM2); + CHECK_PTR(wbuf, "malloc"); + rbuf = (uint16_t *)calloc(sizeof(uint16_t), (size_t)(SPACE2_DIM1 * SPACE2_DIM2)); + CHECK_PTR(rbuf, "calloc"); /* Initialize write buffer */ for (i = 0, tbuf = wbuf; i < SPACE2_DIM1; i++) @@ -1536,7 +1536,7 @@ test_select_hyper_contig(hid_t dset_type, hid_t xfer_plist) CHECK(ret, FAIL, "H5Dread"); /* Compare data read with data written out */ - if (HDmemcmp(rbuf, wbuf, sizeof(uint16_t) * 30 * 12) != 0) + if (memcmp(rbuf, wbuf, sizeof(uint16_t) * 30 * 12) != 0) TestErrPrintf("hyperslab values don't match! Line=%d\n", __LINE__); /* Close memory dataspace */ @@ -1556,8 +1556,8 @@ test_select_hyper_contig(hid_t dset_type, hid_t xfer_plist) CHECK(ret, FAIL, "H5Fclose"); /* Free memory buffers */ - HDfree(wbuf); - HDfree(rbuf); + free(wbuf); + free(rbuf); } /* test_select_hyper_contig() */ /**************************************************************** @@ -1585,11 +1585,11 @@ test_select_hyper_contig2(hid_t dset_type, hid_t xfer_plist) MESSAGE(5, ("Testing More Contiguous Hyperslabs Functionality\n")); /* Allocate write & read buffers */ - wbuf = (uint16_t *)HDmalloc(sizeof(uint16_t) * SPACE8_DIM1 * SPACE8_DIM2 * SPACE8_DIM3 * SPACE8_DIM4); - CHECK_PTR(wbuf, "HDmalloc"); - rbuf = (uint16_t *)HDcalloc(sizeof(uint16_t), - (size_t)(SPACE8_DIM1 * SPACE8_DIM2 * SPACE8_DIM3 * SPACE8_DIM4)); - CHECK_PTR(rbuf, "HDcalloc"); + wbuf = (uint16_t *)malloc(sizeof(uint16_t) * SPACE8_DIM1 * SPACE8_DIM2 * SPACE8_DIM3 * SPACE8_DIM4); + CHECK_PTR(wbuf, "malloc"); + rbuf = + (uint16_t *)calloc(sizeof(uint16_t), (size_t)(SPACE8_DIM1 * SPACE8_DIM2 * SPACE8_DIM3 * SPACE8_DIM4)); + CHECK_PTR(rbuf, "calloc"); /* Initialize write buffer */ for (i = 0, tbuf = wbuf; i < SPACE8_DIM1; i++) @@ -1679,7 +1679,7 @@ test_select_hyper_contig2(hid_t dset_type, hid_t xfer_plist) CHECK(ret, FAIL, "H5Dread"); /* Compare data read with data written out */ - if (HDmemcmp(rbuf, wbuf, sizeof(uint16_t) * 2 * SPACE8_DIM3 * SPACE8_DIM2 * SPACE8_DIM1) != 0) + if (memcmp(rbuf, wbuf, sizeof(uint16_t) * 2 * SPACE8_DIM3 * SPACE8_DIM2 * SPACE8_DIM1) != 0) TestErrPrintf("Error: hyperslab values don't match!\n"); /* Close memory dataspace */ @@ -1699,8 +1699,8 @@ test_select_hyper_contig2(hid_t dset_type, hid_t xfer_plist) CHECK(ret, FAIL, "H5Fclose"); /* Free memory buffers */ - HDfree(wbuf); - HDfree(rbuf); + free(wbuf); + free(rbuf); } /* test_select_hyper_contig2() */ /**************************************************************** @@ -1731,11 +1731,11 @@ test_select_hyper_contig3(hid_t dset_type, hid_t xfer_plist) MESSAGE(5, ("Testing Yet More Contiguous Hyperslabs Functionality\n")); /* Allocate write & read buffers */ - wbuf = (uint16_t *)HDmalloc(sizeof(uint16_t) * SPACE8_DIM1 * SPACE8_DIM2 * SPACE8_DIM3 * SPACE8_DIM4); - CHECK_PTR(wbuf, "HDmalloc"); - rbuf = (uint16_t *)HDcalloc(sizeof(uint16_t), - (size_t)(SPACE8_DIM1 * SPACE8_DIM2 * SPACE8_DIM3 * SPACE8_DIM4)); - CHECK_PTR(rbuf, "HDcalloc"); + wbuf = (uint16_t *)malloc(sizeof(uint16_t) * SPACE8_DIM1 * SPACE8_DIM2 * SPACE8_DIM3 * SPACE8_DIM4); + CHECK_PTR(wbuf, "malloc"); + rbuf = + (uint16_t *)calloc(sizeof(uint16_t), (size_t)(SPACE8_DIM1 * SPACE8_DIM2 * SPACE8_DIM3 * SPACE8_DIM4)); + CHECK_PTR(rbuf, "calloc"); /* Initialize write buffer */ for (i = 0, tbuf = wbuf; i < SPACE8_DIM4; i++) @@ -1834,14 +1834,14 @@ test_select_hyper_contig3(hid_t dset_type, hid_t xfer_plist) (k >= start[2] && k < (start[2] + count[2])) && (l >= start[3] && l < (start[3] + count[3]))) { if (*tbuf != *tbuf2) { - HDprintf("Error: hyperslab values don't match!\n"); + printf("Error: hyperslab values don't match!\n"); TestErrPrintf("Line: %d, i=%u, j=%u, k=%u, l=%u, *tbuf=%u,*tbuf2=%u\n", __LINE__, i, j, k, l, (unsigned)*tbuf, (unsigned)*tbuf2); } /* end if */ } /* end if */ else { if (*tbuf2 != 0) { - HDprintf("Error: invalid data in read buffer!\n"); + printf("Error: invalid data in read buffer!\n"); TestErrPrintf("Line: %d, i=%u, j=%u, k=%u, l=%u, *tbuf=%u,*tbuf2=%u\n", __LINE__, i, j, k, l, (unsigned)*tbuf, (unsigned)*tbuf2); } /* end if */ @@ -1864,8 +1864,8 @@ test_select_hyper_contig3(hid_t dset_type, hid_t xfer_plist) CHECK(ret, FAIL, "H5Fclose"); /* Free memory buffers */ - HDfree(wbuf); - HDfree(rbuf); + free(wbuf); + free(rbuf); } /* test_select_hyper_contig3() */ /**************************************************************** @@ -1884,8 +1884,8 @@ verify_select_hyper_contig_dr__run_test(const uint16_t *cube_buf, size_t H5_ATTR size_t s; /* Local index variable */ hbool_t mis_match; /* Flag to indicate mismatch in expected value */ - HDassert(cube_buf); - HDassert(cube_size > 0); + assert(cube_buf); + assert(cube_size > 0); expected_value = 0; mis_match = FALSE; @@ -1902,7 +1902,7 @@ verify_select_hyper_contig_dr__run_test(const uint16_t *cube_buf, size_t H5_ATTR m = 0; do { /* Sanity check */ - HDassert(s < cube_size); + assert(s < cube_size); /* Check for correct value */ if (*cube_ptr != expected_value) @@ -1976,12 +1976,12 @@ test_select_hyper_contig_dr__run_test(int test_num, const uint16_t *cube_buf, co MESSAGE(7, ("\tranks = %u/%u, edge_size = %u, chunk_edge_size = %u.\n", small_rank, large_rank, edge_size, chunk_edge_size)); - HDassert(edge_size >= 6); - HDassert(edge_size >= chunk_edge_size); - HDassert((chunk_edge_size == 0) || (chunk_edge_size >= 3)); - HDassert(small_rank > 0); - HDassert(small_rank < large_rank); - HDassert(large_rank <= SS_DR_MAX_RANK); + assert(edge_size >= 6); + assert(edge_size >= chunk_edge_size); + assert((chunk_edge_size == 0) || (chunk_edge_size >= 3)); + assert(small_rank > 0); + assert(small_rank < large_rank); + assert(large_rank <= SS_DR_MAX_RANK); /* Compute cube sizes */ small_cube_size = large_cube_size = (size_t)1; @@ -1992,7 +1992,7 @@ test_select_hyper_contig_dr__run_test(int test_num, const uint16_t *cube_buf, co large_cube_size *= (size_t)edge_size; } /* end for */ - HDassert(large_cube_size < (size_t)UINT_MAX); + assert(large_cube_size < (size_t)UINT_MAX); /* set up the start, stride, count, and block pointers */ start_ptr = &(start[SS_DR_MAX_RANK - large_rank]); @@ -2001,10 +2001,10 @@ test_select_hyper_contig_dr__run_test(int test_num, const uint16_t *cube_buf, co block_ptr = &(block[SS_DR_MAX_RANK - large_rank]); /* Allocate buffers */ - small_cube_buf_1 = (uint16_t *)HDcalloc(sizeof(uint16_t), small_cube_size); - CHECK_PTR(small_cube_buf_1, "HDcalloc"); - large_cube_buf_1 = (uint16_t *)HDcalloc(sizeof(uint16_t), large_cube_size); - CHECK_PTR(large_cube_buf_1, "HDcalloc"); + small_cube_buf_1 = (uint16_t *)calloc(sizeof(uint16_t), small_cube_size); + CHECK_PTR(small_cube_buf_1, "calloc"); + large_cube_buf_1 = (uint16_t *)calloc(sizeof(uint16_t), large_cube_size); + CHECK_PTR(large_cube_buf_1, "calloc"); /* Create a dataset transfer property list */ fapl = H5Pcreate(H5P_FILE_ACCESS); @@ -2195,7 +2195,7 @@ test_select_hyper_contig_dr__run_test(int test_num, const uint16_t *cube_buf, co */ /* zero out the in-memory large cube */ - HDmemset(large_cube_buf_1, 0, large_cube_size * sizeof(uint16_t)); + memset(large_cube_buf_1, 0, large_cube_size * sizeof(uint16_t)); u = 0; do { @@ -2238,8 +2238,8 @@ test_select_hyper_contig_dr__run_test(int test_num, const uint16_t *cube_buf, co (x * edge_size); stop_index = start_index + small_cube_size - 1; - HDassert(start_index < stop_index); - HDassert(stop_index <= large_cube_size); + assert(start_index < stop_index); + assert(stop_index <= large_cube_size); mis_match = FALSE; ptr_1 = large_cube_buf_1; @@ -2264,7 +2264,7 @@ test_select_hyper_contig_dr__run_test(int test_num, const uint16_t *cube_buf, co TestErrPrintf("large cube read from small cube has bad data! Line=%u\n", __LINE__); /* Zero out the buffer for the next pass */ - HDmemset(large_cube_buf_1 + start_index, 0, small_cube_size * sizeof(uint16_t)); + memset(large_cube_buf_1 + start_index, 0, small_cube_size * sizeof(uint16_t)); x++; } while ((large_rank >= 2) && (small_rank <= 1) && (x < edge_size)); @@ -2432,8 +2432,8 @@ test_select_hyper_contig_dr__run_test(int test_num, const uint16_t *cube_buf, co (x * edge_size); stop_index = start_index + small_cube_size - 1; - HDassert(start_index < stop_index); - HDassert(stop_index <= large_cube_size); + assert(start_index < stop_index); + assert(stop_index <= large_cube_size); mis_match = FALSE; ptr_1 = large_cube_buf_1; @@ -2489,8 +2489,8 @@ test_select_hyper_contig_dr__run_test(int test_num, const uint16_t *cube_buf, co CHECK(ret, FAIL, "H5Fclose"); /* Free memory buffers */ - HDfree(small_cube_buf_1); - HDfree(large_cube_buf_1); + free(small_cube_buf_1); + free(large_cube_buf_1); } /* test_select_hyper_contig_dr__run_test() */ @@ -2528,8 +2528,8 @@ test_select_hyper_contig_dr(hid_t dset_type, hid_t xfer_plist) max_cube_size *= (size_t)edge_size; /* Allocate cube buffer for writing values */ - cube_buf = (uint16_t *)HDmalloc(sizeof(uint16_t) * max_cube_size); - CHECK_PTR(cube_buf, "HDmalloc"); + cube_buf = (uint16_t *)malloc(sizeof(uint16_t) * max_cube_size); + CHECK_PTR(cube_buf, "malloc"); /* Initialize the cube buffer */ cube_ptr = cube_buf; @@ -2537,8 +2537,8 @@ test_select_hyper_contig_dr(hid_t dset_type, hid_t xfer_plist) *cube_ptr++ = (uint16_t)s; /* Allocate cube buffer for zeroing values on disk */ - zero_buf = (uint16_t *)HDcalloc(sizeof(uint16_t), max_cube_size); - CHECK_PTR(zero_buf, "HDcalloc"); + zero_buf = (uint16_t *)calloc(sizeof(uint16_t), max_cube_size); + CHECK_PTR(zero_buf, "calloc"); for (large_rank = 1; large_rank <= max_rank; large_rank++) { for (small_rank = 1; small_rank < large_rank; small_rank++) { @@ -2554,8 +2554,8 @@ test_select_hyper_contig_dr(hid_t dset_type, hid_t xfer_plist) } /* for loop on small rank */ } /* for loop on large rank */ - HDfree(cube_buf); - HDfree(zero_buf); + free(cube_buf); + free(zero_buf); } /* test_select_hyper_contig_dr() */ @@ -2597,16 +2597,16 @@ test_select_hyper_checker_board_dr__select_checker_board(hid_t tgt_n_cube_sid, u unsigned u; /* Local index variables */ herr_t ret; /* Generic return value */ - HDassert(edge_size >= 6); - HDassert(0 < checker_edge_size); - HDassert(checker_edge_size <= edge_size); - HDassert(0 < sel_rank); - HDassert(sel_rank <= tgt_n_cube_rank); - HDassert(tgt_n_cube_rank <= SS_DR_MAX_RANK); + assert(edge_size >= 6); + assert(0 < checker_edge_size); + assert(checker_edge_size <= edge_size); + assert(0 < sel_rank); + assert(sel_rank <= tgt_n_cube_rank); + assert(tgt_n_cube_rank <= SS_DR_MAX_RANK); sel_offset = SS_DR_MAX_RANK - sel_rank; n_cube_offset = SS_DR_MAX_RANK - tgt_n_cube_rank; - HDassert(n_cube_offset <= sel_offset); + assert(n_cube_offset <= sel_offset); /* First, compute the base count (which assumes start == 0 * for the associated offset) and offset_count (which @@ -2819,13 +2819,13 @@ test_select_hyper_checker_board_dr__verify_data(uint16_t *buf_ptr, unsigned rank unsigned v, w, x, y, z; /* to track position in checker */ const unsigned test_max_rank = 5; /* code changes needed if this is increased */ - HDassert(buf_ptr != NULL); - HDassert(0 < rank); - HDassert(rank <= test_max_rank); - HDassert(edge_size >= 6); - HDassert(0 < checker_edge_size); - HDassert(checker_edge_size <= edge_size); - HDassert(test_max_rank <= SS_DR_MAX_RANK); + assert(buf_ptr != NULL); + assert(0 < rank); + assert(rank <= test_max_rank); + assert(edge_size >= 6); + assert(0 < checker_edge_size); + assert(checker_edge_size <= edge_size); + assert(test_max_rank <= SS_DR_MAX_RANK); val_ptr = buf_ptr; expected_value = first_expected_val; @@ -2956,15 +2956,15 @@ test_select_hyper_checker_board_dr__run_test(int test_num, const uint16_t *cube_ MESSAGE(7, ("\tranks = %d/%d, edge_size = %d, checker_edge_size = %d, chunk_edge_size = %d.\n", small_rank, large_rank, edge_size, checker_edge_size, chunk_edge_size)); - HDassert(edge_size >= 6); - HDassert(checker_edge_size > 0); - HDassert(checker_edge_size <= edge_size); - HDassert(edge_size >= chunk_edge_size); - HDassert((chunk_edge_size == 0) || (chunk_edge_size >= 3)); - HDassert(small_rank > 0); - HDassert(small_rank < large_rank); - HDassert(large_rank <= test_max_rank); - HDassert(test_max_rank <= SS_DR_MAX_RANK); + assert(edge_size >= 6); + assert(checker_edge_size > 0); + assert(checker_edge_size <= edge_size); + assert(edge_size >= chunk_edge_size); + assert((chunk_edge_size == 0) || (chunk_edge_size >= 3)); + assert(small_rank > 0); + assert(small_rank < large_rank); + assert(large_rank <= test_max_rank); + assert(test_max_rank <= SS_DR_MAX_RANK); /* Compute cube sizes */ small_cube_size = large_cube_size = (size_t)1; @@ -2974,22 +2974,22 @@ test_select_hyper_checker_board_dr__run_test(int test_num, const uint16_t *cube_ large_cube_size *= (size_t)edge_size; } /* end for */ - HDassert(large_cube_size < (size_t)(UINT_MAX)); + assert(large_cube_size < (size_t)(UINT_MAX)); small_rank_offset = test_max_rank - small_rank; - HDassert(small_rank_offset >= 1); + assert(small_rank_offset >= 1); /* also, at present, we use 16 bit values in this test -- * hence the following assertion. Delete it if we convert * to 32 bit values. */ - HDassert(large_cube_size < (size_t)(64 * 1024)); + assert(large_cube_size < (size_t)(64 * 1024)); /* Allocate & initialize buffers */ - small_cube_buf_1 = (uint16_t *)HDcalloc(sizeof(uint16_t), small_cube_size); - CHECK_PTR(small_cube_buf_1, "HDcalloc"); - large_cube_buf_1 = (uint16_t *)HDcalloc(sizeof(uint16_t), large_cube_size); - CHECK_PTR(large_cube_buf_1, "HDcalloc"); + small_cube_buf_1 = (uint16_t *)calloc(sizeof(uint16_t), small_cube_size); + CHECK_PTR(small_cube_buf_1, "calloc"); + large_cube_buf_1 = (uint16_t *)calloc(sizeof(uint16_t), large_cube_size); + CHECK_PTR(large_cube_buf_1, "calloc"); /* Create a dataset transfer property list */ fapl = H5Pcreate(H5P_FILE_ACCESS); @@ -3150,11 +3150,11 @@ test_select_hyper_checker_board_dr__run_test(int test_num, const uint16_t *cube_ * need for another inner loop. */ - HDassert((sel_start[0] == 0) || (0 < small_rank_offset)); - HDassert((sel_start[1] == 0) || (1 < small_rank_offset)); - HDassert((sel_start[2] == 0) || (2 < small_rank_offset)); - HDassert((sel_start[3] == 0) || (3 < small_rank_offset)); - HDassert((sel_start[4] == 0) || (4 < small_rank_offset)); + assert((sel_start[0] == 0) || (0 < small_rank_offset)); + assert((sel_start[1] == 0) || (1 < small_rank_offset)); + assert((sel_start[2] == 0) || (2 < small_rank_offset)); + assert((sel_start[3] == 0) || (3 < small_rank_offset)); + assert((sel_start[4] == 0) || (4 < small_rank_offset)); test_select_hyper_checker_board_dr__select_checker_board( file_large_cube_sid, large_rank, edge_size, checker_edge_size, small_rank, sel_start); @@ -3166,7 +3166,7 @@ test_select_hyper_checker_board_dr__run_test(int test_num, const uint16_t *cube_ VERIFY(check, TRUE, "H5Sselect_shape_same"); /* zero the buffer that we will be using for reading */ - HDmemset(small_cube_buf_1, 0, sizeof(*small_cube_buf_1) * small_cube_size); + memset(small_cube_buf_1, 0, sizeof(*small_cube_buf_1) * small_cube_size); /* Read selection from disk */ ret = H5Dread(large_cube_dataset, H5T_NATIVE_UINT16, mem_small_cube_sid, @@ -3230,11 +3230,11 @@ test_select_hyper_checker_board_dr__run_test(int test_num, const uint16_t *cube_ * need for another inner loop. */ - HDassert((sel_start[0] == 0) || (0 < small_rank_offset)); - HDassert((sel_start[1] == 0) || (1 < small_rank_offset)); - HDassert((sel_start[2] == 0) || (2 < small_rank_offset)); - HDassert((sel_start[3] == 0) || (3 < small_rank_offset)); - HDassert((sel_start[4] == 0) || (4 < small_rank_offset)); + assert((sel_start[0] == 0) || (0 < small_rank_offset)); + assert((sel_start[1] == 0) || (1 < small_rank_offset)); + assert((sel_start[2] == 0) || (2 < small_rank_offset)); + assert((sel_start[3] == 0) || (3 < small_rank_offset)); + assert((sel_start[4] == 0) || (4 < small_rank_offset)); test_select_hyper_checker_board_dr__select_checker_board( mem_large_cube_sid, large_rank, edge_size, checker_edge_size, small_rank, sel_start); @@ -3246,7 +3246,7 @@ test_select_hyper_checker_board_dr__run_test(int test_num, const uint16_t *cube_ VERIFY(check, TRUE, "H5Sselect_shape_same"); /* zero out the in memory large cube */ - HDmemset(large_cube_buf_1, 0, sizeof(*large_cube_buf_1) * large_cube_size); + memset(large_cube_buf_1, 0, sizeof(*large_cube_buf_1) * large_cube_size); /* Read selection from disk */ ret = H5Dread(small_cube_dataset, H5T_NATIVE_UINT16, mem_large_cube_sid, @@ -3264,8 +3264,8 @@ test_select_hyper_checker_board_dr__run_test(int test_num, const uint16_t *cube_ (x * edge_size); stop_index = start_index + small_cube_size - 1; - HDassert(start_index < stop_index); - HDassert(stop_index <= large_cube_size); + assert(start_index < stop_index); + assert(stop_index <= large_cube_size); /* verify that the large cube contains only zeros before the slice */ for (s = 0; s < start_index; s++) { @@ -3273,7 +3273,7 @@ test_select_hyper_checker_board_dr__run_test(int test_num, const uint16_t *cube_ data_ok = FALSE; ptr_1++; } /* end for */ - HDassert(s == start_index); + 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); @@ -3281,7 +3281,7 @@ test_select_hyper_checker_board_dr__run_test(int test_num, const uint16_t *cube_ ptr_1 += small_cube_size; s += small_cube_size; - HDassert(s == stop_index + 1); + assert(s == stop_index + 1); /* verify that the large cube contains only zeros after the slice */ for (s = stop_index + 1; s < large_cube_size; s++) { @@ -3350,11 +3350,11 @@ test_select_hyper_checker_board_dr__run_test(int test_num, const uint16_t *cube_ * need for another inner loop. */ - HDassert((sel_start[0] == 0) || (0 < small_rank_offset)); - HDassert((sel_start[1] == 0) || (1 < small_rank_offset)); - HDassert((sel_start[2] == 0) || (2 < small_rank_offset)); - HDassert((sel_start[3] == 0) || (3 < small_rank_offset)); - HDassert((sel_start[4] == 0) || (4 < small_rank_offset)); + assert((sel_start[0] == 0) || (0 < small_rank_offset)); + assert((sel_start[1] == 0) || (1 < small_rank_offset)); + assert((sel_start[2] == 0) || (2 < small_rank_offset)); + assert((sel_start[3] == 0) || (3 < small_rank_offset)); + assert((sel_start[4] == 0) || (4 < small_rank_offset)); test_select_hyper_checker_board_dr__select_checker_board( mem_large_cube_sid, large_rank, edge_size, checker_edge_size, small_rank, sel_start); @@ -3373,7 +3373,7 @@ test_select_hyper_checker_board_dr__run_test(int test_num, const uint16_t *cube_ CHECK(ret, FAIL, "H5Dwrite"); /* zero the buffer that we will be using for reading */ - HDmemset(small_cube_buf_1, 0, sizeof(*small_cube_buf_1) * small_cube_size); + memset(small_cube_buf_1, 0, sizeof(*small_cube_buf_1) * small_cube_size); /* read the on disk small cube into memory */ ret = H5Dread(small_cube_dataset, H5T_NATIVE_UINT16, full_small_cube_sid, @@ -3445,11 +3445,11 @@ test_select_hyper_checker_board_dr__run_test(int test_num, const uint16_t *cube_ * need for another inner loop. */ - HDassert((sel_start[0] == 0) || (0 < small_rank_offset)); - HDassert((sel_start[1] == 0) || (1 < small_rank_offset)); - HDassert((sel_start[2] == 0) || (2 < small_rank_offset)); - HDassert((sel_start[3] == 0) || (3 < small_rank_offset)); - HDassert((sel_start[4] == 0) || (4 < small_rank_offset)); + assert((sel_start[0] == 0) || (0 < small_rank_offset)); + assert((sel_start[1] == 0) || (1 < small_rank_offset)); + assert((sel_start[2] == 0) || (2 < small_rank_offset)); + assert((sel_start[3] == 0) || (3 < small_rank_offset)); + assert((sel_start[4] == 0) || (4 < small_rank_offset)); test_select_hyper_checker_board_dr__select_checker_board( file_large_cube_sid, large_rank, edge_size, checker_edge_size, small_rank, sel_start); @@ -3469,7 +3469,7 @@ test_select_hyper_checker_board_dr__run_test(int test_num, const uint16_t *cube_ CHECK(ret, FAIL, "H5Dwrite"); /* zero out the in memory large cube */ - HDmemset(large_cube_buf_1, 0, sizeof(*large_cube_buf_1) * large_cube_size); + memset(large_cube_buf_1, 0, sizeof(*large_cube_buf_1) * large_cube_size); /* read the on disk large cube into memory */ ret = H5Dread(large_cube_dataset, H5T_NATIVE_UINT16, full_large_cube_sid, @@ -3488,8 +3488,8 @@ test_select_hyper_checker_board_dr__run_test(int test_num, const uint16_t *cube_ (x * edge_size); stop_index = start_index + small_cube_size - 1; - HDassert(start_index < stop_index); - HDassert(stop_index <= large_cube_size); + assert(start_index < stop_index); + assert(stop_index <= large_cube_size); /* verify that the large cube contains only zeros before the slice */ for (s = 0; s < start_index; s++) { @@ -3497,7 +3497,7 @@ test_select_hyper_checker_board_dr__run_test(int test_num, const uint16_t *cube_ data_ok = FALSE; ptr_1++; } /* end for */ - HDassert(s == start_index); + assert(s == start_index); /* verify that the slice contains the expected data */ data_ok &= test_select_hyper_checker_board_dr__verify_data( @@ -3506,7 +3506,7 @@ test_select_hyper_checker_board_dr__run_test(int test_num, const uint16_t *cube_ ptr_1 += small_cube_size; s += small_cube_size; - HDassert(s == stop_index + 1); + assert(s == stop_index + 1); /* verify that the large cube contains only zeros after the slice */ for (s = stop_index + 1; s < large_cube_size; s++) { @@ -3561,8 +3561,8 @@ test_select_hyper_checker_board_dr__run_test(int test_num, const uint16_t *cube_ CHECK(ret, FAIL, "H5Fclose"); /* Free memory buffers */ - HDfree(small_cube_buf_1); - HDfree(large_cube_buf_1); + free(small_cube_buf_1); + free(large_cube_buf_1); } /* test_select_hyper_checker_board_dr__run_test() */ @@ -3604,8 +3604,8 @@ test_select_hyper_checker_board_dr(hid_t dset_type, hid_t xfer_plist) max_cube_size *= (size_t)(edge_size + 1); /* Allocate cube buffer for writing values */ - cube_buf = (uint16_t *)HDmalloc(sizeof(uint16_t) * max_cube_size); - CHECK_PTR(cube_buf, "HDmalloc"); + cube_buf = (uint16_t *)malloc(sizeof(uint16_t) * max_cube_size); + CHECK_PTR(cube_buf, "malloc"); /* Initialize the cube buffer */ cube_ptr = cube_buf; @@ -3613,8 +3613,8 @@ test_select_hyper_checker_board_dr(hid_t dset_type, hid_t xfer_plist) *cube_ptr++ = (uint16_t)s; /* Allocate cube buffer for zeroing values on disk */ - zero_buf = (uint16_t *)HDcalloc(sizeof(uint16_t), max_cube_size); - CHECK_PTR(zero_buf, "HDcalloc"); + zero_buf = (uint16_t *)calloc(sizeof(uint16_t), max_cube_size); + CHECK_PTR(zero_buf, "calloc"); for (large_rank = 1; large_rank <= max_rank; large_rank++) { for (small_rank = 1; small_rank < large_rank; small_rank++) { @@ -3642,8 +3642,8 @@ test_select_hyper_checker_board_dr(hid_t dset_type, hid_t xfer_plist) } /* for loop on small rank */ } /* for loop on large rank */ - HDfree(cube_buf); - HDfree(zero_buf); + free(cube_buf); + free(zero_buf); } /* test_select_hyper_checker_board_dr() */ @@ -3677,12 +3677,12 @@ test_select_hyper_copy(void) MESSAGE(5, ("Testing Hyperslabs with Strides Functionality\n")); /* Allocate write & read buffers */ - wbuf = (uint16_t *)HDmalloc(sizeof(uint16_t) * SPACE2_DIM1 * SPACE2_DIM2); - CHECK_PTR(wbuf, "HDmalloc"); - rbuf = (uint16_t *)HDcalloc(sizeof(uint16_t), (size_t)(SPACE3_DIM1 * SPACE3_DIM2)); - CHECK_PTR(rbuf, "HDcalloc"); - rbuf2 = (uint16_t *)HDcalloc(sizeof(uint16_t), (size_t)(SPACE3_DIM1 * SPACE3_DIM2)); - CHECK_PTR(rbuf2, "HDcalloc"); + wbuf = (uint16_t *)malloc(sizeof(uint16_t) * SPACE2_DIM1 * SPACE2_DIM2); + CHECK_PTR(wbuf, "malloc"); + rbuf = (uint16_t *)calloc(sizeof(uint16_t), (size_t)(SPACE3_DIM1 * SPACE3_DIM2)); + CHECK_PTR(rbuf, "calloc"); + rbuf2 = (uint16_t *)calloc(sizeof(uint16_t), (size_t)(SPACE3_DIM1 * SPACE3_DIM2)); + CHECK_PTR(rbuf2, "calloc"); /* Initialize write buffer */ for (i = 0, tbuf = wbuf; i < SPACE2_DIM1; i++) @@ -3786,7 +3786,7 @@ test_select_hyper_copy(void) CHECK(ret, FAIL, "H5Dread"); /* Compare data read with data written out */ - if (HDmemcmp(rbuf, rbuf2, sizeof(uint16_t) * SPACE3_DIM1 * SPACE3_DIM2) != 0) + if (memcmp(rbuf, rbuf2, sizeof(uint16_t) * SPACE3_DIM1 * SPACE3_DIM2) != 0) TestErrPrintf("hyperslab values don't match! Line=%d\n", __LINE__); /* Close memory dataspace */ @@ -3814,9 +3814,9 @@ test_select_hyper_copy(void) CHECK(ret, FAIL, "H5Fclose"); /* Free memory buffers */ - HDfree(wbuf); - HDfree(rbuf); - HDfree(rbuf2); + free(wbuf); + free(rbuf); + free(rbuf2); } /* test_select_hyper_copy() */ /**************************************************************** @@ -3848,12 +3848,12 @@ test_select_point_copy(void) MESSAGE(5, ("Testing Hyperslabs with Strides Functionality\n")); /* Allocate write & read buffers */ - wbuf = (uint16_t *)HDmalloc(sizeof(uint16_t) * SPACE2_DIM1 * SPACE2_DIM2); - CHECK_PTR(wbuf, "HDmalloc"); - rbuf = (uint16_t *)HDcalloc(sizeof(uint16_t), (size_t)(SPACE3_DIM1 * SPACE3_DIM2)); - CHECK_PTR(rbuf, "HDcalloc"); - rbuf2 = (uint16_t *)HDcalloc(sizeof(uint16_t), (size_t)(SPACE3_DIM1 * SPACE3_DIM2)); - CHECK_PTR(rbuf2, "HDcalloc"); + wbuf = (uint16_t *)malloc(sizeof(uint16_t) * SPACE2_DIM1 * SPACE2_DIM2); + CHECK_PTR(wbuf, "malloc"); + rbuf = (uint16_t *)calloc(sizeof(uint16_t), (size_t)(SPACE3_DIM1 * SPACE3_DIM2)); + CHECK_PTR(rbuf, "calloc"); + rbuf2 = (uint16_t *)calloc(sizeof(uint16_t), (size_t)(SPACE3_DIM1 * SPACE3_DIM2)); + CHECK_PTR(rbuf2, "calloc"); /* Initialize write buffer */ for (i = 0, tbuf = wbuf; i < SPACE2_DIM1; i++) @@ -3999,7 +3999,7 @@ test_select_point_copy(void) CHECK(ret, FAIL, "H5Dread"); /* Compare data read with data written out */ - if (HDmemcmp(rbuf, rbuf2, sizeof(uint16_t) * SPACE3_DIM1 * SPACE3_DIM2) != 0) + if (memcmp(rbuf, rbuf2, sizeof(uint16_t) * SPACE3_DIM1 * SPACE3_DIM2) != 0) TestErrPrintf("point values don't match!\n"); /* Close memory dataspace */ @@ -4027,9 +4027,9 @@ test_select_point_copy(void) CHECK(ret, FAIL, "H5Fclose"); /* Free memory buffers */ - HDfree(wbuf); - HDfree(rbuf); - HDfree(rbuf2); + free(wbuf); + free(rbuf); + free(rbuf2); } /* test_select_point_copy() */ /**************************************************************** @@ -4066,10 +4066,10 @@ test_select_hyper_offset(void) MESSAGE(5, ("Testing Hyperslab Selection Functions with Offsets\n")); /* Allocate write & read buffers */ - wbuf = (uint8_t *)HDmalloc(sizeof(uint8_t) * SPACE2_DIM1 * SPACE2_DIM2); - CHECK_PTR(wbuf, "HDmalloc"); - rbuf = (uint8_t *)HDcalloc(sizeof(uint8_t), (size_t)(SPACE3_DIM1 * SPACE3_DIM2)); - CHECK_PTR(rbuf, "HDcalloc"); + wbuf = (uint8_t *)malloc(sizeof(uint8_t) * SPACE2_DIM1 * SPACE2_DIM2); + CHECK_PTR(wbuf, "malloc"); + rbuf = (uint8_t *)calloc(sizeof(uint8_t), (size_t)(SPACE3_DIM1 * SPACE3_DIM2)); + CHECK_PTR(rbuf, "calloc"); /* Initialize write buffer */ for (i = 0, tbuf = wbuf; i < SPACE2_DIM1; i++) @@ -4215,8 +4215,8 @@ test_select_hyper_offset(void) CHECK(ret, FAIL, "H5Fclose"); /* Free memory buffers */ - HDfree(wbuf); - HDfree(rbuf); + free(wbuf); + free(rbuf); } /* test_select_hyper_offset() */ /**************************************************************** @@ -4248,10 +4248,10 @@ test_select_hyper_offset2(void) MESSAGE(5, ("Testing More Hyperslab Selection Functions with Offsets\n")); /* Allocate write & read buffers */ - wbuf = (uint8_t *)HDmalloc(sizeof(uint8_t) * SPACE7_DIM1 * SPACE7_DIM2); - CHECK_PTR(wbuf, "HDmalloc"); - rbuf = (uint8_t *)HDcalloc(sizeof(uint8_t), (size_t)(SPACE7_DIM1 * SPACE7_DIM2)); - CHECK_PTR(rbuf, "HDcalloc"); + wbuf = (uint8_t *)malloc(sizeof(uint8_t) * SPACE7_DIM1 * SPACE7_DIM2); + CHECK_PTR(wbuf, "malloc"); + rbuf = (uint8_t *)calloc(sizeof(uint8_t), (size_t)(SPACE7_DIM1 * SPACE7_DIM2)); + CHECK_PTR(rbuf, "calloc"); /* Initialize write buffer */ for (i = 0, tbuf = wbuf; i < SPACE7_DIM1; i++) @@ -4342,8 +4342,8 @@ test_select_hyper_offset2(void) CHECK(ret, FAIL, "H5Fclose"); /* Free memory buffers */ - HDfree(wbuf); - HDfree(rbuf); + free(wbuf); + free(rbuf); } /* test_select_hyper_offset2() */ /**************************************************************** @@ -4378,10 +4378,10 @@ test_select_point_offset(void) MESSAGE(5, ("Testing Element Selection Functions\n")); /* Allocate write & read buffers */ - wbuf = (uint8_t *)HDmalloc(sizeof(uint8_t) * SPACE2_DIM1 * SPACE2_DIM2); - CHECK_PTR(wbuf, "HDmalloc"); - rbuf = (uint8_t *)HDcalloc(sizeof(uint8_t), (size_t)(SPACE3_DIM1 * SPACE3_DIM2)); - CHECK_PTR(rbuf, "HDcalloc"); + wbuf = (uint8_t *)malloc(sizeof(uint8_t) * SPACE2_DIM1 * SPACE2_DIM2); + CHECK_PTR(wbuf, "malloc"); + rbuf = (uint8_t *)calloc(sizeof(uint8_t), (size_t)(SPACE3_DIM1 * SPACE3_DIM2)); + CHECK_PTR(rbuf, "calloc"); /* Initialize write buffer */ for (i = 0, tbuf = wbuf; i < SPACE2_DIM1; i++) @@ -4562,8 +4562,8 @@ test_select_point_offset(void) CHECK(ret, FAIL, "H5Fclose"); /* Free memory buffers */ - HDfree(wbuf); - HDfree(rbuf); + free(wbuf); + free(rbuf); } /* test_select_point_offset() */ /**************************************************************** @@ -4605,10 +4605,10 @@ test_select_hyper_union(void) MESSAGE(5, ("Testing Hyperslab Selection Functions with unions of hyperslabs\n")); /* Allocate write & read buffers */ - wbuf = (uint8_t *)HDmalloc(sizeof(uint8_t) * SPACE2_DIM1 * SPACE2_DIM2); - CHECK_PTR(wbuf, "HDmalloc"); - rbuf = (uint8_t *)HDcalloc(sizeof(uint8_t), (size_t)(SPACE3_DIM1 * SPACE3_DIM2)); - CHECK_PTR(rbuf, "HDcalloc"); + wbuf = (uint8_t *)malloc(sizeof(uint8_t) * SPACE2_DIM1 * SPACE2_DIM2); + CHECK_PTR(wbuf, "malloc"); + rbuf = (uint8_t *)calloc(sizeof(uint8_t), (size_t)(SPACE3_DIM1 * SPACE3_DIM2)); + CHECK_PTR(rbuf, "calloc"); /* Initialize write buffer */ for (i = 0, tbuf = wbuf; i < SPACE2_DIM1; i++) @@ -5188,8 +5188,8 @@ test_select_hyper_union(void) CHECK(ret, FAIL, "H5Fclose"); /* Free memory buffers */ - HDfree(wbuf); - HDfree(rbuf); + free(wbuf); + free(rbuf); } /* test_select_hyper_union() */ /**************************************************************** @@ -5260,7 +5260,7 @@ test_select_hyper_union_stagger(void) CHECK(error, FAIL, "H5Fclose"); /* Initialize input buffer */ - HDmemset(data_out, 0, 7 * 7 * sizeof(int)); + memset(data_out, 0, 7 * 7 * sizeof(int)); /* Open file */ file_id = H5Fopen(FILENAME, H5F_ACC_RDONLY, H5P_DEFAULT); @@ -5305,10 +5305,10 @@ test_select_hyper_union_stagger(void) /* Verify input data */ for (i = 0; i < 8; i++) { if (data[input_loc[i][0]][input_loc[i][1]] != data_out[output_loc[i][0]][output_loc[i][1]]) { - HDprintf("input data #%d is wrong!\n", i); - HDprintf("input_loc=[%d][%d]\n", input_loc[i][0], input_loc[i][1]); - HDprintf("output_loc=[%d][%d]\n", output_loc[i][0], output_loc[i][1]); - HDprintf("data=%d\n", data[input_loc[i][0]][input_loc[i][1]]); + printf("input data #%d is wrong!\n", i); + printf("input_loc=[%d][%d]\n", input_loc[i][0], input_loc[i][1]); + printf("output_loc=[%d][%d]\n", output_loc[i][0], output_loc[i][1]); + printf("data=%d\n", data[input_loc[i][0]][input_loc[i][1]]); TestErrPrintf("data_out=%d\n", data_out[output_loc[i][0]][output_loc[i][1]]); } /* end if */ } /* end for */ @@ -5383,10 +5383,10 @@ test_select_hyper_union_3d(void) MESSAGE(5, ("Testing Hyperslab Selection Functions with unions of 3-D hyperslabs\n")); /* Allocate write & read buffers */ - wbuf = (uint8_t *)HDmalloc(sizeof(uint8_t) * SPACE4_DIM1 * SPACE4_DIM2 * SPACE4_DIM3); - CHECK_PTR(wbuf, "HDmalloc"); - rbuf = (uint8_t *)HDcalloc(sizeof(uint8_t), SPACE3_DIM1 * SPACE3_DIM2); - CHECK_PTR(rbuf, "HDcalloc"); + wbuf = (uint8_t *)malloc(sizeof(uint8_t) * SPACE4_DIM1 * SPACE4_DIM2 * SPACE4_DIM3); + CHECK_PTR(wbuf, "malloc"); + rbuf = (uint8_t *)calloc(sizeof(uint8_t), SPACE3_DIM1 * SPACE3_DIM2); + CHECK_PTR(rbuf, "calloc"); /* Initialize write buffer */ for (i = 0, tbuf = wbuf; i < SPACE4_DIM1; i++) @@ -5527,8 +5527,8 @@ test_select_hyper_union_3d(void) CHECK(ret, FAIL, "H5Fclose"); /* Free memory buffers */ - HDfree(wbuf); - HDfree(rbuf); + free(wbuf); + free(rbuf); } /* test_select_hyper_union_3d() */ /**************************************************************** @@ -5558,7 +5558,7 @@ test_select_hyper_valid_combination(void) /* Output message about test being performed */ MESSAGE(6, ("Testing Selection Combination Validity\n")); - HDassert(SPACE9_DIM2 >= POINT1_NPOINTS); + assert(SPACE9_DIM2 >= POINT1_NPOINTS); /* Create dataspace for single point selection */ single_pt_sid = H5Screate_simple(SPACE9_RANK, dims2D, NULL); @@ -5707,10 +5707,10 @@ test_select_hyper_and_2d(void) MESSAGE(5, ("Testing Hyperslab Selection Functions with intersection of 2-D hyperslabs\n")); /* Allocate write & read buffers */ - wbuf = (uint8_t *)HDmalloc(sizeof(uint8_t) * SPACE2_DIM1 * SPACE2_DIM2); - CHECK_PTR(wbuf, "HDmalloc"); - rbuf = (uint8_t *)HDcalloc(sizeof(uint8_t), (size_t)(SPACE2_DIM1 * SPACE2_DIM2)); - CHECK_PTR(rbuf, "HDcalloc"); + wbuf = (uint8_t *)malloc(sizeof(uint8_t) * SPACE2_DIM1 * SPACE2_DIM2); + CHECK_PTR(wbuf, "malloc"); + rbuf = (uint8_t *)calloc(sizeof(uint8_t), (size_t)(SPACE2_DIM1 * SPACE2_DIM2)); + CHECK_PTR(rbuf, "calloc"); /* Initialize write buffer */ for (i = 0, tbuf = wbuf; i < SPACE2_DIM1; i++) @@ -5784,14 +5784,14 @@ test_select_hyper_and_2d(void) for (j = 0; j < SPACE2_DIM2; j++, tbuf++) { if ((i >= 5 && i <= 9) && (j >= 5 && j <= 9)) { if (*tbuf != *tbuf2) - HDprintf("%d: hyperslab values don't match!, i=%d, j=%d, *tbuf=%d, *tbuf2=%d\n", __LINE__, - i, j, (int)*tbuf, (int)*tbuf2); + printf("%d: hyperslab values don't match!, i=%d, j=%d, *tbuf=%d, *tbuf2=%d\n", __LINE__, + i, j, (int)*tbuf, (int)*tbuf2); tbuf2++; } /* end if */ else { if (*tbuf != 0) - HDprintf("%d: hyperslab element has wrong value!, i=%d, j=%d, *tbuf=%d\n", __LINE__, i, j, - (int)*tbuf); + printf("%d: hyperslab element has wrong value!, i=%d, j=%d, *tbuf=%d\n", __LINE__, i, j, + (int)*tbuf); } /* end else */ } /* end for */ @@ -5812,8 +5812,8 @@ test_select_hyper_and_2d(void) CHECK(ret, FAIL, "H5Fclose"); /* Free memory buffers */ - HDfree(wbuf); - HDfree(rbuf); + free(wbuf); + free(rbuf); } /* test_select_hyper_and_2d() */ /**************************************************************** @@ -5846,10 +5846,10 @@ test_select_hyper_xor_2d(void) MESSAGE(5, ("Testing Hyperslab Selection Functions with XOR of 2-D hyperslabs\n")); /* Allocate write & read buffers */ - wbuf = (uint8_t *)HDmalloc(sizeof(uint8_t) * SPACE2_DIM1 * SPACE2_DIM2); - CHECK_PTR(wbuf, "HDmalloc"); - rbuf = (uint8_t *)HDcalloc(sizeof(uint8_t), (size_t)(SPACE2_DIM1 * SPACE2_DIM2)); - CHECK_PTR(rbuf, "HDcalloc"); + wbuf = (uint8_t *)malloc(sizeof(uint8_t) * SPACE2_DIM1 * SPACE2_DIM2); + CHECK_PTR(wbuf, "malloc"); + rbuf = (uint8_t *)calloc(sizeof(uint8_t), (size_t)(SPACE2_DIM1 * SPACE2_DIM2)); + CHECK_PTR(rbuf, "calloc"); /* Initialize write buffer */ for (i = 0, tbuf = wbuf; i < SPACE2_DIM1; i++) @@ -5925,14 +5925,14 @@ test_select_hyper_xor_2d(void) ((i >= 5 && i <= 9) && ((j >= 0 && j <= 4) || (j >= 10 && j <= 14))) || ((i >= 10 && i <= 14) && (j >= 5 && j <= 14))) { if (*tbuf != *tbuf2) - HDprintf("%d: hyperslab values don't match!, i=%d, j=%d, *tbuf=%d, *tbuf2=%d\n", __LINE__, - i, j, (int)*tbuf, (int)*tbuf2); + printf("%d: hyperslab values don't match!, i=%d, j=%d, *tbuf=%d, *tbuf2=%d\n", __LINE__, + i, j, (int)*tbuf, (int)*tbuf2); tbuf2++; } /* end if */ else { if (*tbuf != 0) - HDprintf("%d: hyperslab element has wrong value!, i=%d, j=%d, *tbuf=%d\n", __LINE__, i, j, - (int)*tbuf); + printf("%d: hyperslab element has wrong value!, i=%d, j=%d, *tbuf=%d\n", __LINE__, i, j, + (int)*tbuf); } /* end else */ } /* end for */ @@ -5953,8 +5953,8 @@ test_select_hyper_xor_2d(void) CHECK(ret, FAIL, "H5Fclose"); /* Free memory buffers */ - HDfree(wbuf); - HDfree(rbuf); + free(wbuf); + free(rbuf); } /* test_select_hyper_xor_2d() */ /**************************************************************** @@ -5987,10 +5987,10 @@ test_select_hyper_notb_2d(void) MESSAGE(5, ("Testing Hyperslab Selection Functions with NOTB of 2-D hyperslabs\n")); /* Allocate write & read buffers */ - wbuf = (uint8_t *)HDmalloc(sizeof(uint8_t) * SPACE2_DIM1 * SPACE2_DIM2); - CHECK_PTR(wbuf, "HDmalloc"); - rbuf = (uint8_t *)HDcalloc(sizeof(uint8_t), (size_t)(SPACE2_DIM1 * SPACE2_DIM2)); - CHECK_PTR(rbuf, "HDcalloc"); + wbuf = (uint8_t *)malloc(sizeof(uint8_t) * SPACE2_DIM1 * SPACE2_DIM2); + CHECK_PTR(wbuf, "malloc"); + rbuf = (uint8_t *)calloc(sizeof(uint8_t), (size_t)(SPACE2_DIM1 * SPACE2_DIM2)); + CHECK_PTR(rbuf, "calloc"); /* Initialize write buffer */ for (i = 0, tbuf = wbuf; i < SPACE2_DIM1; i++) @@ -6064,14 +6064,14 @@ test_select_hyper_notb_2d(void) for (j = 0; j < SPACE2_DIM2; j++, tbuf++) { if (((i >= 0 && i <= 4) && (j >= 0 && j <= 9)) || ((i >= 5 && i <= 9) && (j >= 0 && j <= 4))) { if (*tbuf != *tbuf2) - HDprintf("%d: hyperslab values don't match!, i=%d, j=%d, *tbuf=%d, *tbuf2=%d\n", __LINE__, - i, j, (int)*tbuf, (int)*tbuf2); + printf("%d: hyperslab values don't match!, i=%d, j=%d, *tbuf=%d, *tbuf2=%d\n", __LINE__, + i, j, (int)*tbuf, (int)*tbuf2); tbuf2++; } /* end if */ else { if (*tbuf != 0) - HDprintf("%d: hyperslab element has wrong value!, i=%d, j=%d, *tbuf=%d\n", __LINE__, i, j, - (int)*tbuf); + printf("%d: hyperslab element has wrong value!, i=%d, j=%d, *tbuf=%d\n", __LINE__, i, j, + (int)*tbuf); } /* end else */ } /* end for */ @@ -6092,8 +6092,8 @@ test_select_hyper_notb_2d(void) CHECK(ret, FAIL, "H5Fclose"); /* Free memory buffers */ - HDfree(wbuf); - HDfree(rbuf); + free(wbuf); + free(rbuf); } /* test_select_hyper_notb_2d() */ /**************************************************************** @@ -6126,10 +6126,10 @@ test_select_hyper_nota_2d(void) MESSAGE(5, ("Testing Hyperslab Selection Functions with NOTA of 2-D hyperslabs\n")); /* Allocate write & read buffers */ - wbuf = (uint8_t *)HDmalloc(sizeof(uint8_t) * SPACE2_DIM1 * SPACE2_DIM2); - CHECK_PTR(wbuf, "HDmalloc"); - rbuf = (uint8_t *)HDcalloc(sizeof(uint8_t), (size_t)(SPACE2_DIM1 * SPACE2_DIM2)); - CHECK_PTR(rbuf, "HDcalloc"); + wbuf = (uint8_t *)malloc(sizeof(uint8_t) * SPACE2_DIM1 * SPACE2_DIM2); + CHECK_PTR(wbuf, "malloc"); + rbuf = (uint8_t *)calloc(sizeof(uint8_t), (size_t)(SPACE2_DIM1 * SPACE2_DIM2)); + CHECK_PTR(rbuf, "calloc"); /* Initialize write buffer */ for (i = 0, tbuf = wbuf; i < SPACE2_DIM1; i++) @@ -6232,8 +6232,8 @@ test_select_hyper_nota_2d(void) CHECK(ret, FAIL, "H5Fclose"); /* Free memory buffers */ - HDfree(wbuf); - HDfree(rbuf); + free(wbuf); + free(rbuf); } /* test_select_hyper_nota_2d() */ /**************************************************************** @@ -6251,14 +6251,14 @@ test_select_hyper_iter2(void *_elem, hid_t H5_ATTR_UNUSED type_id, unsigned ndim if (*tbuf != **tbuf2) { TestErrPrintf("Error in hyperslab iteration!\n"); - HDprintf("location: { "); + printf("location: { "); for (u = 0; u < ndim; u++) { - HDprintf("%2d", (int)point[u]); + printf("%2d", (int)point[u]); if (u < (ndim - 1)) - HDprintf(", "); + printf(", "); } /* end for */ - HDprintf("}\n"); - HDprintf("*tbuf=%d, **tbuf2=%d\n", *tbuf, **tbuf2); + printf("}\n"); + printf("*tbuf=%d, **tbuf2=%d\n", *tbuf, **tbuf2); return (-1); } /* end if */ else { @@ -6297,11 +6297,11 @@ test_select_hyper_union_random_5d(hid_t read_plist) MESSAGE(5, ("Testing Hyperslab Selection Functions with random unions of 5-D hyperslabs\n")); /* Allocate write & read buffers */ - wbuf = (int *)HDmalloc(sizeof(int) * SPACE5_DIM1 * SPACE5_DIM2 * SPACE5_DIM3 * SPACE5_DIM4 * SPACE5_DIM5); - CHECK_PTR(wbuf, "HDmalloc"); - rbuf = (int *)HDcalloc(sizeof(int), - (size_t)(SPACE5_DIM1 * SPACE5_DIM2 * SPACE5_DIM3 * SPACE5_DIM4 * SPACE5_DIM5)); - CHECK_PTR(rbuf, "HDcalloc"); + wbuf = (int *)malloc(sizeof(int) * SPACE5_DIM1 * SPACE5_DIM2 * SPACE5_DIM3 * SPACE5_DIM4 * SPACE5_DIM5); + CHECK_PTR(wbuf, "malloc"); + rbuf = (int *)calloc(sizeof(int), + (size_t)(SPACE5_DIM1 * SPACE5_DIM2 * SPACE5_DIM3 * SPACE5_DIM4 * SPACE5_DIM5)); + CHECK_PTR(rbuf, "calloc"); /* Initialize write buffer */ for (i = 0, tbuf = wbuf; i < SPACE5_DIM1; i++) @@ -6390,7 +6390,7 @@ test_select_hyper_union_random_5d(hid_t read_plist) } /* end if */ /* Set the read buffer back to all zeroes */ - HDmemset(rbuf, 0, (size_t)SPACE6_DIM1); + memset(rbuf, 0, (size_t)SPACE6_DIM1); } /* end for */ /* Close memory dataspace */ @@ -6410,8 +6410,8 @@ test_select_hyper_union_random_5d(hid_t read_plist) CHECK(ret, FAIL, "H5Fclose"); /* Free memory buffers */ - HDfree(wbuf); - HDfree(rbuf); + free(wbuf); + free(rbuf); } /* test_select_hyper_union_random_5d() */ /**************************************************************** @@ -6452,10 +6452,10 @@ test_select_hyper_chunk(hid_t fapl_plist, hid_t xfer_plist) MESSAGE(5, ("Testing Hyperslab I/O on Large Chunks\n")); /* Allocate the transfer buffers */ - data = (short *)HDmalloc(sizeof(short) * X * Y * Z); - CHECK_PTR(data, "HDmalloc"); - data_out = (short *)HDcalloc((size_t)(NX * NY * NZ), sizeof(short)); - CHECK_PTR(data_out, "HDcalloc"); + data = (short *)malloc(sizeof(short) * X * Y * Z); + CHECK_PTR(data, "malloc"); + data_out = (short *)calloc((size_t)(NX * NY * NZ), sizeof(short)); + CHECK_PTR(data_out, "calloc"); /* * Data buffer initialization. @@ -6636,8 +6636,8 @@ test_select_hyper_chunk(hid_t fapl_plist, hid_t xfer_plist) CHECK(status, FAIL, "H5Sclose"); status = H5Fclose(file); CHECK(status, FAIL, "H5Fclose"); - HDfree(data); - HDfree(data_out); + free(data); + free(data_out); } /* test_select_hyper_chunk() */ /**************************************************************** @@ -6678,10 +6678,10 @@ test_select_point_chunk(void) MESSAGE(5, ("Testing Point Selections on Chunked Datasets\n")); /* Allocate the transfer buffers */ - data = (unsigned *)HDmalloc(sizeof(unsigned) * SPACE7_DIM1 * SPACE7_DIM2); - CHECK_PTR(data, "HDmalloc"); - data_out = (unsigned *)HDcalloc((size_t)(SPACE7_DIM1 * SPACE7_DIM2), sizeof(unsigned)); - CHECK_PTR(data_out, "HDcalloc"); + data = (unsigned *)malloc(sizeof(unsigned) * SPACE7_DIM1 * SPACE7_DIM2); + CHECK_PTR(data, "malloc"); + data_out = (unsigned *)calloc((size_t)(SPACE7_DIM1 * SPACE7_DIM2), sizeof(unsigned)); + CHECK_PTR(data_out, "calloc"); /* * Data buffer initialization. @@ -6834,8 +6834,8 @@ test_select_point_chunk(void) ret = H5Fclose(file); CHECK(ret, FAIL, "H5Fclose"); - HDfree(data); - HDfree(data_out); + free(data); + free(data_out); } /* test_select_point_chunk() */ /**************************************************************** @@ -7122,7 +7122,7 @@ test_select_combine(void) VERIFY(nblocks, 1, "H5Sget_select_hyper_nblocks"); /* Retrieve the block defined */ - HDmemset(blocks, -1, sizeof(blocks)); /* Reset block list */ + memset(blocks, -1, sizeof(blocks)); /* Reset block list */ error = H5Sget_select_hyper_blocklist(space1, (hsize_t)0, (hsize_t)nblocks, (hsize_t *)blocks); CHECK(error, FAIL, "H5Sget_select_hyper_blocklist"); @@ -7157,7 +7157,7 @@ test_select_combine(void) VERIFY(nblocks, 2, "H5Sget_select_hyper_nblocks"); /* Retrieve the block defined */ - HDmemset(blocks, -1, sizeof(blocks)); /* Reset block list */ + memset(blocks, -1, sizeof(blocks)); /* Reset block list */ error = H5Sget_select_hyper_blocklist(space1, (hsize_t)0, (hsize_t)nblocks, (hsize_t *)blocks); CHECK(error, FAIL, "H5Sget_select_hyper_blocklist"); @@ -7196,7 +7196,7 @@ test_select_combine(void) VERIFY(nblocks, 2, "H5Sget_select_hyper_nblocks"); /* Retrieve the block defined */ - HDmemset(blocks, -1, sizeof(blocks)); /* Reset block list */ + memset(blocks, -1, sizeof(blocks)); /* Reset block list */ error = H5Sget_select_hyper_blocklist(space1, (hsize_t)0, (hsize_t)nblocks, (hsize_t *)blocks); CHECK(error, FAIL, "H5Sget_select_hyper_blocklist"); @@ -7255,7 +7255,7 @@ test_select_combine(void) VERIFY(nblocks, 1, "H5Sget_select_hyper_nblocks"); /* Retrieve the block defined */ - HDmemset(blocks, -1, sizeof(blocks)); /* Reset block list */ + memset(blocks, -1, sizeof(blocks)); /* Reset block list */ error = H5Sget_select_hyper_blocklist(space1, (hsize_t)0, (hsize_t)nblocks, (hsize_t *)blocks); CHECK(error, FAIL, "H5Sget_select_hyper_blocklist"); @@ -7310,7 +7310,7 @@ test_select_combine(void) VERIFY(nblocks, 1, "H5Sget_select_hyper_nblocks"); /* Retrieve the block defined */ - HDmemset(blocks, -1, sizeof(blocks)); /* Reset block list */ + memset(blocks, -1, sizeof(blocks)); /* Reset block list */ error = H5Sget_select_hyper_blocklist(space1, (hsize_t)0, (hsize_t)nblocks, (hsize_t *)blocks); CHECK(error, FAIL, "H5Sget_select_hyper_blocklist"); @@ -7365,7 +7365,7 @@ test_select_combine(void) VERIFY(nblocks, 1, "H5Sget_select_hyper_nblocks"); /* Retrieve the block defined */ - HDmemset(blocks, -1, sizeof(blocks)); /* Reset block list */ + memset(blocks, -1, sizeof(blocks)); /* Reset block list */ error = H5Sget_select_hyper_blocklist(space1, (hsize_t)0, (hsize_t)nblocks, (hsize_t *)blocks); CHECK(error, FAIL, "H5Sget_select_hyper_blocklist"); @@ -7457,8 +7457,8 @@ test_select_fill_all(void) MESSAGE(5, ("Testing Filling 'all' Selections\n")); /* Allocate memory buffer */ - wbuf = (unsigned *)HDmalloc(sizeof(unsigned) * SPACE7_DIM1 * SPACE7_DIM2); - CHECK_PTR(wbuf, "HDmalloc"); + wbuf = (unsigned *)malloc(sizeof(unsigned) * SPACE7_DIM1 * SPACE7_DIM2); + CHECK_PTR(wbuf, "malloc"); /* Initialize memory buffer */ for (u = 0, tbuf = wbuf; u < SPACE7_DIM1; u++) @@ -7505,7 +7505,7 @@ test_select_fill_all(void) CHECK(ret, FAIL, "H5Sclose"); /* Free memory buffers */ - HDfree(wbuf); + free(wbuf); } /* test_select_fill_all() */ /**************************************************************** @@ -7533,8 +7533,8 @@ test_select_fill_point(hssize_t *offset) MESSAGE(5, ("Testing Filling 'point' Selections\n")); /* Allocate memory buffer */ - wbuf = (unsigned *)HDmalloc(sizeof(unsigned) * SPACE7_DIM1 * SPACE7_DIM2); - CHECK_PTR(wbuf, "HDmalloc"); + wbuf = (unsigned *)malloc(sizeof(unsigned) * SPACE7_DIM1 * SPACE7_DIM2); + CHECK_PTR(wbuf, "malloc"); /* Initialize memory buffer */ for (u = 0, tbuf = wbuf; u < SPACE7_DIM1; u++) @@ -7550,14 +7550,14 @@ test_select_fill_point(hssize_t *offset) CHECK(ret, FAIL, "H5Sselect_elements"); if (offset != NULL) { - HDmemcpy(real_offset, offset, SPACE7_RANK * sizeof(hssize_t)); + memcpy(real_offset, offset, SPACE7_RANK * sizeof(hssize_t)); /* Set offset, if provided */ ret = H5Soffset_simple(sid1, real_offset); CHECK(ret, FAIL, "H5Soffset_simple"); } /* end if */ else - HDmemset(real_offset, 0, SPACE7_RANK * sizeof(hssize_t)); + memset(real_offset, 0, SPACE7_RANK * sizeof(hssize_t)); /* Set fill value */ fill_value = SPACE7_FILL; @@ -7603,7 +7603,7 @@ test_select_fill_point(hssize_t *offset) CHECK(ret, FAIL, "H5Sclose"); /* Free memory buffers */ - HDfree(wbuf); + free(wbuf); } /* test_select_fill_point() */ /**************************************************************** @@ -7633,8 +7633,8 @@ test_select_fill_hyper_simple(hssize_t *offset) MESSAGE(5, ("Testing Filling Simple 'hyperslab' Selections\n")); /* Allocate memory buffer */ - wbuf = (unsigned *)HDmalloc(sizeof(unsigned) * SPACE7_DIM1 * SPACE7_DIM2); - CHECK_PTR(wbuf, "HDmalloc"); + wbuf = (unsigned *)malloc(sizeof(unsigned) * SPACE7_DIM1 * SPACE7_DIM2); + CHECK_PTR(wbuf, "malloc"); /* Initialize memory buffer */ for (u = 0, tbuf = wbuf; u < SPACE7_DIM1; u++) @@ -7654,14 +7654,14 @@ test_select_fill_hyper_simple(hssize_t *offset) CHECK(ret, FAIL, "H5Sselect_hyperslab"); if (offset != NULL) { - HDmemcpy(real_offset, offset, SPACE7_RANK * sizeof(hssize_t)); + memcpy(real_offset, offset, SPACE7_RANK * sizeof(hssize_t)); /* Set offset, if provided */ ret = H5Soffset_simple(sid1, real_offset); CHECK(ret, FAIL, "H5Soffset_simple"); } /* end if */ else - HDmemset(real_offset, 0, SPACE7_RANK * sizeof(hssize_t)); + memset(real_offset, 0, SPACE7_RANK * sizeof(hssize_t)); /* Set fill value */ fill_value = SPACE7_FILL; @@ -7709,7 +7709,7 @@ test_select_fill_hyper_simple(hssize_t *offset) CHECK(ret, FAIL, "H5Sclose"); /* Free memory buffers */ - HDfree(wbuf); + free(wbuf); } /* test_select_fill_hyper_simple() */ /**************************************************************** @@ -7744,8 +7744,8 @@ test_select_fill_hyper_regular(hssize_t *offset) MESSAGE(5, ("Testing Filling Regular 'hyperslab' Selections\n")); /* Allocate memory buffer */ - wbuf = (unsigned *)HDmalloc(sizeof(unsigned) * SPACE7_DIM1 * SPACE7_DIM2); - CHECK_PTR(wbuf, "HDmalloc"); + wbuf = (unsigned *)malloc(sizeof(unsigned) * SPACE7_DIM1 * SPACE7_DIM2); + CHECK_PTR(wbuf, "malloc"); /* Initialize memory buffer */ for (u = 0, tbuf = wbuf; u < SPACE7_DIM1; u++) @@ -7769,14 +7769,14 @@ test_select_fill_hyper_regular(hssize_t *offset) CHECK(ret, FAIL, "H5Sselect_hyperslab"); if (offset != NULL) { - HDmemcpy(real_offset, offset, SPACE7_RANK * sizeof(hssize_t)); + memcpy(real_offset, offset, SPACE7_RANK * sizeof(hssize_t)); /* Set offset, if provided */ ret = H5Soffset_simple(sid1, real_offset); CHECK(ret, FAIL, "H5Soffset_simple"); } /* end if */ else - HDmemset(real_offset, 0, SPACE7_RANK * sizeof(hssize_t)); + memset(real_offset, 0, SPACE7_RANK * sizeof(hssize_t)); /* Set fill value */ fill_value = SPACE7_FILL; @@ -7822,7 +7822,7 @@ test_select_fill_hyper_regular(hssize_t *offset) CHECK(ret, FAIL, "H5Sclose"); /* Free memory buffers */ - HDfree(wbuf); + free(wbuf); } /* test_select_fill_hyper_regular() */ /**************************************************************** @@ -7864,8 +7864,8 @@ test_select_fill_hyper_irregular(hssize_t *offset) MESSAGE(5, ("Testing Filling Irregular 'hyperslab' Selections\n")); /* Allocate memory buffer */ - wbuf = (unsigned *)HDmalloc(sizeof(unsigned) * SPACE7_DIM1 * SPACE7_DIM2); - CHECK_PTR(wbuf, "HDmalloc"); + wbuf = (unsigned *)malloc(sizeof(unsigned) * SPACE7_DIM1 * SPACE7_DIM2); + CHECK_PTR(wbuf, "malloc"); /* Initialize memory buffer */ for (u = 0, tbuf = wbuf; u < SPACE7_DIM1; u++) @@ -7893,14 +7893,14 @@ test_select_fill_hyper_irregular(hssize_t *offset) CHECK(ret, FAIL, "H5Sselect_hyperslab"); if (offset != NULL) { - HDmemcpy(real_offset, offset, SPACE7_RANK * sizeof(hssize_t)); + memcpy(real_offset, offset, SPACE7_RANK * sizeof(hssize_t)); /* Set offset, if provided */ ret = H5Soffset_simple(sid1, real_offset); CHECK(ret, FAIL, "H5Soffset_simple"); } /* end if */ else - HDmemset(real_offset, 0, SPACE7_RANK * sizeof(hssize_t)); + memset(real_offset, 0, SPACE7_RANK * sizeof(hssize_t)); /* Set fill value */ fill_value = SPACE7_FILL; @@ -7946,7 +7946,7 @@ test_select_fill_hyper_irregular(hssize_t *offset) CHECK(ret, FAIL, "H5Sclose"); /* Free memory buffers */ - HDfree(wbuf); + free(wbuf); } /* test_select_fill_hyper_irregular() */ /**************************************************************** @@ -7973,10 +7973,10 @@ test_select_none(void) MESSAGE(5, ("Testing I/O on 0-sized Selections\n")); /* Allocate write & read buffers */ - wbuf = (uint8_t *)HDmalloc(sizeof(uint8_t) * SPACE7_DIM1 * SPACE7_DIM2); - CHECK_PTR(wbuf, "HDmalloc"); - rbuf = (uint8_t *)HDcalloc(sizeof(uint8_t), SPACE7_DIM1 * SPACE7_DIM2); - CHECK_PTR(rbuf, "HDcalloc"); + wbuf = (uint8_t *)malloc(sizeof(uint8_t) * SPACE7_DIM1 * SPACE7_DIM2); + CHECK_PTR(wbuf, "malloc"); + rbuf = (uint8_t *)calloc(sizeof(uint8_t), SPACE7_DIM1 * SPACE7_DIM2); + CHECK_PTR(rbuf, "calloc"); /* Initialize write buffer */ for (i = 0, tbuf = wbuf; i < SPACE7_DIM1; i++) @@ -8043,8 +8043,8 @@ test_select_none(void) CHECK(ret, FAIL, "H5Fclose"); /* Free memory buffers */ - HDfree(wbuf); - HDfree(rbuf); + free(wbuf); + free(rbuf); } /* test_select_none() */ /**************************************************************** @@ -8076,10 +8076,10 @@ test_scalar_select(void) MESSAGE(5, ("Testing I/O on Selections in Scalar Dataspaces\n")); /* Allocate write & read buffers */ - wbuf_uint8 = (uint8_t *)HDmalloc(sizeof(uint8_t) * SPACE7_DIM1 * SPACE7_DIM2); - CHECK_PTR(wbuf_uint8, "HDmalloc"); - wbuf_ushort = (unsigned short *)HDmalloc(sizeof(unsigned short) * SPACE7_DIM1 * SPACE7_DIM2); - CHECK_PTR(wbuf_ushort, "HDmalloc"); + wbuf_uint8 = (uint8_t *)malloc(sizeof(uint8_t) * SPACE7_DIM1 * SPACE7_DIM2); + CHECK_PTR(wbuf_uint8, "malloc"); + wbuf_ushort = (unsigned short *)malloc(sizeof(unsigned short) * SPACE7_DIM1 * SPACE7_DIM2); + CHECK_PTR(wbuf_ushort, "malloc"); /* Initialize write buffers */ for (i = 0, tbuf_uint8 = wbuf_uint8, tbuf_ushort = wbuf_ushort; i < SPACE7_DIM1; i++) @@ -8202,8 +8202,8 @@ test_scalar_select(void) CHECK(ret, FAIL, "H5Fclose"); /* Free memory buffers */ - HDfree(wbuf_uint8); - HDfree(wbuf_ushort); + free(wbuf_uint8); + free(wbuf_ushort); } /* test_scalar_select() */ /**************************************************************** @@ -8448,7 +8448,7 @@ test_shape_same(void) /* Output message about test being performed */ MESSAGE(6, ("Testing Same Shape Comparisons\n")); - HDassert(SPACE9_DIM2 >= POINT1_NPOINTS); + assert(SPACE9_DIM2 >= POINT1_NPOINTS); /* Create dataspace for "all" selection */ all_sid = H5Screate_simple(SPACE9_RANK, dims, NULL); @@ -10901,13 +10901,13 @@ test_shape_same_dr__full_space_vs_slice(int test_num, int small_rank, int large_ htri_t check; /* Shape comparison return value */ herr_t ret; /* Generic return value */ - HDassert(0 < small_rank); - HDassert(small_rank <= large_rank); - HDassert(large_rank <= SS_DR_MAX_RANK); - HDassert(0 <= offset); - HDassert(offset < large_rank); - HDassert(edge_size > 0); - HDassert(edge_size <= 1000); + assert(0 < small_rank); + assert(small_rank <= large_rank); + assert(large_rank <= SS_DR_MAX_RANK); + assert(0 <= offset); + assert(offset < large_rank); + assert(edge_size > 0); + assert(edge_size <= 1000); HDsnprintf(test_desc_0, sizeof(test_desc_0), "\tn-cube slice through m-cube (n <= m) test %d.\n", test_num); @@ -10959,7 +10959,7 @@ test_shape_same_dr__full_space_vs_slice(int test_num, int small_rank, int large_ */ i = SS_DR_MAX_RANK - large_rank; - HDassert(i >= 0); + assert(i >= 0); start_ptr = &(start[i]); stride_ptr = &(stride[i]); @@ -11153,21 +11153,21 @@ test_shape_same_dr__checkerboard(int test_num, int small_rank, int large_rank, i htri_t check; /* Shape comparison return value */ herr_t ret; /* Generic return value */ - HDassert(0 < small_rank); - HDassert(small_rank <= large_rank); - HDassert(large_rank <= SS_DR_MAX_RANK); - HDassert(0 < checker_size); - HDassert(checker_size <= edge_size); - HDassert(edge_size <= 1000); - HDassert(0 <= offset); - HDassert(offset < (int)edge_size); + assert(0 < small_rank); + assert(small_rank <= large_rank); + assert(large_rank <= SS_DR_MAX_RANK); + assert(0 < checker_size); + assert(checker_size <= edge_size); + assert(edge_size <= 1000); + assert(0 <= offset); + assert(offset < (int)edge_size); for (i = SS_DR_MAX_RANK - large_rank; i < SS_DR_MAX_RANK; i++) if (dim_selected[i] == TRUE) dims_selected++; - HDassert(dims_selected >= 0); - HDassert(dims_selected <= large_rank); + assert(dims_selected >= 0); + assert(dims_selected <= large_rank); HDsnprintf(test_desc_0, sizeof(test_desc_0), "\tcheckerboard n-cube slice through m-cube (n <= m) test %d.\n", test_num); @@ -11356,7 +11356,7 @@ test_shape_same_dr__checkerboard(int test_num, int small_rank, int large_rank, i */ i = SS_DR_MAX_RANK - large_rank; - HDassert(i >= 0); + assert(i >= 0); start_ptr = &(start[i]); stride_ptr = &(stride[i]); @@ -11697,22 +11697,22 @@ test_shape_same_dr__irregular(int test_num, int small_rank, int large_rank, int htri_t check; /* Shape comparison return value */ herr_t ret; /* Generic return value */ - HDassert(0 < small_rank); - HDassert(small_rank <= large_rank); - HDassert(large_rank <= SS_DR_MAX_RANK); - HDassert(9 <= edge_size); - HDassert(edge_size <= 1000); - HDassert(0 <= slice_offset); - HDassert(slice_offset < edge_size); - HDassert(-2 <= pattern_offset); - HDassert(pattern_offset <= 2); + assert(0 < small_rank); + assert(small_rank <= large_rank); + assert(large_rank <= SS_DR_MAX_RANK); + assert(9 <= edge_size); + assert(edge_size <= 1000); + assert(0 <= slice_offset); + assert(slice_offset < edge_size); + assert(-2 <= pattern_offset); + assert(pattern_offset <= 2); for (i = SS_DR_MAX_RANK - large_rank; i < SS_DR_MAX_RANK; i++) if (dim_selected[i] == TRUE) dims_selected++; - HDassert(dims_selected >= 0); - HDassert(dims_selected <= large_rank); + assert(dims_selected >= 0); + assert(dims_selected <= large_rank); HDsnprintf(test_desc_0, sizeof(test_desc_0), "\tirregular sub set of n-cube slice through m-cube (n <= m) test %d.\n", test_num); @@ -11810,7 +11810,7 @@ test_shape_same_dr__irregular(int test_num, int small_rank, int large_rank, int */ i = SS_DR_MAX_RANK - large_rank; - HDassert(i >= 0); + assert(i >= 0); start_ptr = &(start[i]); stride_ptr = &(stride[i]); @@ -13560,10 +13560,10 @@ test_select_hyper_chunk_offset(void) MESSAGE(6, ("Testing hyperslab selections using offsets in chunked datasets\n")); /* Allocate buffers */ - wbuf = (int *)HDmalloc(sizeof(int) * SPACE10_DIM1); - CHECK_PTR(wbuf, "HDmalloc"); - rbuf = (int *)HDcalloc(sizeof(int), SPACE10_DIM1); - CHECK_PTR(rbuf, "HDcalloc"); + wbuf = (int *)malloc(sizeof(int) * SPACE10_DIM1); + CHECK_PTR(wbuf, "malloc"); + rbuf = (int *)calloc(sizeof(int), SPACE10_DIM1); + CHECK_PTR(rbuf, "calloc"); /* Initialize the write buffer */ for (i = 0; i < SPACE10_DIM1; i++) @@ -13743,8 +13743,8 @@ test_select_hyper_chunk_offset(void) CHECK(ret, FAIL, "H5Fclose"); /* Free the buffers */ - HDfree(wbuf); - HDfree(rbuf); + free(wbuf); + free(rbuf); } /* test_select_hyper_chunk_offset() */ /**************************************************************** @@ -14294,14 +14294,14 @@ test_hyper_unlim_check(hid_t sid, hsize_t *dims, hssize_t endpoints, hssize_t en hsize_t blocklist[12]; herr_t ret; - HDassert(enblocks <= 2); + assert(enblocks <= 2); /* Copy sid to lim_sid */ lim_sid = H5Scopy(sid); CHECK(lim_sid, FAIL, "H5Scopy"); /* "And" lim_sid with dims to create limited selection */ - HDmemset(start, 0, sizeof(start)); + memset(start, 0, sizeof(start)); ret = H5Sselect_hyperslab(lim_sid, H5S_SELECT_AND, start, NULL, dims, NULL); CHECK(ret, FAIL, "H5Sselect_hyperslab"); @@ -14328,18 +14328,18 @@ test_hyper_unlim_check(hid_t sid, hsize_t *dims, hssize_t endpoints, hssize_t en /* Verify blocklist */ if (nblocks == (hssize_t)1) { - if (HDmemcmp(blocklist, eblock1, 6 * sizeof(eblock1[0])) != 0) + if (memcmp(blocklist, eblock1, 6 * sizeof(eblock1[0])) != 0) ERROR("H5Sget_select_hyper_blocklist"); } /* end if */ else { - HDassert(nblocks == (hssize_t)2); - if (HDmemcmp(blocklist, eblock1, 6 * sizeof(eblock1[0])) != 0) { - if (HDmemcmp(blocklist, eblock2, 6 * sizeof(eblock2[0])) != 0) + assert(nblocks == (hssize_t)2); + if (memcmp(blocklist, eblock1, 6 * sizeof(eblock1[0])) != 0) { + if (memcmp(blocklist, eblock2, 6 * sizeof(eblock2[0])) != 0) ERROR("H5Sget_select_hyper_blocklist"); - if (HDmemcmp(&blocklist[6], eblock1, 6 * sizeof(eblock1[0])) != 0) + if (memcmp(&blocklist[6], eblock1, 6 * sizeof(eblock1[0])) != 0) ERROR("H5Sget_select_hyper_blocklist"); } /* end if */ - else if (HDmemcmp(&blocklist[6], eblock2, 6 * sizeof(eblock2[0])) != 0) + else if (memcmp(&blocklist[6], eblock2, 6 * sizeof(eblock2[0])) != 0) ERROR("H5Sget_select_hyper_blocklist"); } /* end else */ } /* end if */ @@ -14760,7 +14760,7 @@ test_internal_consistency(void) /* Output message about test being performed */ MESSAGE(6, ("Testing Consistency of Internal States\n")); - HDassert(SPACE9_DIM2 >= POINT1_NPOINTS); + assert(SPACE9_DIM2 >= POINT1_NPOINTS); /* Create dataspace for "all" selection */ all_sid = H5Screate_simple(SPACE9_RANK, dims, NULL); @@ -15108,7 +15108,7 @@ test_irreg_io(void) CHECK(ret, FAIL, "H5Sselect_hyperslab"); /* Reset the buffer */ - HDmemset(rbuf, 0, sizeof(rbuf)); + memset(rbuf, 0, sizeof(rbuf)); /* Read selection from disk */ ret = H5Dread(did, H5T_NATIVE_UCHAR, mem_sid, sid, H5P_DEFAULT, rbuf); @@ -15326,7 +15326,7 @@ test_sel_iter(void) case H5S_SEL_ERROR: case H5S_SEL_N: default: - HDassert(0 && "Can't occur"); + assert(0 && "Can't occur"); break; } /* end switch */ @@ -15374,7 +15374,7 @@ test_sel_iter(void) case H5S_SEL_ERROR: case H5S_SEL_N: default: - HDassert(0 && "Can't occur"); + assert(0 && "Can't occur"); break; } /* end switch */ @@ -15445,7 +15445,7 @@ test_sel_iter(void) case H5S_SEL_ERROR: case H5S_SEL_N: default: - HDassert(0 && "Can't occur"); + assert(0 && "Can't occur"); break; } /* end switch */ @@ -15493,7 +15493,7 @@ test_sel_iter(void) case H5S_SEL_ERROR: case H5S_SEL_N: default: - HDassert(0 && "Can't occur"); + assert(0 && "Can't occur"); break; } /* end switch */ @@ -15531,7 +15531,7 @@ test_sel_iter(void) case H5S_SEL_ERROR: case H5S_SEL_N: default: - HDassert(0 && "Can't occur"); + assert(0 && "Can't occur"); break; } /* end switch */ diff --git a/test/tskiplist.c b/test/tskiplist.c index 1d01839..0b8c1f6 100644 --- a/test/tskiplist.c +++ b/test/tskiplist.c @@ -66,12 +66,12 @@ test_skiplist_init(void) size_t u, v; /* Local index variables */ /* Allocate arrays */ - rand_num = (int *)HDmalloc(sizeof(int) * NUM_ELEMS); - CHECK_PTR(rand_num, "HDmalloc"); - sort_rand_num = (int *)HDmalloc(sizeof(int) * NUM_ELEMS); - CHECK_PTR(sort_rand_num, "HDmalloc"); - rev_sort_rand_num = (int *)HDmalloc(sizeof(int) * NUM_ELEMS); - CHECK_PTR(rev_sort_rand_num, "HDmalloc"); + rand_num = (int *)malloc(sizeof(int) * NUM_ELEMS); + CHECK_PTR(rand_num, "malloc"); + sort_rand_num = (int *)malloc(sizeof(int) * NUM_ELEMS); + CHECK_PTR(sort_rand_num, "malloc"); + rev_sort_rand_num = (int *)malloc(sizeof(int) * NUM_ELEMS); + CHECK_PTR(rev_sort_rand_num, "malloc"); /* Initialize random number seed */ curr_time = HDtime(NULL); @@ -97,13 +97,13 @@ test_skiplist_init(void) } /* end for */ /* Copy random values to sorted array */ - HDmemcpy(sort_rand_num, rand_num, sizeof(int) * NUM_ELEMS); + memcpy(sort_rand_num, rand_num, sizeof(int) * NUM_ELEMS); /* Sort random numbers */ HDqsort(sort_rand_num, (size_t)NUM_ELEMS, sizeof(int), tst_sort); /* Copy random values to reverse sorted array */ - HDmemcpy(rev_sort_rand_num, rand_num, sizeof(int) * NUM_ELEMS); + memcpy(rev_sort_rand_num, rand_num, sizeof(int) * NUM_ELEMS); /* Sort random numbers */ HDqsort(rev_sort_rand_num, (size_t)NUM_ELEMS, sizeof(int), tst_rev_sort); @@ -1549,11 +1549,11 @@ test_skiplist_term(void) { /* Release arrays */ if (rand_num) - HDfree(rand_num); + free(rand_num); if (sort_rand_num) - HDfree(sort_rand_num); + free(sort_rand_num); if (rev_sort_rand_num) - HDfree(rev_sort_rand_num); + free(rev_sort_rand_num); } /* end test_skiplist_term() */ /**************************************************************** diff --git a/test/tsohm.c b/test/tsohm.c index 7d9964f..2e82d51 100644 --- a/test/tsohm.c +++ b/test/tsohm.c @@ -610,17 +610,17 @@ size1_helper(hid_t file, const char *filename, hid_t fapl_id, hbool_t test_file_ */ #define TSOHM_S1H_VERIFY_DATA(dset_id, dtype_id) \ { \ - HDmemset(&rdata, 0, sizeof(rdata)); \ + memset(&rdata, 0, sizeof(rdata)); \ if (0 > H5Dread((dset_id), (dtype_id), H5S_ALL, H5S_ALL, H5P_DEFAULT, &rdata)) { \ H5_FAILED(); \ AT(); \ - HDprintf("Can't read data\n"); \ + printf("Can't read data\n"); \ goto error; \ } \ if ((rdata.i1 != wdata.i1) || (rdata.i2 != wdata.i2) || HDstrcmp(rdata.str, wdata.str) != 0) { \ H5_FAILED(); \ AT(); \ - HDprintf("incorrect read data\n"); \ + printf("incorrect read data\n"); \ goto error; \ } \ } /* TSOHM_S1H_VERIFY_DATA() definition */ @@ -632,7 +632,7 @@ size1_helper(hid_t file, const char *filename, hid_t fapl_id, hbool_t test_file_ test_file_closing = FALSE; /* Initialize wdata */ - HDmemset(&wdata, 0, sizeof(wdata)); + memset(&wdata, 0, sizeof(wdata)); wdata.i1 = 11; HDstrcpy(wdata.str, "string"); wdata.i2 = 22; @@ -645,7 +645,7 @@ size1_helper(hid_t file, const char *filename, hid_t fapl_id, hbool_t test_file_ wdata.f1 = 0.0F; /* Initialize rdata */ - HDmemset(&rdata, 0, sizeof(rdata)); + memset(&rdata, 0, sizeof(rdata)); dtype1_id = make_dtype_1(); if (dtype1_id < 0) @@ -1169,7 +1169,7 @@ sohm_attr_helper(hid_t fcpl_id) /* Verify */ attr_read_id = (op_index == 2) ? attr_id2 : attr_id; - HDmemset(rdata, 0, sizeof(rdata)); + memset(rdata, 0, sizeof(rdata)); ret = H5Aread(attr_read_id, H5T_NATIVE_INT, rdata); CHECK_I(ret, "H5Aread"); for (x = 0; x < (size_t)dims; ++x) @@ -1422,12 +1422,12 @@ size2_verify_plist1(hid_t plist) /* Check fill value */ dtype1_id = make_dtype_1(); CHECK_I(dtype1_id, "make_dtype_1"); - HDmemset(&fill1_correct, '1', sizeof(fill1_correct)); + memset(&fill1_correct, '1', sizeof(fill1_correct)); ret = H5Pget_fill_value(plist, dtype1_id, &fill1); CHECK_I(ret, "H5Pget_fill_value"); - ret = HDmemcmp(&fill1, &fill1_correct, sizeof(fill1_correct)); + ret = memcmp(&fill1, &fill1_correct, sizeof(fill1_correct)); VERIFY(ret, 0, "memcmp"); ret = H5Tclose(dtype1_id); @@ -1493,12 +1493,12 @@ size2_verify_plist2(hid_t plist) /* Check fill value */ dtype2_id = make_dtype_2(); CHECK_I(dtype2_id, "make_dtype_2"); - HDmemset(&fill2_correct, '2', (size_t)DTYPE2_SIZE); + memset(&fill2_correct, '2', (size_t)DTYPE2_SIZE); ret = H5Pget_fill_value(plist, dtype2_id, &fill2); CHECK_I(ret, "H5Pget_fill_value"); - ret = HDmemcmp(&fill2, &fill2_correct, (size_t)DTYPE2_SIZE); + ret = memcmp(&fill2, &fill2_correct, (size_t)DTYPE2_SIZE); VERIFY(ret, 0, "memcmp"); ret = H5Tclose(dtype2_id); @@ -1523,21 +1523,21 @@ static void size2_dump_struct(const char *name, size2_helper_struct *sizes) { HDputs(name); - HDprintf(" empty size: %llu\n", (unsigned long long)sizes->empty_size); - HDprintf(" first dataset: %llu \tdelta: %llu\n", (unsigned long long)sizes->first_dset, - (unsigned long long)(sizes->first_dset - sizes->empty_size)); - HDprintf("second dataset: %llu \tdelta: %llu\n", (unsigned long long)sizes->second_dset, - (unsigned long long)(sizes->second_dset - sizes->first_dset)); - HDprintf(" dsets 1: %llu \tdelta: %llu\n", (unsigned long long)sizes->dsets1, - (unsigned long long)(sizes->dsets1 - sizes->second_dset)); - HDprintf(" dsets 2: %llu \tdelta: %llu\n", (unsigned long long)sizes->dsets2, - (unsigned long long)(sizes->dsets2 - sizes->dsets1)); - HDprintf(" interleaved: %llu \tdelta: %llu\n", (unsigned long long)sizes->interleaved, - (unsigned long long)(sizes->interleaved - sizes->dsets2)); - HDprintf(" attributes: %llu \tdelta: %llu\n", (unsigned long long)sizes->attrs1, - (unsigned long long)(sizes->attrs1 - sizes->interleaved)); - HDprintf(" attributes 2: %llu \tdelta: %llu\n", (unsigned long long)sizes->attrs2, - (unsigned long long)(sizes->attrs2 - sizes->attrs1)); + printf(" empty size: %llu\n", (unsigned long long)sizes->empty_size); + printf(" first dataset: %llu \tdelta: %llu\n", (unsigned long long)sizes->first_dset, + (unsigned long long)(sizes->first_dset - sizes->empty_size)); + printf("second dataset: %llu \tdelta: %llu\n", (unsigned long long)sizes->second_dset, + (unsigned long long)(sizes->second_dset - sizes->first_dset)); + printf(" dsets 1: %llu \tdelta: %llu\n", (unsigned long long)sizes->dsets1, + (unsigned long long)(sizes->dsets1 - sizes->second_dset)); + printf(" dsets 2: %llu \tdelta: %llu\n", (unsigned long long)sizes->dsets2, + (unsigned long long)(sizes->dsets2 - sizes->dsets1)); + printf(" interleaved: %llu \tdelta: %llu\n", (unsigned long long)sizes->interleaved, + (unsigned long long)(sizes->interleaved - sizes->dsets2)); + printf(" attributes: %llu \tdelta: %llu\n", (unsigned long long)sizes->attrs1, + (unsigned long long)(sizes->attrs1 - sizes->interleaved)); + printf(" attributes 2: %llu \tdelta: %llu\n", (unsigned long long)sizes->attrs2, + (unsigned long long)(sizes->attrs2 - sizes->attrs1)); } /* size2_dump_struct */ #endif /* NOT_NOW */ @@ -1624,8 +1624,8 @@ size2_helper(hid_t fcpl_id, int test_file_closing, size2_helper_struct *ret_size /* fill1 and fill2 are fill values for the two datatypes. * We'll set them in the DCPL. */ - HDmemset(&fill1, '1', sizeof(dtype1_struct)); - HDmemset(&fill2, '2', (size_t)DTYPE2_SIZE); + memset(&fill1, '1', sizeof(dtype1_struct)); + memset(&fill2, '2', (size_t)DTYPE2_SIZE); dcpl1_id = H5Pcreate(H5P_DATASET_CREATE); CHECK_I(dcpl1_id, "H5Pcreate"); @@ -1668,8 +1668,8 @@ size2_helper(hid_t fcpl_id, int test_file_closing, size2_helper_struct *ret_size size2_verify_plist2(dcpl2_id); /* Set up attribute data */ - HDmemset(attr_string1, 0, (size_t)NAME_BUF_SIZE); - HDmemset(attr_string2, 0, (size_t)NAME_BUF_SIZE); + memset(attr_string1, 0, (size_t)NAME_BUF_SIZE); + memset(attr_string2, 0, (size_t)NAME_BUF_SIZE); HDstrcpy(attr_string1, LONG_STRING); HDstrcpy(attr_string2, LONG_STRING); attr_string2[1] = '1'; /* The second string starts "01 index..." */ @@ -2078,8 +2078,8 @@ size2_verify(void) group2_id = H5Gopen2(file_id, "interleaved group", H5P_DEFAULT); CHECK_I(group2_id, "H5Gopen2"); - HDmemset(attr_string, 0, (size_t)NAME_BUF_SIZE); - HDmemset(attr_correct_string, 0, (size_t)NAME_BUF_SIZE); + memset(attr_string, 0, (size_t)NAME_BUF_SIZE); + memset(attr_correct_string, 0, (size_t)NAME_BUF_SIZE); HDstrcpy(attr_correct_string, LONG_STRING); HDstrcpy(attr_name, "00 index"); @@ -3278,7 +3278,7 @@ test_sohm_extlink(void) CHECK_I(ret, "h5_driver_is_default_vfd_compatible"); if (!driver_is_default_compatible) { - HDprintf("-- SKIPPED --\n"); + printf("-- SKIPPED --\n"); return; } @@ -3717,9 +3717,9 @@ test_sohm_external_dtype(void) CHECK_I(dset1_tid, "H5Dget_type"); /* Allocate space and initialize data */ - orig = (s1_t *)HDmalloc(NX * NY * sizeof(s1_t)); + orig = (s1_t *)malloc(NX * NY * sizeof(s1_t)); if (orig == NULL) - CHECK_I(-1, "HDmalloc"); + CHECK_I(-1, "malloc"); for (i = 0; i < NX * NY; i++) { s_ptr = (s1_t *)orig + i; s_ptr->a = (int)(i * 3 + 1); @@ -3782,7 +3782,7 @@ test_sohm_external_dtype(void) CHECK_I(ret, "H5Pclose"); ret = H5Fclose(file2); CHECK_I(ret, "H5Fclose"); - HDfree(orig); + free(orig); } /* test_sohm_external_dtype */ /**************************************************************** diff --git a/test/ttime.c b/test/ttime.c index 81c5015..bd31873 100644 --- a/test/ttime.c +++ b/test/ttime.c @@ -176,13 +176,13 @@ test_time_io(void) tid = H5Dget_type(dsid); CHECK(tid, FAIL, "H5Dget_type"); if (H5Tget_class(tid) == H5T_TIME) - HDfprintf(stderr, "datatype class is H5T_TIME\n"); + fprintf(stderr, "datatype class is H5T_TIME\n"); status = H5Tclose(tid); CHECK(status, FAIL, "H5Tclose"); status = H5Dread(dsid, H5T_UNIX_D32LE, H5S_ALL, H5S_ALL, H5P_DEFAULT, &timethen); CHECK(status, FAIL, "H5Dread"); - HDfprintf(stderr, "time written was: %s\n", HDctime(&timethen)); + fprintf(stderr, "time written was: %s\n", HDctime(&timethen)); status = H5Dclose(dsid); CHECK(status, FAIL, "H5Dclose"); diff --git a/test/ttsafe.c b/test/ttsafe.c index 761a3b3..2f792f5 100644 --- a/test/ttsafe.c +++ b/test/ttsafe.c @@ -80,7 +80,7 @@ gen_name(int value) int i; length = num_digits(MAX_NUM_NAME - 1); - temp = (char *)HDmalloc(NAME_OFFSET + length + 1); + temp = (char *)malloc(NAME_OFFSET + length + 1); temp = HDstrcpy(temp, "attrib"); temp[NAME_OFFSET + length] = '\0'; @@ -113,7 +113,7 @@ main(int argc, char *argv[]) #else /* H5_HAVE_THREADSAFE */ - HDprintf("Most thread-safety tests skipped because THREADSAFE not enabled\n"); + printf("Most thread-safety tests skipped because THREADSAFE not enabled\n"); #endif /* H5_HAVE_THREADSAFE */ diff --git a/test/ttsafe_acreate.c b/test/ttsafe_acreate.c index fb84c6e..84105e8 100644 --- a/test/ttsafe_acreate.c +++ b/test/ttsafe_acreate.c @@ -100,7 +100,7 @@ tts_acreate(void) * with the dataset */ for (i = 0; i < NUM_THREADS; i++) { - attrib_data = (ttsafe_name_data_t *)HDmalloc(sizeof(ttsafe_name_data_t)); + attrib_data = (ttsafe_name_data_t *)malloc(sizeof(ttsafe_name_data_t)); attrib_data->dataset = dataset; attrib_data->datatype = datatype; attrib_data->dataspace = dataspace; @@ -158,7 +158,7 @@ tts_acreate_thread(void *client_data) CHECK(attribute, H5I_INVALID_HID, "H5Acreate2"); /* Write data to the attribute */ - attribute_data = (int *)HDmalloc(sizeof(int)); + attribute_data = (int *)malloc(sizeof(int)); *attribute_data = attrib_data->current_index; status = H5Awrite(attribute, H5T_NATIVE_INT, attribute_data); CHECK(status, FAIL, "H5Awrite"); diff --git a/test/ttsafe_cancel.c b/test/ttsafe_cancel.c index 0323d5f..22e2cb3 100644 --- a/test/ttsafe_cancel.c +++ b/test/ttsafe_cancel.c @@ -64,46 +64,46 @@ tts_cancel(void) /* make thread scheduling global */ ret = pthread_attr_init(&attribute); - HDassert(ret == 0); + assert(ret == 0); #ifdef H5_HAVE_SYSTEM_SCOPE_THREADS ret = pthread_attr_setscope(&attribute, PTHREAD_SCOPE_SYSTEM); - HDassert(ret == 0); + assert(ret == 0); #endif /* H5_HAVE_SYSTEM_SCOPE_THREADS */ /* Initialize mutex & condition variables */ ret = pthread_mutex_init(&mutex, NULL); - HDassert(ret == 0); + assert(ret == 0); ret = pthread_cond_init(&cond, NULL); - HDassert(ret == 0); + assert(ret == 0); /* * Create a hdf5 file using H5F_ACC_TRUNC access, default file * creation plist and default file access plist */ cancel_file = H5Fcreate(FILENAME, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT); - HDassert(cancel_file >= 0); + assert(cancel_file >= 0); ret = pthread_create(&childthread, &attribute, tts_cancel_thread, NULL); - HDassert(ret == 0); + assert(ret == 0); tts_cancel_barrier(); ret = pthread_cancel(childthread); - HDassert(ret == 0); + assert(ret == 0); dataset = H5Dopen2(cancel_file, DATASETNAME, H5P_DEFAULT); - HDassert(dataset >= 0); + assert(dataset >= 0); ret = H5Dread(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, &buffer); - HDassert(ret >= 0); + assert(ret >= 0); if (buffer != 11) TestErrPrintf("operation unsuccessful with value at %d instead of 11\n", buffer); ret = H5Dclose(dataset); - HDassert(ret >= 0); + assert(ret >= 0); ret = H5Fclose(cancel_file); - HDassert(ret >= 0); + assert(ret >= 0); /* Destroy the thread attribute */ ret = pthread_attr_destroy(&attribute); - HDassert(ret == 0); + assert(ret == 0); } /* end tts_cancel() */ void * @@ -135,7 +135,7 @@ tts_cancel_thread(void H5_ATTR_UNUSED *arg) CHECK(dataset, H5I_INVALID_HID, "H5Dcreate2"); /* If thread is cancelled, make cleanup call */ - cleanup_structure = (cancel_cleanup_t *)HDmalloc(sizeof(cancel_cleanup_t)); + cleanup_structure = (cancel_cleanup_t *)malloc(sizeof(cancel_cleanup_t)); cleanup_structure->dataset = dataset; cleanup_structure->datatype = datatype; cleanup_structure->dataspace = dataspace; diff --git a/test/ttsafe_dcreate.c b/test/ttsafe_dcreate.c index 181e582..bff63fc 100644 --- a/test/ttsafe_dcreate.c +++ b/test/ttsafe_dcreate.c @@ -139,7 +139,7 @@ tts_dcreate_creator(void *_thread_data) hsize_t dimsf[1]; /* dataset dimensions */ struct thread_info thread_data; - HDmemcpy(&thread_data, _thread_data, sizeof(struct thread_info)); + memcpy(&thread_data, _thread_data, sizeof(struct thread_info)); /* define dataspace for dataset */ dimsf[0] = 1; diff --git a/test/ttsafe_error.c b/test/ttsafe_error.c index 8e01c66..5cc408b 100644 --- a/test/ttsafe_error.c +++ b/test/ttsafe_error.c @@ -136,7 +136,7 @@ tts_error(void) if (error_flag_g) { TestErrPrintf( "At least one thread reported a value that was different from the expected value\n"); - HDprintf( + printf( "(Update the expected_g[] array in tts_error for this test if the error stack changed!)\n"); } @@ -158,7 +158,7 @@ tts_error(void) CHECK(status, FAIL, "H5Fclose"); } /* end if */ else - HDprintf("Non-native VOL connector used, skipping test\n"); + printf("Non-native VOL connector used, skipping test\n"); status = H5Idec_ref(vol_id); CHECK(status, FAIL, "H5Idec_ref"); @@ -245,15 +245,15 @@ walk_error_callback(unsigned n, const H5E_error2_t *err_desc, void H5_ATTR_UNUSE } /* Unexpected error stack entry, print some info and set flag */ - HDfprintf(stderr, "Unexpected error stack entry!\n"); - HDfprintf(stderr, "Stack entry: %d\n", n); - HDfprintf(stderr, - "Actual: maj_num = %" PRIxHID ", min_num = %" PRIxHID - ", line = %u, func = '%s', file = '%s', desc = '%s'\n", - err_desc->maj_num, err_desc->min_num, err_desc->line, err_desc->func_name, err_desc->file_name, - err_desc->desc); - HDfprintf(stderr, "Expected: maj_num = %" PRIxHID ", min_num = %" PRIxHID "\n", expected_g[n].maj_num, - expected_g[n].min_num); + fprintf(stderr, "Unexpected error stack entry!\n"); + fprintf(stderr, "Stack entry: %d\n", n); + fprintf(stderr, + "Actual: maj_num = %" PRIxHID ", min_num = %" PRIxHID + ", line = %u, func = '%s', file = '%s', desc = '%s'\n", + err_desc->maj_num, err_desc->min_num, err_desc->line, err_desc->func_name, err_desc->file_name, + err_desc->desc); + fprintf(stderr, "Expected: maj_num = %" PRIxHID ", min_num = %" PRIxHID "\n", expected_g[n].maj_num, + expected_g[n].min_num); error_flag_g = -1; return SUCCEED; diff --git a/test/tunicode.c b/test/tunicode.c index 27df42d..29a3cda 100644 --- a/test/tunicode.c +++ b/test/tunicode.c @@ -152,7 +152,7 @@ test_strpad(hid_t H5_ATTR_UNUSED fid, const char *string) /* Create a src_type that holds the UTF-8 string and its final NULL */ big_len = length + 1; /* +1 byte for final NULL */ - HDassert((2 * big_len) <= sizeof(cmpbuf)); + assert((2 * big_len) <= sizeof(cmpbuf)); src_type = mkstr(big_len, H5T_STR_NULLTERM); CHECK(src_type, FAIL, "mkstr"); /* Create a dst_type that holds half of the UTF-8 string and a final @@ -180,7 +180,7 @@ test_strpad(hid_t H5_ATTR_UNUSED fid, const char *string) cmpbuf[2 * small_len - 1] = '\0'; HDstrcpy(&cmpbuf[2 * small_len], new_string); - VERIFY(HDmemcmp(buf, cmpbuf, 2 * big_len), 0, "HDmemcmp"); + VERIFY(memcmp(buf, cmpbuf, 2 * big_len), 0, "memcmp"); /* Now convert from smaller datatype to bigger datatype. This should * leave our buffer looking like: "abc\0\0\0\0\0abc\0\0\0\0\0" */ @@ -188,12 +188,12 @@ test_strpad(hid_t H5_ATTR_UNUSED fid, const char *string) CHECK(ret, FAIL, "H5Tconvert"); /* First fill the buffer with NULLs */ - HDmemset(cmpbuf, '\0', (size_t)LONG_BUF_SIZE); + memset(cmpbuf, '\0', (size_t)LONG_BUF_SIZE); /* Copy in the characters */ HDstrncpy(cmpbuf, new_string, small_len - 1); HDstrncpy(&cmpbuf[big_len], new_string, small_len - 1); - VERIFY(HDmemcmp(buf, cmpbuf, 2 * big_len), 0, "HDmemcmp"); + VERIFY(memcmp(buf, cmpbuf, 2 * big_len), 0, "memcmp"); ret = H5Tclose(src_type); CHECK(ret, FAIL, "H5Tclose"); @@ -215,7 +215,7 @@ test_strpad(hid_t H5_ATTR_UNUSED fid, const char *string) /* Create a src_type that holds the UTF-8 string */ big_len = length; - HDassert((2 * big_len) <= sizeof(cmpbuf)); + assert((2 * big_len) <= sizeof(cmpbuf)); src_type = mkstr(big_len, H5T_STR_NULLPAD); CHECK(src_type, FAIL, "mkstr"); /* Create a dst_type that holds half of the UTF-8 string */ @@ -240,7 +240,7 @@ test_strpad(hid_t H5_ATTR_UNUSED fid, const char *string) HDstrncpy(&cmpbuf[small_len], new_string, small_len); HDstrncpy(&cmpbuf[2 * small_len], new_string, big_len); - VERIFY(HDmemcmp(buf, cmpbuf, 2 * big_len), 0, "HDmemcmp"); + VERIFY(memcmp(buf, cmpbuf, 2 * big_len), 0, "memcmp"); /* Now convert from smaller datatype to bigger datatype. This should * leave our buffer looking like: "abcd\0\0\0\0abcd\0\0\0\0" */ @@ -248,12 +248,12 @@ test_strpad(hid_t H5_ATTR_UNUSED fid, const char *string) CHECK(ret, FAIL, "H5Tconvert"); /* First fill the buffer with NULLs */ - HDmemset(cmpbuf, '\0', (size_t)LONG_BUF_SIZE); + memset(cmpbuf, '\0', (size_t)LONG_BUF_SIZE); /* Copy in the characters */ HDstrncpy(cmpbuf, new_string, small_len); HDstrncpy(&cmpbuf[big_len], new_string, small_len); - VERIFY(HDmemcmp(buf, cmpbuf, 2 * big_len), 0, "HDmemcmp"); + VERIFY(memcmp(buf, cmpbuf, 2 * big_len), 0, "memcmp"); ret = H5Tclose(src_type); CHECK(ret, FAIL, "H5Tclose"); @@ -285,7 +285,7 @@ test_strpad(hid_t H5_ATTR_UNUSED fid, const char *string) HDstrncpy(&cmpbuf[small_len], new_string, small_len); HDstrncpy(&cmpbuf[2 * small_len], new_string, big_len); - VERIFY(HDmemcmp(buf, cmpbuf, 2 * big_len), 0, "HDmemcmp"); + VERIFY(memcmp(buf, cmpbuf, 2 * big_len), 0, "memcmp"); /* Now convert from smaller datatype to bigger datatype. This should * leave our buffer looking like: "abcd abcd " */ @@ -293,12 +293,12 @@ test_strpad(hid_t H5_ATTR_UNUSED fid, const char *string) CHECK(ret, FAIL, "H5Tconvert"); /* First fill the buffer with spaces */ - HDmemset(cmpbuf, ' ', (size_t)LONG_BUF_SIZE); + memset(cmpbuf, ' ', (size_t)LONG_BUF_SIZE); /* Copy in the characters */ HDstrncpy(cmpbuf, new_string, small_len); HDstrncpy(&cmpbuf[big_len], new_string, small_len); - VERIFY(HDmemcmp(buf, cmpbuf, 2 * big_len), 0, "HDmemcmp"); + VERIFY(memcmp(buf, cmpbuf, 2 * big_len), 0, "memcmp"); ret = H5Tclose(src_type); CHECK(ret, FAIL, "H5Tclose"); @@ -585,7 +585,7 @@ test_compound(hid_t fid, const char *string) herr_t ret; /* Initialize compound data */ - HDmemset(&s1, 0, sizeof(s1_t)); /* To make purify happy */ + memset(&s1, 0, sizeof(s1_t)); /* To make purify happy */ s1.a = COMP_INT_VAL; s1.c = COMP_DOUBLE_VAL; s1.b = COMP_FLOAT_VAL; @@ -779,15 +779,15 @@ dump_string(const char *string) size_t length; size_t x; - HDprintf("The string was:\n %s", string); - HDprintf("Or in hex:\n"); + printf("The string was:\n %s", string); + printf("Or in hex:\n"); length = HDstrlen(string); for (x = 0; x < length; x++) - HDprintf("%x ", string[x] & (0x000000FF)); + printf("%x ", string[x] & (0x000000FF)); - HDprintf("\n"); + printf("\n"); } /* Main test. @@ -810,7 +810,7 @@ test_unicode(void) /* Create a random string with length NUM_CHARS */ HDsrandom((unsigned)HDtime(NULL)); - HDmemset(test_string, 0, sizeof(test_string)); + memset(test_string, 0, sizeof(test_string)); for (x = 0; x < NUM_CHARS; x++) { /* We need to avoid unprintable characters (codes 0-31) and the * . and / characters, since they aren't allowed in path names. diff --git a/test/tvlstr.c b/test/tvlstr.c index 3fcc57d..5b76a63 100644 --- a/test/tvlstr.c +++ b/test/tvlstr.c @@ -64,7 +64,7 @@ test_vlstr_alloc_custom(size_t size, void *info) */ extra = MAX(sizeof(void *), sizeof(size_t)); - if ((ret_value = HDmalloc(extra + size)) != NULL) { + if ((ret_value = malloc(extra + size)) != NULL) { *(size_t *)ret_value = size; *mem_used += size; } /* end if */ @@ -96,7 +96,7 @@ test_vlstr_free_custom(void *_mem, void *info) if (_mem != NULL) { mem = ((unsigned char *)_mem) - extra; *mem_used -= *(size_t *)((void *)mem); - HDfree(mem); + free(mem); } /* end if */ } @@ -162,15 +162,15 @@ test_vlstrings_basic(void) dataset2 = H5Dcreate2(fid1, "Dataset2", tid1, dataspace, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); CHECK(dataset, FAIL, "H5Dcreate2"); - wdata2 = (char *)HDcalloc((size_t)65534, sizeof(char)); - HDmemset(wdata2, 'A', (size_t)65533); + wdata2 = (char *)calloc((size_t)65534, sizeof(char)); + memset(wdata2, 'A', (size_t)65533); ret = H5Dwrite(dataset2, tid1, H5S_ALL, H5S_ALL, H5P_DEFAULT, &wdata2); CHECK(ret, FAIL, "H5Dwrite"); H5Sclose(dataspace); H5Dclose(dataset2); - HDfree(wdata2); + free(wdata2); /* Change to the custom memory allocation routines for reading VL string */ xfer_pid = H5Pcreate(H5P_DATASET_XFER); @@ -625,8 +625,8 @@ test_write_vl_string_attribute(void) att = H5Acreate2(root, "test_scalar_large", type, dataspace, H5P_DEFAULT, H5P_DEFAULT); CHECK(att, FAIL, "H5Acreate2"); - string_att_write = (char *)HDcalloc((size_t)8192, sizeof(char)); - HDmemset(string_att_write, 'A', (size_t)8191); + string_att_write = (char *)calloc((size_t)8192, sizeof(char)); + memset(string_att_write, 'A', (size_t)8191); ret = H5Awrite(att, type, &string_att_write); CHECK(ret, FAIL, "H5Awrite"); @@ -642,7 +642,7 @@ test_write_vl_string_attribute(void) string_att_check = NULL; /* The attribute string written is freed below, in the test_read_vl_string_attribute() test */ - /* HDfree(string_att_write); */ + /* free(string_att_write); */ ret = H5Aclose(att); CHECK(ret, FAIL, "HAclose"); @@ -723,7 +723,7 @@ test_read_vl_string_attribute(void) /* Free string allocated in test_write_vl_string_attribute */ if (string_att_write) - HDfree(string_att_write); + free(string_att_write); ret = H5Aclose(att); CHECK(ret, FAIL, "HAclose"); diff --git a/test/tvltypes.c b/test/tvltypes.c index 1e0de1c..0a1f872 100644 --- a/test/tvltypes.c +++ b/test/tvltypes.c @@ -60,7 +60,7 @@ test_vltypes_alloc_custom(size_t size, void *mem_used) * DEC Alpha to keep the alignment correct - QAK) */ - if ((ret_value = HDmalloc(extra + size)) != NULL) { + if ((ret_value = malloc(extra + size)) != NULL) { *(size_t *)ret_value = size; *(size_t *)mem_used += size; } /* end if */ @@ -90,7 +90,7 @@ test_vltypes_free_custom(void *_mem, void *mem_used) unsigned char *mem = ((unsigned char *)_mem) - extra; /* Pointer to actual block allocated */ *(size_t *)mem_used -= *(size_t *)((void *)mem); - HDfree(mem); + free(mem); } /* end if */ } @@ -254,7 +254,7 @@ test_vltypes_vlen_atomic(void) /* Allocate and initialize VL data to write */ for (i = 0; i < SPACE1_DIM1; i++) { - wdata[i].p = HDmalloc((i + 1) * sizeof(unsigned int)); + wdata[i].p = malloc((i + 1) * sizeof(unsigned int)); wdata[i].len = i + 1; for (j = 0; j < (i + 1); j++) ((unsigned int *)wdata[i].p)[j] = i * 10 + j; @@ -585,7 +585,7 @@ rewrite_vltypes_vlen_atomic(void) /* Allocate and initialize VL data to write */ for (i = 0; i < SPACE1_DIM1; i++) { - wdata[i].p = HDmalloc((i + increment) * sizeof(unsigned int)); + wdata[i].p = malloc((i + increment) * sizeof(unsigned int)); wdata[i].len = i + increment; for (j = 0; j < (i + increment); j++) ((unsigned int *)wdata[i].p)[j] = i * 20 + j; @@ -747,7 +747,7 @@ test_vltypes_vlen_compound(void) /* Allocate and initialize VL data to write */ for (i = 0; i < SPACE1_DIM1; i++) { - wdata[i].p = HDmalloc((i + 1) * sizeof(s1)); + wdata[i].p = malloc((i + 1) * sizeof(s1)); wdata[i].len = i + 1; for (j = 0; j < (i + 1); j++) { ((s1 *)wdata[i].p)[j].i = (int)(i * 10 + j); @@ -899,7 +899,7 @@ rewrite_vltypes_vlen_compound(void) /* Allocate and initialize VL data to write */ for (i = 0; i < SPACE1_DIM1; i++) { - wdata[i].p = HDmalloc((i + increment) * sizeof(s1)); + wdata[i].p = malloc((i + increment) * sizeof(s1)); wdata[i].len = i + increment; for (j = 0; j < (i + increment); j++) { ((s1 *)wdata[i].p)[j].i = (int)(i * 40 + j); @@ -1048,17 +1048,17 @@ test_vltypes_compound_vlen_vlen(void) MESSAGE(5, ("Testing Compound Datatypes with VL Atomic Datatype Component Functionality\n")); /* Allocate and initialize VL data to write */ - wdata = (s1 *)HDmalloc(sizeof(s1) * SPACE3_DIM1); - CHECK_PTR(wdata, "HDmalloc"); - rdata = (s1 *)HDmalloc(sizeof(s1) * SPACE3_DIM1); - CHECK_PTR(rdata, "HDmalloc"); + wdata = (s1 *)malloc(sizeof(s1) * SPACE3_DIM1); + CHECK_PTR(wdata, "malloc"); + rdata = (s1 *)malloc(sizeof(s1) * SPACE3_DIM1); + CHECK_PTR(rdata, "malloc"); for (i = 0; i < SPACE3_DIM1; i++) { wdata[i].i = (int)(i * 10); wdata[i].f = (float)(i * 20) / 3.0F; - wdata[i].v.p = HDmalloc((i + L1_INCM) * sizeof(hvl_t)); + wdata[i].v.p = malloc((i + L1_INCM) * sizeof(hvl_t)); wdata[i].v.len = i + L1_INCM; for (t1 = (hvl_t *)((wdata[i].v).p), j = 0; j < (i + L1_INCM); j++, t1++) { - t1->p = HDmalloc((j + L2_INCM) * sizeof(unsigned int)); + t1->p = malloc((j + L2_INCM) * sizeof(unsigned int)); t1->len = j + L2_INCM; for (k = 0; k < j + L2_INCM; k++) ((unsigned int *)t1->p)[k] = i * 100 + j * 10 + k; @@ -1190,8 +1190,8 @@ test_vltypes_compound_vlen_vlen(void) CHECK(ret, FAIL, "H5Fclose"); /* Release buffers */ - HDfree(wdata); - HDfree(rdata); + free(wdata); + free(rdata); } /* end test_vltypes_compound_vlen_vlen() */ /**************************************************************** @@ -1238,11 +1238,11 @@ test_vltypes_compound_vlstr(void) /* Allocate and initialize VL data to write */ for (i = 0; i < SPACE1_DIM1; i++) { - wdata[i].v.p = (s2 *)HDmalloc((i + L3_INCM) * sizeof(s2)); + wdata[i].v.p = (s2 *)malloc((i + L3_INCM) * sizeof(s2)); wdata[i].v.len = i + L3_INCM; for (t1 = (s2 *)((wdata[i].v).p), j = 0; j < (i + L3_INCM); j++, t1++) { HDstrcat(str, "m"); - t1->string = (char *)HDmalloc(HDstrlen(str) * sizeof(char) + 1); + t1->string = (char *)malloc(HDstrlen(str) * sizeof(char) + 1); HDstrcpy(t1->string, str); /*t1->color = red;*/ t1->color = blue; @@ -1408,11 +1408,11 @@ test_vltypes_compound_vlstr(void) /* Use this part for new data */ HDstrcpy(str, "bbbbbbbb\0"); for (i = 0; i < SPACE1_DIM1; i++) { - wdata2[i].v.p = (s2 *)HDmalloc((i + 1) * sizeof(s2)); + wdata2[i].v.p = (s2 *)malloc((i + 1) * sizeof(s2)); wdata2[i].v.len = i + 1; for (t1 = (s2 *)(wdata2[i].v).p, j = 0; j < i + 1; j++, t1++) { HDstrcat(str, "pp"); - t1->string = (char *)HDmalloc(HDstrlen(str) * sizeof(char) + 1); + t1->string = (char *)malloc(HDstrlen(str) * sizeof(char) + 1); HDstrcpy(t1->string, str); t1->color = green; } @@ -1526,7 +1526,7 @@ test_vltypes_compound_vlen_atomic(void) for (i = 0; i < SPACE1_DIM1; i++) { wdata[i].i = (int)(i * 10); wdata[i].f = (float)(i * 20) / 3.0F; - wdata[i].v.p = HDmalloc((i + 1) * sizeof(unsigned int)); + wdata[i].v.p = malloc((i + 1) * sizeof(unsigned int)); wdata[i].v.len = i + 1; for (j = 0; j < (i + 1); j++) ((unsigned int *)wdata[i].v.p)[j] = i * 10 + j; @@ -1630,7 +1630,7 @@ test_vltypes_compound_vlen_atomic(void) CHECK(dcpl_pid, FAIL, "H5Pcreate"); /* Set the fill value for the second dataset */ - HDmemset(&fill, 0, sizeof(s1)); + memset(&fill, 0, sizeof(s1)); ret = H5Pset_fill_value(dcpl_pid, tid2, &fill); CHECK(ret, FAIL, "H5Pset_fill_value"); @@ -1760,7 +1760,7 @@ rewrite_vltypes_compound_vlen_atomic(void) for (i = 0; i < SPACE1_DIM1; i++) { wdata[i].i = (int)(i * 40); wdata[i].f = (float)(i * 50) / 3.0F; - wdata[i].v.p = HDmalloc((i + increment) * sizeof(unsigned int)); + wdata[i].v.p = malloc((i + increment) * sizeof(unsigned int)); wdata[i].v.len = i + increment; for (j = 0; j < (i + increment); j++) ((unsigned int *)wdata[i].v.p)[j] = i * 60 + j; @@ -1934,14 +1934,14 @@ test_vltypes_vlen_vlen_atomic(void) /* Allocate and initialize VL data to write */ for (i = 0; i < SPACE1_DIM1; i++) { - wdata[i].p = HDmalloc((i + 1) * sizeof(hvl_t)); + wdata[i].p = malloc((i + 1) * sizeof(hvl_t)); if (wdata[i].p == NULL) { TestErrPrintf("Cannot allocate memory for VL data! i=%u\n", i); return; } /* end if */ wdata[i].len = i + 1; for (t1 = (hvl_t *)(wdata[i].p), j = 0; j < (i + 1); j++, t1++) { - t1->p = HDmalloc((j + 1) * sizeof(unsigned int)); + t1->p = malloc((j + 1) * sizeof(unsigned int)); if (t1->p == NULL) { TestErrPrintf("Cannot allocate memory for VL data! i=%u, j=%u\n", i, j); return; @@ -2135,14 +2135,14 @@ rewrite_longer_vltypes_vlen_vlen_atomic(void) /* Allocate and initialize VL data to write */ for (i = 0; i < SPACE1_DIM1; i++) { - wdata[i].p = HDmalloc((i + increment) * sizeof(hvl_t)); + wdata[i].p = malloc((i + increment) * sizeof(hvl_t)); if (wdata[i].p == NULL) { TestErrPrintf("Cannot allocate memory for VL data! i=%u\n", i); return; } /* end if */ wdata[i].len = i + increment; for (t1 = (hvl_t *)(wdata[i].p), j = 0; j < (i + increment); j++, t1++) { - t1->p = HDmalloc((j + 1) * sizeof(unsigned int)); + t1->p = malloc((j + 1) * sizeof(unsigned int)); if (t1->p == NULL) { TestErrPrintf("Cannot allocate memory for VL data! i=%u, j=%u\n", i, j); return; @@ -2315,14 +2315,14 @@ rewrite_shorter_vltypes_vlen_vlen_atomic(void) /* Allocate and initialize VL data to write */ for (i = 0; i < SPACE1_DIM1; i++) { - wdata[i].p = HDmalloc((i + increment) * sizeof(hvl_t)); + wdata[i].p = malloc((i + increment) * sizeof(hvl_t)); if (wdata[i].p == NULL) { TestErrPrintf("Cannot allocate memory for VL data! i=%u\n", i); return; } /* end if */ wdata[i].len = i + increment; for (t1 = (hvl_t *)(wdata[i].p), j = 0; j < (i + increment); j++, t1++) { - t1->p = HDmalloc((j + 1) * sizeof(unsigned int)); + t1->p = malloc((j + 1) * sizeof(unsigned int)); if (t1->p == NULL) { TestErrPrintf("Cannot allocate memory for VL data! i=%u, j=%u\n", i, j); return; @@ -2591,8 +2591,8 @@ test_vltypes_fill_value(void) CHECK(ret, FAIL, "H5Tclose"); /* Allocate space for the buffer to read data */ - rbuf = (dtype1_struct *)HDmalloc(SPACE4_DIM_LARGE * sizeof(dtype1_struct)); - CHECK_PTR(rbuf, "HDmalloc"); + rbuf = (dtype1_struct *)malloc(SPACE4_DIM_LARGE * sizeof(dtype1_struct)); + CHECK_PTR(rbuf, "malloc"); /* Create the small & large dataspaces to use */ small_dspace_id = H5Screate_simple(SPACE4_RANK, small_dims, NULL); @@ -2690,13 +2690,13 @@ test_vltypes_fill_value(void) } break; case H5D_VIRTUAL: - HDassert(0 && "Invalid layout type!"); + assert(0 && "Invalid layout type!"); break; case H5D_LAYOUT_ERROR: case H5D_NLAYOUTS: default: - HDassert(0 && "Unknown layout type!"); + assert(0 && "Unknown layout type!"); break; } /* end switch */ @@ -2798,13 +2798,13 @@ test_vltypes_fill_value(void) break; case H5D_VIRTUAL: - HDassert(0 && "Invalid layout type!"); + assert(0 && "Invalid layout type!"); break; case H5D_LAYOUT_ERROR: case H5D_NLAYOUTS: default: - HDassert(0 && "Unknown layout type!"); + assert(0 && "Unknown layout type!"); break; } /* end switch */ @@ -2832,7 +2832,7 @@ test_vltypes_fill_value(void) CHECK(ret, FAIL, "H5Treclaim"); /* Clear the read buffer */ - HDmemset(rbuf, 0, dset_elmts * sizeof(dtype1_struct)); + memset(rbuf, 0, dset_elmts * sizeof(dtype1_struct)); /* Read in non-contiguous selection from 'empty' dataset of fill value */ ret = H5Dread(dset_id, dtype1_id, dset_select_dspace_id, dset_select_dspace_id, xfer_pid, rbuf); @@ -2890,7 +2890,7 @@ test_vltypes_fill_value(void) CHECK(ret, FAIL, "H5Treclaim"); /* Clear the read buffer */ - HDmemset(rbuf, 0, dset_elmts * sizeof(dtype1_struct)); + memset(rbuf, 0, dset_elmts * sizeof(dtype1_struct)); /* Read in non-contiguous selection from 'empty' dataset of fill value */ ret = H5Dread(dset_id, dtype1_id, dset_select_dspace_id, dset_select_dspace_id, xfer_pid, rbuf); @@ -2985,13 +2985,13 @@ test_vltypes_fill_value(void) break; case H5D_VIRTUAL: - HDassert(0 && "Invalid layout type!"); + assert(0 && "Invalid layout type!"); break; case H5D_LAYOUT_ERROR: case H5D_NLAYOUTS: default: - HDassert(0 && "Unknown layout type!"); + assert(0 && "Unknown layout type!"); break; } /* end switch */ @@ -3045,7 +3045,7 @@ test_vltypes_fill_value(void) CHECK(ret, FAIL, "H5Treclaim"); /* Clear the read buffer */ - HDmemset(rbuf, 0, dset_elmts * sizeof(dtype1_struct)); + memset(rbuf, 0, dset_elmts * sizeof(dtype1_struct)); /* Read in non-contiguous selection from dataset */ ret = H5Dread(dset_id, dtype1_id, dset_select_dspace_id, dset_select_dspace_id, xfer_pid, rbuf); @@ -3133,7 +3133,7 @@ test_vltypes_fill_value(void) CHECK(ret, FAIL, "H5Treclaim"); /* Clear the read buffer */ - HDmemset(rbuf, 0, dset_elmts * sizeof(dtype1_struct)); + memset(rbuf, 0, dset_elmts * sizeof(dtype1_struct)); /* Read in non-contiguous selection from dataset */ ret = H5Dread(dset_id, dtype1_id, dset_select_dspace_id, dset_select_dspace_id, xfer_pid, rbuf); @@ -3212,7 +3212,7 @@ test_vltypes_fill_value(void) CHECK(ret, FAIL, "H5Tclose"); /* Release buffer */ - HDfree(rbuf); + free(rbuf); } /* end test_vltypes_fill_value() */ /**************************************************************** diff --git a/test/twriteorder.c b/test/twriteorder.c index 165abcf..2a1f880 100644 --- a/test/twriteorder.c +++ b/test/twriteorder.c @@ -104,15 +104,15 @@ part_t launch_g; void usage(const char *prog) { - HDfprintf(stderr, "usage: %s [OPTIONS]\n", prog); - HDfprintf(stderr, " OPTIONS\n"); - HDfprintf(stderr, " -h Print a usage message and exit\n"); - HDfprintf(stderr, " -l w|r launch writer or reader only. [default: launch both]\n"); - HDfprintf(stderr, " -b N Block size [default: %d]\n", BLOCKSIZE_DFT); - HDfprintf(stderr, " -p N Partition size [default: %d]\n", PARTITION_DFT); - HDfprintf(stderr, " -n N Number of linked blocks [default: %d]\n", NLINKEDBLOCKS_DFT); - HDfprintf(stderr, " where N is an integer value\n"); - HDfprintf(stderr, "\n"); + fprintf(stderr, "usage: %s [OPTIONS]\n", prog); + fprintf(stderr, " OPTIONS\n"); + fprintf(stderr, " -h Print a usage message and exit\n"); + fprintf(stderr, " -l w|r launch writer or reader only. [default: launch both]\n"); + fprintf(stderr, " -b N Block size [default: %d]\n", BLOCKSIZE_DFT); + fprintf(stderr, " -p N Partition size [default: %d]\n", PARTITION_DFT); + fprintf(stderr, " -n N Number of linked blocks [default: %d]\n", NLINKEDBLOCKS_DFT); + fprintf(stderr, " where N is an integer value\n"); + fprintf(stderr, "\n"); } /* Setup test parameters by parsing command line options. @@ -136,25 +136,25 @@ parse_option(int argc, char *const argv[]) switch (c) { case 'h': usage(progname_g); - HDexit(EXIT_SUCCESS); + exit(EXIT_SUCCESS); break; case 'b': /* number of planes to write/read */ - if ((blocksize_g = HDatoi(optarg)) <= 0) { - HDfprintf(stderr, "bad blocksize %s, must be a positive integer\n", optarg); + if ((blocksize_g = atoi(optarg)) <= 0) { + fprintf(stderr, "bad blocksize %s, must be a positive integer\n", optarg); usage(progname_g); Hgoto_error(-1); }; break; case 'n': /* number of planes to write/read */ - if ((nlinkedblock_g = HDatoi(optarg)) < 2) { - HDfprintf(stderr, "bad number of linked blocks %s, must be greater than 1.\n", optarg); + if ((nlinkedblock_g = atoi(optarg)) < 2) { + fprintf(stderr, "bad number of linked blocks %s, must be greater than 1.\n", optarg); usage(progname_g); Hgoto_error(-1); }; break; case 'p': /* number of planes to write/read */ - if ((part_size_g = HDatoi(optarg)) <= 0) { - HDfprintf(stderr, "bad partition size %s, must be a positive integer\n", optarg); + if ((part_size_g = atoi(optarg)) <= 0) { + fprintf(stderr, "bad partition size %s, must be a positive integer\n", optarg); usage(progname_g); Hgoto_error(-1); }; @@ -168,28 +168,28 @@ parse_option(int argc, char *const argv[]) launch_g = UC_WRITER; break; default: - HDfprintf(stderr, "launch value(%c) should be w or r only.\n", *optarg); + fprintf(stderr, "launch value(%c) should be w or r only.\n", *optarg); usage(progname_g); Hgoto_error(-1); break; } /* end inner switch */ - HDprintf("launch = %d\n", launch_g); + printf("launch = %d\n", launch_g); break; case '?': - HDfprintf(stderr, "getopt returned '%c'.\n", c); + fprintf(stderr, "getopt returned '%c'.\n", c); usage(progname_g); Hgoto_error(-1); default: - HDfprintf(stderr, "getopt returned unexpected value.\n"); - HDfprintf(stderr, "Unexpected value is %d\n", c); + fprintf(stderr, "getopt returned unexpected value.\n"); + fprintf(stderr, "Unexpected value is %d\n", c); Hgoto_error(-1); } /* end outer switch */ } /* end while */ /* verify partition size must be >= blocksize */ if (part_size_g < blocksize_g) { - HDfprintf(stderr, "Blocksize %d should not be bigger than partition size %d\n", blocksize_g, - part_size_g); + fprintf(stderr, "Blocksize %d should not be bigger than partition size %d\n", blocksize_g, + part_size_g); Hgoto_error(-1); } @@ -216,10 +216,10 @@ setup_parameters(int argc, char *const argv[]) } /* show parameters and return */ - HDprintf("blocksize = %ld\n", (long)blocksize_g); - HDprintf("part_size = %ld\n", (long)part_size_g); - HDprintf("nlinkedblock = %ld\n", (long)nlinkedblock_g); - HDprintf("launch = %d\n", launch_g); + printf("blocksize = %ld\n", (long)blocksize_g); + printf("part_size = %ld\n", (long)part_size_g); + printf("nlinkedblock = %ld\n", (long)nlinkedblock_g); + printf("launch = %d\n", launch_g); return 0; } @@ -237,13 +237,13 @@ create_wo_file(void) /* Create the data file */ if ((write_fd_g = HDopen(DATAFILE, O_RDWR | O_TRUNC | O_CREAT, H5_POSIX_CREATE_MODE_RW)) < 0) { - HDprintf("WRITER: error from open\n"); + printf("WRITER: error from open\n"); return -1; } blkaddr = 0; /* write it to partition 0 */ if ((bytes_wrote = HDwrite(write_fd_g, &blkaddr, (size_t)SIZE_BLKADDR)) != SIZE_BLKADDR) { - HDprintf("blkaddr write failed\n"); + printf("blkaddr write failed\n"); return -1; } @@ -267,15 +267,15 @@ write_wo_file(void) blkaddr = i * part_size_g + i; /* store old block address in byte 0-3 */ - HDmemcpy(&buffer[0], &blkaddr_old, sizeof(blkaddr_old)); + memcpy(&buffer[0], &blkaddr_old, sizeof(blkaddr_old)); /* fill the rest with the lowest byte of i */ - HDmemset(&buffer[4], i & 0xff, (size_t)(BLOCKSIZE_DFT - 4)); + memset(&buffer[4], i & 0xff, (size_t)(BLOCKSIZE_DFT - 4)); /* write the block */ HDlseek(write_fd_g, (HDoff_t)blkaddr, SEEK_SET); if ((bytes_wrote = HDwrite(write_fd_g, buffer, (size_t)blocksize_g)) != blocksize_g) { - HDprintf("blkaddr write failed in partition %d\n", i); + printf("blkaddr write failed in partition %d\n", i); return -1; } @@ -287,7 +287,7 @@ write_wo_file(void) HDlseek(write_fd_g, (HDoff_t)0, SEEK_SET); if ((bytes_wrote = HDwrite(write_fd_g, &blkaddr_old, (size_t)sizeof(blkaddr_old))) != sizeof(blkaddr_old)) { - HDprintf("blkaddr write failed in partition %d\n", 0); + printf("blkaddr write failed in partition %d\n", 0); return -1; } @@ -305,7 +305,7 @@ read_wo_file(void) /* Open the data file */ if ((read_fd = HDopen(DATAFILE, O_RDONLY)) < 0) { - HDprintf("READER: error from open\n"); + printf("READER: error from open\n"); return -1; } @@ -313,7 +313,7 @@ read_wo_file(void) while (blkaddr == 0) { HDlseek(read_fd, (HDoff_t)0, SEEK_SET); if ((bytes_read = HDread(read_fd, &blkaddr, (size_t)sizeof(blkaddr))) != sizeof(blkaddr)) { - HDprintf("blkaddr read failed in partition %d\n", 0); + printf("blkaddr read failed in partition %d\n", 0); return -1; } } @@ -322,12 +322,12 @@ read_wo_file(void) while (blkaddr != 0) { HDlseek(read_fd, (HDoff_t)blkaddr, SEEK_SET); if ((bytes_read = HDread(read_fd, buffer, (size_t)blocksize_g)) != blocksize_g) { - HDprintf("blkaddr read failed in partition %d\n", 0); + printf("blkaddr read failed in partition %d\n", 0); return -1; } /* retrieve the block address in byte 0-3 */ - HDmemcpy(&blkaddr, &buffer[0], sizeof(blkaddr)); + memcpy(&blkaddr, &buffer[0], sizeof(blkaddr)); } return 0; @@ -366,16 +366,16 @@ main(int argc, char *argv[]) /* Create file */ /* ============*/ if (launch_g != UC_READER) { - HDprintf("Creating skeleton data file for test...\n"); + printf("Creating skeleton data file for test...\n"); if (create_wo_file() < 0) { - HDfprintf(stderr, "***encounter error\n"); + fprintf(stderr, "***encounter error\n"); Hgoto_error(1); } else - HDprintf("File created.\n"); + printf("File created.\n"); } /* flush output before possible fork */ - HDfflush(stdout); + fflush(stdout); if (launch_g == UC_READWRITE) { /* fork process */ @@ -392,15 +392,15 @@ main(int argc, char *argv[]) if (launch_g != UC_WRITER) { /* child process launch the reader */ if (0 == childpid) { - HDprintf("%d: launch reader process\n", mypid); + printf("%d: launch reader process\n", mypid); if (read_wo_file() < 0) { - HDfprintf(stderr, "read_wo_file encountered error\n"); - HDexit(EXIT_FAILURE); + fprintf(stderr, "read_wo_file encountered error\n"); + exit(EXIT_FAILURE); } /* Reader is done. Clean up by removing the data file */ HDremove(DATAFILE); - HDexit(EXIT_SUCCESS); + exit(EXIT_SUCCESS); } } @@ -409,7 +409,7 @@ main(int argc, char *argv[]) /* ============= */ /* this process continues to launch the writer */ if (write_wo_file() < 0) { - HDfprintf(stderr, "write_wo_file encountered error\n"); + fprintf(stderr, "write_wo_file encountered error\n"); Hgoto_error(1); } @@ -423,12 +423,12 @@ main(int argc, char *argv[]) } if (WIFEXITED(child_status)) { if ((child_ret_value = WEXITSTATUS(child_status)) != 0) { - HDprintf("%d: child process exited with non-zero code (%d)\n", mypid, child_ret_value); + printf("%d: child process exited with non-zero code (%d)\n", mypid, child_ret_value); Hgoto_error(2); } } else { - HDprintf("%d: child process terminated abnormally\n", mypid); + printf("%d: child process terminated abnormally\n", mypid); Hgoto_error(2); } } @@ -436,10 +436,10 @@ main(int argc, char *argv[]) done: /* Print result and exit */ if (ret_value != 0) { - HDprintf("Error(s) encountered\n"); + printf("Error(s) encountered\n"); } else { - HDprintf("All passed\n"); + printf("All passed\n"); } return ret_value; @@ -450,7 +450,7 @@ done: int main(void) { - HDfprintf(stderr, "Non-POSIX platform. Skipping.\n"); + fprintf(stderr, "Non-POSIX platform. Skipping.\n"); return EXIT_SUCCESS; } /* end main() */ diff --git a/test/unlink.c b/test/unlink.c index e18ae73..ceb9024 100644 --- a/test/unlink.c +++ b/test/unlink.c @@ -649,7 +649,7 @@ test_filespace(hid_t fapl) TEST_ERROR; /* Create buffer for writing dataset */ - if (NULL == (data = (int *)HDmalloc(sizeof(int) * FILESPACE_DIM0 * FILESPACE_DIM1 * FILESPACE_DIM2))) + if (NULL == (data = (int *)malloc(sizeof(int) * FILESPACE_DIM0 * FILESPACE_DIM1 * FILESPACE_DIM2))) TEST_ERROR; /* Create single dataset (with contiguous storage & late allocation), remove it & verify file size */ @@ -1425,7 +1425,7 @@ test_filespace(hid_t fapl) /* Cleanup common objects */ /* Release dataset buffer */ - HDfree(data); + free(data); /* Close property lists */ if (H5Pclose(fapl_nocache) < 0) @@ -1452,7 +1452,7 @@ test_filespace(hid_t fapl) error: /* Release dataset buffer */ if (data) - HDfree(data); + free(data); return 1; } /* end test_filespace() */ @@ -1490,12 +1490,12 @@ test_create_unlink(const char *msg, hid_t fapl) HDsnprintf(groupname, sizeof(groupname), "%s %u", GROUPNAME, u); if ((group = H5Gcreate2(file, groupname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { H5_FAILED(); - HDprintf("group %s creation failed\n", groupname); + printf("group %s creation failed\n", groupname); goto error; } /* end if */ if (H5Gclose(group) < 0) { H5_FAILED(); - HDprintf("closing group %s failed\n", groupname); + printf("closing group %s failed\n", groupname); goto error; } /* end if */ } /* end for */ @@ -1505,7 +1505,7 @@ test_create_unlink(const char *msg, hid_t fapl) HDsnprintf(groupname, sizeof(groupname), "%s %u", GROUPNAME, u); if (H5Ldelete(file, groupname, H5P_DEFAULT) < 0) { H5_FAILED(); - HDprintf("Unlinking group %s failed\n", groupname); + printf("Unlinking group %s failed\n", groupname); goto error; } /* end if */ } /* end for */ @@ -1736,7 +1736,7 @@ test_unlink_rightleaf(hid_t fid) TESTING("deleting right-most child in non-leaf B-tree node"); /* Allocate space for the group IDs */ - if (NULL == (gids = (hid_t *)HDcalloc((size_t)ngroups, sizeof(hid_t)))) + if (NULL == (gids = (hid_t *)calloc((size_t)ngroups, sizeof(hid_t)))) TEST_ERROR; if ((rootid = H5Gopen2(fid, "/", H5P_DEFAULT)) < 0) @@ -1770,7 +1770,7 @@ test_unlink_rightleaf(hid_t fid) TEST_ERROR; /* Free memory */ - HDfree(gids); + free(gids); PASSED(); return 0; @@ -1786,7 +1786,7 @@ error: } H5E_END_TRY; } /* end if */ - HDfree(gids); + free(gids); } /* end if */ H5E_BEGIN_TRY { @@ -1823,7 +1823,7 @@ test_unlink_rightnode(hid_t fid) TESTING("deleting right-most child in non-leaf B-tree node"); /* Allocate space for the group IDs */ - if (NULL == (gids = (hid_t *)HDcalloc((size_t)ngroups, sizeof(hid_t)))) + if (NULL == (gids = (hid_t *)calloc((size_t)ngroups, sizeof(hid_t)))) TEST_ERROR; if ((rootid = H5Gopen2(fid, "/", H5P_DEFAULT)) < 0) @@ -1860,7 +1860,7 @@ test_unlink_rightnode(hid_t fid) FAIL_STACK_ERROR; /* Free memory */ - HDfree(gids); + free(gids); PASSED(); return 0; @@ -1876,7 +1876,7 @@ error: } H5E_END_TRY; } /* end if */ - HDfree(gids); + free(gids); } /* end if */ H5E_BEGIN_TRY { @@ -1913,7 +1913,7 @@ test_unlink_middlenode(hid_t fid) TESTING("deleting right-most child in non-leaf B-tree node"); /* Allocate space for the group IDs */ - if (NULL == (gids = (hid_t *)HDcalloc((size_t)ngroups, sizeof(hid_t)))) + if (NULL == (gids = (hid_t *)calloc((size_t)ngroups, sizeof(hid_t)))) TEST_ERROR; if ((rootid = H5Gopen2(fid, "/", H5P_DEFAULT)) < 0) @@ -2236,7 +2236,7 @@ test_unlink_middlenode(hid_t fid) FAIL_STACK_ERROR; /* Free memory */ - HDfree(gids); + free(gids); PASSED(); return 0; @@ -2252,7 +2252,7 @@ error: } H5E_END_TRY; } /* end if */ - HDfree(gids); + free(gids); } /* end if */ H5E_BEGIN_TRY { @@ -3022,12 +3022,12 @@ main(void) /* Get FAPL cache settings */ if (H5Pget_cache(fapl_small_mdc, &mdc_nelmts, &rdcc_nelmts, &rdcc_nbytes, &rdcc_w0) < 0) - HDprintf("H5Pget_cache failed\n"); + printf("H5Pget_cache failed\n"); /* Change FAPL cache settings */ mdc_nelmts = 1; if (H5Pset_cache(fapl_small_mdc, mdc_nelmts, rdcc_nelmts, rdcc_nbytes, rdcc_w0) < 0) - HDprintf("H5Pset_cache failed\n"); + printf("H5Pset_cache failed\n"); /* Test creating & unlinking lots of objects with a 1-element metadata cache FAPL */ nerrors += test_create_unlink("create and unlink large number of objects with small cache", @@ -3075,16 +3075,16 @@ main(void) nerrors += (h5_verify_cached_stabs(FILENAME, fapl) < 0 ? 1 : 0); if (nerrors) { - HDprintf("***** %d FAILURE%s! *****\n", nerrors, 1 == nerrors ? "" : "S"); - HDexit(EXIT_FAILURE); + printf("***** %d FAILURE%s! *****\n", nerrors, 1 == nerrors ? "" : "S"); + exit(EXIT_FAILURE); } HDputs("All unlink tests passed."); h5_cleanup(FILENAME, fapl); - HDexit(EXIT_SUCCESS); + exit(EXIT_SUCCESS); error: - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); } /* end main() */ diff --git a/test/unregister.c b/test/unregister.c index 104e638..2d2bc41 100644 --- a/test/unregister.c +++ b/test/unregister.c @@ -97,9 +97,9 @@ test_unregister_filters(hid_t fapl_id) TESTING("Unregistering filter"); /* Set up data array */ - if (NULL == (buf_data = (int *)HDcalloc(DSET_DIM1 * DSET_DIM2, sizeof(int)))) + if (NULL == (buf_data = (int *)calloc(DSET_DIM1 * DSET_DIM2, sizeof(int)))) TEST_ERROR; - if (NULL == (buf = (int **)HDcalloc(DSET_DIM1, sizeof(buf_data)))) + if (NULL == (buf = (int **)calloc(DSET_DIM1, sizeof(buf_data)))) TEST_ERROR; for (i = 0; i < DSET_DIM1; i++) buf[i] = buf_data + (i * DSET_DIM2); @@ -155,7 +155,7 @@ test_unregister_filters(hid_t fapl_id) H5E_END_TRY; if (ret >= 0) { H5_FAILED(); - HDprintf(" Line %d: Should not be able to unregister filter\n", __LINE__); + printf(" Line %d: Should not be able to unregister filter\n", __LINE__); goto error; } @@ -206,7 +206,7 @@ test_unregister_filters(hid_t fapl_id) H5E_END_TRY; if (ret >= 0) { H5_FAILED(); - HDprintf(" Line %d: Should not be able to unregister filter\n", __LINE__); + printf(" Line %d: Should not be able to unregister filter\n", __LINE__); goto error; } @@ -240,8 +240,8 @@ test_unregister_filters(hid_t fapl_id) if (H5Fclose(fid2) < 0) goto error; - HDfree(buf); - HDfree(buf_data); + free(buf); + free(buf_data); PASSED(); return SUCCEED; @@ -260,8 +260,8 @@ error: } H5E_END_TRY; - HDfree(buf); - HDfree(buf_data); + free(buf); + free(buf_data); return FAIL; } @@ -298,21 +298,21 @@ main(void) if (nerrors) goto error; - HDprintf("All filter unregistration tests passed.\n"); + printf("All filter unregistration tests passed.\n"); /* Pop API context */ if (api_ctx_pushed && H5CX_pop(FALSE) < 0) FAIL_STACK_ERROR; api_ctx_pushed = FALSE; - HDexit(EXIT_SUCCESS); + exit(EXIT_SUCCESS); error: nerrors = MAX(1, nerrors); - HDprintf("***** %d FILTER UNREGISTRATION TEST%s FAILED! *****\n", nerrors, 1 == nerrors ? "" : "S"); + printf("***** %d FILTER UNREGISTRATION TEST%s FAILED! *****\n", nerrors, 1 == nerrors ? "" : "S"); if (api_ctx_pushed) H5CX_pop(FALSE); - HDexit(EXIT_FAILURE); + exit(EXIT_FAILURE); } /* end main() */ diff --git a/test/use_append_chunk.c b/test/use_append_chunk.c index 185cb26..88cc646 100644 --- a/test/use_append_chunk.c +++ b/test/use_append_chunk.c @@ -78,7 +78,7 @@ int setup_parameters(int argc, char *const argv[], options_t *opts) { /* use case defaults */ - HDmemset(opts, 0, sizeof(options_t)); + memset(opts, 0, sizeof(options_t)); opts->chunksize = Chunksize_DFT; opts->use_swmr = TRUE; /* use swmr open */ opts->iterations = 1; @@ -141,25 +141,25 @@ main(int argc, char *argv[]) /* Create file */ /* =========== */ if (UC_opts.launch != UC_READER) { - HDprintf("Creating skeleton data file for test...\n"); + printf("Creating skeleton data file for test...\n"); if ((UC_opts.fapl_id = h5_fileaccess()) < 0) { - HDfprintf(stderr, "can't create creation FAPL\n"); + fprintf(stderr, "can't create creation FAPL\n"); Hgoto_error(1); } if (H5Pset_libver_bounds(UC_opts.fapl_id, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0) { - HDfprintf(stderr, "can't set creation FAPL libver bounds\n"); + fprintf(stderr, "can't set creation FAPL libver bounds\n"); Hgoto_error(1); } if (create_uc_file(&UC_opts) < 0) { - HDfprintf(stderr, "***encounter error\n"); + fprintf(stderr, "***encounter error\n"); Hgoto_error(1); } else { - HDprintf("File created.\n"); + printf("File created.\n"); } /* Close FAPL to prevent issues with forking later */ if (H5Pclose(UC_opts.fapl_id) < 0) { - HDfprintf(stderr, "can't close creation FAPL\n"); + fprintf(stderr, "can't close creation FAPL\n"); Hgoto_error(1); } UC_opts.fapl_id = H5I_INVALID_HID; @@ -182,20 +182,20 @@ main(int argc, char *argv[]) if (UC_opts.launch != UC_WRITER) { /* child process launch the reader */ if (0 == childpid) { - HDprintf("%d: launch reader process\n", mypid); + printf("%d: launch reader process\n", mypid); if ((UC_opts.fapl_id = h5_fileaccess()) < 0) { - HDfprintf(stderr, "can't create read FAPL\n"); - HDexit(EXIT_FAILURE); + fprintf(stderr, "can't create read FAPL\n"); + exit(EXIT_FAILURE); } if (read_uc_file(send_wait, &UC_opts) < 0) { - HDfprintf(stderr, "read_uc_file encountered error\n"); - HDexit(EXIT_FAILURE); + fprintf(stderr, "read_uc_file encountered error\n"); + exit(EXIT_FAILURE); } if (H5Pclose(UC_opts.fapl_id) < 0) { - HDfprintf(stderr, "can't close read FAPL\n"); - HDexit(EXIT_FAILURE); + fprintf(stderr, "can't close read FAPL\n"); + exit(EXIT_FAILURE); } - HDexit(EXIT_SUCCESS); + exit(EXIT_SUCCESS); } } @@ -203,38 +203,38 @@ main(int argc, char *argv[]) /* launch writer */ /* ============= */ /* this process continues to launch the writer */ - HDprintf("%d: continue as the writer process\n", mypid); + printf("%d: continue as the writer process\n", mypid); if ((fapl = h5_fileaccess()) < 0) { - HDfprintf(stderr, "can't create write FAPL\n"); + fprintf(stderr, "can't create write FAPL\n"); Hgoto_error(1); } if (UC_opts.use_swmr) { if (H5Pset_libver_bounds(fapl, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0) { - HDfprintf(stderr, "can't set write FAPL libver bounds\n"); + fprintf(stderr, "can't set write FAPL libver bounds\n"); Hgoto_error(1); } } if ((fid = H5Fopen(UC_opts.filename, H5F_ACC_RDWR | (UC_opts.use_swmr ? H5F_ACC_SWMR_WRITE : 0), fapl)) < 0) { - HDfprintf(stderr, "H5Fopen failed\n"); + fprintf(stderr, "H5Fopen failed\n"); Hgoto_error(1); } if (write_uc_file(send_wait, fid, &UC_opts) < 0) { - HDfprintf(stderr, "write_uc_file encountered error\n"); + fprintf(stderr, "write_uc_file encountered error\n"); Hgoto_error(1); } if (H5Fclose(fid) < 0) { - HDfprintf(stderr, "Failed to close write\n"); + fprintf(stderr, "Failed to close write\n"); Hgoto_error(1); } if (H5Pclose(fapl) < 0) { - HDfprintf(stderr, "can't close write FAPL\n"); + fprintf(stderr, "can't close write FAPL\n"); Hgoto_error(1); } @@ -249,22 +249,22 @@ main(int argc, char *argv[]) if (WIFEXITED(child_status)) { if ((child_ret_value = WEXITSTATUS(child_status)) != 0) { - HDprintf("%d: child process exited with non-zero code (%d)\n", mypid, child_ret_value); + printf("%d: child process exited with non-zero code (%d)\n", mypid, child_ret_value); Hgoto_error(2); } } else { - HDprintf("%d: child process terminated abnormally\n", mypid); + printf("%d: child process terminated abnormally\n", mypid); Hgoto_error(2); } } done: if (ret_value != 0) { - HDprintf("Error(s) encountered\n"); + printf("Error(s) encountered\n"); } else { - HDprintf("All passed\n"); + printf("All passed\n"); } return (ret_value); @@ -275,7 +275,7 @@ done: int main(void) { - HDfprintf(stderr, "Non-POSIX platform. Skipping.\n"); + fprintf(stderr, "Non-POSIX platform. Skipping.\n"); return EXIT_SUCCESS; } /* end main() */ diff --git a/test/use_append_chunk_mirror.c b/test/use_append_chunk_mirror.c index 788cf83..e54e978 100644 --- a/test/use_append_chunk_mirror.c +++ b/test/use_append_chunk_mirror.c @@ -118,7 +118,7 @@ int setup_parameters(int argc, char *const argv[], options_t *opts) { /* use case defaults */ - HDmemset(opts, 0, sizeof(options_t)); + memset(opts, 0, sizeof(options_t)); opts->chunksize = Chunksize_DFT; opts->use_swmr = TRUE; opts->iterations = 1; @@ -173,8 +173,8 @@ main(int argc, char *argv[]) mirr_fa.handshake_port = SERVER_PORT; HDstrncpy(mirr_fa.remote_ip, SERVER_IP, H5FD_MIRROR_MAX_IP_LEN); - if (NULL == (split_fa = HDcalloc(1, sizeof(H5FD_splitter_vfd_config_t)))) { - HDfprintf(stderr, "can't allocate memory for splitter config\n"); + if (NULL == (split_fa = calloc(1, sizeof(H5FD_splitter_vfd_config_t)))) { + fprintf(stderr, "can't allocate memory for splitter config\n"); Hgoto_error(1); } @@ -201,16 +201,16 @@ main(int argc, char *argv[]) /* Create file */ /* =========== */ if (UC_opts.launch != UC_READER) { - HDprintf("Creating skeleton data file for test...\n"); + printf("Creating skeleton data file for test...\n"); /* Prepare mirror child driver */ mirr_fapl_id = H5Pcreate(H5P_FILE_ACCESS); if (mirr_fapl_id == H5I_INVALID_HID) { - HDfprintf(stderr, "can't create creation mirror FAPL\n"); + fprintf(stderr, "can't create creation mirror FAPL\n"); Hgoto_error(1); } if (H5Pset_fapl_mirror(mirr_fapl_id, &mirr_fa) < 0) { - HDfprintf(stderr, "can't set creation mirror FAPL\n"); + fprintf(stderr, "can't set creation mirror FAPL\n"); H5Eprint2(H5E_DEFAULT, stdout); Hgoto_error(1); } @@ -220,37 +220,37 @@ main(int argc, char *argv[]) split_fa->rw_fapl_id = H5P_DEFAULT; UC_opts.fapl_id = H5Pcreate(H5P_FILE_ACCESS); if (UC_opts.fapl_id == H5I_INVALID_HID) { - HDfprintf(stderr, "can't create creation FAPL\n"); + fprintf(stderr, "can't create creation FAPL\n"); Hgoto_error(1); } if (H5Pset_fapl_splitter(UC_opts.fapl_id, split_fa) < 0) { - HDfprintf(stderr, "can't set creation FAPL\n"); + fprintf(stderr, "can't set creation FAPL\n"); H5Eprint2(H5E_DEFAULT, stdout); Hgoto_error(1); } if (H5Pset_libver_bounds(UC_opts.fapl_id, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0) { - HDfprintf(stderr, "can't set creation FAPL libver bounds\n"); + fprintf(stderr, "can't set creation FAPL libver bounds\n"); Hgoto_error(1); } /* Create file */ if (create_uc_file(&UC_opts) < 0) { - HDfprintf(stderr, "***encounter error\n"); + fprintf(stderr, "***encounter error\n"); Hgoto_error(1); } else { - HDprintf("File created.\n"); + printf("File created.\n"); } /* Close FAPLs to prevent issues with forking later */ if (H5Pclose(UC_opts.fapl_id) < 0) { - HDfprintf(stderr, "can't close creation FAPL\n"); + fprintf(stderr, "can't close creation FAPL\n"); Hgoto_error(1); } UC_opts.fapl_id = H5I_INVALID_HID; if (H5Pclose(mirr_fapl_id) < 0) { - HDfprintf(stderr, "can't close creation mirror FAPL\n"); + fprintf(stderr, "can't close creation mirror FAPL\n"); Hgoto_error(1); } mirr_fapl_id = H5I_INVALID_HID; @@ -274,15 +274,15 @@ main(int argc, char *argv[]) /* child process -- launch the reader */ /* reader only opens the one file -- separate reader needed for mirrored file 'shinano.h5' */ if (0 == childpid) { - HDprintf("%d: launch reader process\n", mypid); + printf("%d: launch reader process\n", mypid); UC_opts.fapl_id = H5P_DEFAULT; if (read_uc_file(send_wait, &UC_opts) < 0) { - HDfprintf(stderr, "read_uc_file encountered error (%d)\n", mypid); - HDexit(1); + fprintf(stderr, "read_uc_file encountered error (%d)\n", mypid); + exit(1); } - HDexit(0); + exit(0); } } @@ -290,16 +290,16 @@ main(int argc, char *argv[]) /* launch writer */ /* ============= */ /* this process continues to launch the writer */ - HDprintf("%d: continue as the writer process\n", mypid); + printf("%d: continue as the writer process\n", mypid); /* Prepare mirror child driver */ mirr_fapl_id = H5Pcreate(H5P_FILE_ACCESS); if (mirr_fapl_id == H5I_INVALID_HID) { - HDfprintf(stderr, "can't create creation mirror FAPL\n"); + fprintf(stderr, "can't create creation mirror FAPL\n"); Hgoto_error(1); } if (H5Pset_fapl_mirror(mirr_fapl_id, &mirr_fa) < 0) { - HDfprintf(stderr, "can't set creation mirror FAPL\n"); + fprintf(stderr, "can't set creation mirror FAPL\n"); H5Eprint2(H5E_DEFAULT, stdout); Hgoto_error(1); } @@ -309,45 +309,45 @@ main(int argc, char *argv[]) split_fa->rw_fapl_id = H5P_DEFAULT; UC_opts.fapl_id = H5Pcreate(H5P_FILE_ACCESS); if (UC_opts.fapl_id == H5I_INVALID_HID) { - HDfprintf(stderr, "can't create creation FAPL\n"); + fprintf(stderr, "can't create creation FAPL\n"); Hgoto_error(1); } if (H5Pset_fapl_splitter(UC_opts.fapl_id, split_fa) < 0) { - HDfprintf(stderr, "can't set creation FAPL\n"); + fprintf(stderr, "can't set creation FAPL\n"); H5Eprint2(H5E_DEFAULT, stdout); Hgoto_error(1); } if (UC_opts.use_swmr) { if (H5Pset_libver_bounds(UC_opts.fapl_id, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0) { - HDfprintf(stderr, "can't set write FAPL libver bounds\n"); + fprintf(stderr, "can't set write FAPL libver bounds\n"); Hgoto_error(1); } } if ((fid = H5Fopen(UC_opts.filename, H5F_ACC_RDWR | (UC_opts.use_swmr ? H5F_ACC_SWMR_WRITE : 0), UC_opts.fapl_id)) < 0) { - HDfprintf(stderr, "H5Fopen failed\n"); + fprintf(stderr, "H5Fopen failed\n"); Hgoto_error(1); } if (write_uc_file(send_wait, fid, &UC_opts) < 0) { - HDfprintf(stderr, "write_uc_file encountered error\n"); + fprintf(stderr, "write_uc_file encountered error\n"); Hgoto_error(1); } if (H5Fclose(fid) < 0) { - HDfprintf(stderr, "Failed to close write\n"); + fprintf(stderr, "Failed to close write\n"); Hgoto_error(1); } if (H5Pclose(UC_opts.fapl_id) < 0) { - HDfprintf(stderr, "can't close write FAPL\n"); + fprintf(stderr, "can't close write FAPL\n"); Hgoto_error(1); } if (H5Pclose(mirr_fapl_id) < 0) { - HDfprintf(stderr, "can't close write mirror FAPL\n"); + fprintf(stderr, "can't close write mirror FAPL\n"); Hgoto_error(1); } @@ -362,24 +362,24 @@ main(int argc, char *argv[]) if (WIFEXITED(child_status)) { if ((child_ret_value = WEXITSTATUS(child_status)) != 0) { - HDprintf("%d: child process exited with non-zero code (%d)\n", mypid, child_ret_value); + printf("%d: child process exited with non-zero code (%d)\n", mypid, child_ret_value); Hgoto_error(2); } } else { - HDprintf("%d: child process terminated abnormally\n", mypid); + printf("%d: child process terminated abnormally\n", mypid); Hgoto_error(2); } } done: - HDfree(split_fa); + free(split_fa); if (ret_value != 0) { - HDprintf("Error(s) encountered\n"); + printf("Error(s) encountered\n"); } else { - HDprintf("All passed\n"); + printf("All passed\n"); } return ret_value; @@ -390,7 +390,7 @@ done: int main(void) { - HDfprintf(stderr, "Mirror VFD is not built. Skipping.\n"); + fprintf(stderr, "Mirror VFD is not built. Skipping.\n"); return EXIT_SUCCESS; } /* end main() */ @@ -401,7 +401,7 @@ main(void) int main(void) { - HDfprintf(stderr, "Non-POSIX platform. Skipping.\n"); + fprintf(stderr, "Non-POSIX platform. Skipping.\n"); return EXIT_SUCCESS; } /* end main() */ diff --git a/test/use_append_mchunks.c b/test/use_append_mchunks.c index 60f63c0..9f39455 100644 --- a/test/use_append_mchunks.c +++ b/test/use_append_mchunks.c @@ -70,7 +70,7 @@ int setup_parameters(int argc, char *const argv[], options_t *opts) { /* use case defaults */ - HDmemset(opts, 0, sizeof(options_t)); + memset(opts, 0, sizeof(options_t)); opts->chunksize = Chunksize_DFT; opts->use_swmr = 1; /* use swmr open */ opts->iterations = 1; @@ -135,25 +135,25 @@ main(int argc, char *argv[]) /* Create file */ /* =========== */ if (UC_opts.launch != UC_READER) { - HDprintf("Creating skeleton data file for test...\n"); + printf("Creating skeleton data file for test...\n"); if ((UC_opts.fapl_id = h5_fileaccess()) < 0) { - HDfprintf(stderr, "can't create creation FAPL\n"); + fprintf(stderr, "can't create creation FAPL\n"); Hgoto_error(1); } if (H5Pset_libver_bounds(UC_opts.fapl_id, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0) { - HDfprintf(stderr, "can't set creation FAPL libver bounds\n"); + fprintf(stderr, "can't set creation FAPL libver bounds\n"); Hgoto_error(1); } if (create_uc_file(&UC_opts) < 0) { - HDfprintf(stderr, "***encounter error\n"); + fprintf(stderr, "***encounter error\n"); Hgoto_error(1); } else { - HDprintf("File created.\n"); + printf("File created.\n"); } /* Close FAPL to prevent issues with forking later */ if (H5Pclose(UC_opts.fapl_id) < 0) { - HDfprintf(stderr, "can't close creation FAPL\n"); + fprintf(stderr, "can't close creation FAPL\n"); Hgoto_error(1); } UC_opts.fapl_id = H5I_INVALID_HID; @@ -176,20 +176,20 @@ main(int argc, char *argv[]) if (UC_opts.launch != UC_WRITER) { /* child process launch the reader */ if (0 == childpid) { - HDprintf("%d: launch reader process\n", mypid); + printf("%d: launch reader process\n", mypid); if ((UC_opts.fapl_id = h5_fileaccess()) < 0) { - HDfprintf(stderr, "can't create read FAPL\n"); - HDexit(EXIT_FAILURE); + fprintf(stderr, "can't create read FAPL\n"); + exit(EXIT_FAILURE); } if (read_uc_file(send_wait, &UC_opts) < 0) { - HDfprintf(stderr, "read_uc_file encountered error\n"); - HDexit(EXIT_FAILURE); + fprintf(stderr, "read_uc_file encountered error\n"); + exit(EXIT_FAILURE); } if (H5Pclose(UC_opts.fapl_id) < 0) { - HDfprintf(stderr, "can't close read FAPL\n"); - HDexit(EXIT_FAILURE); + fprintf(stderr, "can't close read FAPL\n"); + exit(EXIT_FAILURE); } - HDexit(EXIT_SUCCESS); + exit(EXIT_SUCCESS); } } @@ -197,39 +197,39 @@ main(int argc, char *argv[]) /* launch writer */ /* ============= */ /* this process continues to launch the writer */ - HDprintf("%d: continue as the writer process\n", mypid); + printf("%d: continue as the writer process\n", mypid); /* Set the file access property list */ if ((fapl = h5_fileaccess()) < 0) { - HDfprintf(stderr, "can't get write FAPL\n"); + fprintf(stderr, "can't get write FAPL\n"); Hgoto_error(1); } if (UC_opts.use_swmr) { if (H5Pset_libver_bounds(fapl, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0) { - HDfprintf(stderr, "can't set write FAPL libver bounds\n"); + fprintf(stderr, "can't set write FAPL libver bounds\n"); Hgoto_error(1); } } if ((fid = H5Fopen(UC_opts.filename, H5F_ACC_RDWR | (UC_opts.use_swmr ? H5F_ACC_SWMR_WRITE : 0), fapl)) < 0) { - HDfprintf(stderr, "H5Fopen failed\n"); + fprintf(stderr, "H5Fopen failed\n"); Hgoto_error(1); } if (write_uc_file(send_wait, fid, &UC_opts) < 0) { - HDfprintf(stderr, "write_uc_file encountered error\n"); + fprintf(stderr, "write_uc_file encountered error\n"); Hgoto_error(1); } if (H5Fclose(fid) < 0) { - HDfprintf(stderr, "Failed to close file id\n"); + fprintf(stderr, "Failed to close file id\n"); Hgoto_error(1); } if (H5Pclose(fapl) < 0) { - HDfprintf(stderr, "can't close write FAPL\n"); + fprintf(stderr, "can't close write FAPL\n"); Hgoto_error(1); } @@ -244,22 +244,22 @@ main(int argc, char *argv[]) if (WIFEXITED(child_status)) { if ((child_ret_value = WEXITSTATUS(child_status)) != 0) { - HDprintf("%d: child process exited with non-zero code (%d)\n", mypid, child_ret_value); + printf("%d: child process exited with non-zero code (%d)\n", mypid, child_ret_value); Hgoto_error(1); } } else { - HDprintf("%d: child process terminated abnormally\n", mypid); + printf("%d: child process terminated abnormally\n", mypid); Hgoto_error(2); } } done: if (ret_value != 0) { - HDprintf("Error(s) encountered\n"); + printf("Error(s) encountered\n"); } else { - HDprintf("All passed\n"); + printf("All passed\n"); } return (ret_value); @@ -270,7 +270,7 @@ done: int main(void) { - HDfprintf(stderr, "Non-POSIX platform. Skipping.\n"); + fprintf(stderr, "Non-POSIX platform. Skipping.\n"); return EXIT_SUCCESS; } /* end main() */ diff --git a/test/use_common.c b/test/use_common.c index 7b5df53..68b7d00 100644 --- a/test/use_common.c +++ b/test/use_common.c @@ -27,18 +27,18 @@ void usage(const char *prog) { - HDfprintf(stderr, "usage: %s [OPTIONS]\n", prog); - HDfprintf(stderr, " OPTIONS\n"); - HDfprintf(stderr, " -h, --help Print a usage message and exit\n"); - HDfprintf(stderr, " -f FN Test file name [default: %s.h5]\n", prog); - HDfprintf(stderr, - " -i N, --iteration=N Number of iterations to repeat the whole thing. [default: 1]\n"); - HDfprintf(stderr, " -l w|r launch writer or reader only. [default: launch both]\n"); - HDfprintf(stderr, " -n N, --nplanes=N Number of planes to write/read. [default: 1000]\n"); - HDfprintf(stderr, " -s N, --swmr=N Use SWMR mode (0: no, non-0: yes) default is yes\n"); - HDfprintf(stderr, " -z N, --chunksize=N Chunk size [default: %d]\n", Chunksize_DFT); - HDfprintf(stderr, " -y N, --chunkplanes=N Number of planes per chunk [default: 1]\n"); - HDfprintf(stderr, "\n"); + fprintf(stderr, "usage: %s [OPTIONS]\n", prog); + fprintf(stderr, " OPTIONS\n"); + fprintf(stderr, " -h, --help Print a usage message and exit\n"); + fprintf(stderr, " -f FN Test file name [default: %s.h5]\n", prog); + fprintf(stderr, + " -i N, --iteration=N Number of iterations to repeat the whole thing. [default: 1]\n"); + fprintf(stderr, " -l w|r launch writer or reader only. [default: launch both]\n"); + fprintf(stderr, " -n N, --nplanes=N Number of planes to write/read. [default: 1000]\n"); + fprintf(stderr, " -s N, --swmr=N Use SWMR mode (0: no, non-0: yes) default is yes\n"); + fprintf(stderr, " -z N, --chunksize=N Chunk size [default: %d]\n", Chunksize_DFT); + fprintf(stderr, " -y N, --chunkplanes=N Number of planes per chunk [default: 1]\n"); + fprintf(stderr, "\n"); } /* end usage() */ /* ---------------------------------------------------------------------------- @@ -66,14 +66,14 @@ parse_option(int argc, char *const argv[], options_t *opts) switch (c) { case 'h': usage(opts->progname); - HDexit(EXIT_SUCCESS); + exit(EXIT_SUCCESS); break; case 'f': /* usecase data file name */ opts->filename = HDstrdup(optarg); break; case 'i': /* iterations */ - if ((opts->iterations = HDatoi(optarg)) <= 0) { - HDfprintf(stderr, "bad iterations number %s, must be a positive integer\n", optarg); + if ((opts->iterations = atoi(optarg)) <= 0) { + fprintf(stderr, "bad iterations number %s, must be a positive integer\n", optarg); usage(opts->progname); Hgoto_error(-1); } @@ -87,7 +87,7 @@ parse_option(int argc, char *const argv[], options_t *opts) opts->launch = UC_WRITER; break; default: - HDfprintf(stderr, "launch value(%c) should be w or r only.\n", *optarg); + fprintf(stderr, "launch value(%c) should be w or r only.\n", *optarg); usage(opts->progname); Hgoto_error(-1); break; @@ -95,15 +95,15 @@ parse_option(int argc, char *const argv[], options_t *opts) break; case 'n': /* number of planes to write/read */ if ((opts->nplanes = HDstrtoul(optarg, NULL, 0)) <= 0) { - HDfprintf(stderr, "bad number of planes %s, must be a positive integer\n", optarg); + fprintf(stderr, "bad number of planes %s, must be a positive integer\n", optarg); usage(opts->progname); Hgoto_error(-1); } break; case 's': /* use swmr file open mode */ - use_swmr = HDatoi(optarg); + use_swmr = atoi(optarg); if (use_swmr != 0 && use_swmr != 1) { - HDfprintf(stderr, "swmr value should be 0(no) or 1(yes)\n"); + fprintf(stderr, "swmr value should be 0(no) or 1(yes)\n"); usage(opts->progname); Hgoto_error(-1); } @@ -111,25 +111,25 @@ parse_option(int argc, char *const argv[], options_t *opts) break; case 'y': /* Number of planes per chunk */ if ((opts->chunkplanes = HDstrtoul(optarg, NULL, 0)) <= 0) { - HDfprintf(stderr, "bad number of planes per chunk %s, must be a positive integer\n", - optarg); + fprintf(stderr, "bad number of planes per chunk %s, must be a positive integer\n", + optarg); usage(opts->progname); Hgoto_error(-1); } break; case 'z': /* size of chunk=(z,z) */ if ((opts->chunksize = HDstrtoull(optarg, NULL, 0)) <= 0) { - HDfprintf(stderr, "bad chunksize %s, must be a positive integer\n", optarg); + fprintf(stderr, "bad chunksize %s, must be a positive integer\n", optarg); usage(opts->progname); Hgoto_error(-1); } break; case '?': - HDfprintf(stderr, "getopt returned '%c'.\n", c); + fprintf(stderr, "getopt returned '%c'.\n", c); Hgoto_error(-1); default: - HDfprintf(stderr, "getopt returned unexpected value.\n"); - HDfprintf(stderr, "Unexpected value is %d\n", c); + fprintf(stderr, "getopt returned unexpected value.\n"); + fprintf(stderr, "Unexpected value is %d\n", c); Hgoto_error(-1); } /* end switch (argument symbol) */ } /* end while (there are still arguments) */ @@ -137,8 +137,8 @@ parse_option(int argc, char *const argv[], options_t *opts) /* set test file name if not given */ if (!opts->filename) { /* default data file name is <progname>.h5 */ - if ((opts->filename = (char *)HDmalloc(HDstrlen(opts->progname) + 4)) == NULL) { - HDfprintf(stderr, "malloc: failed\n"); + if ((opts->filename = (char *)malloc(HDstrlen(opts->progname) + 4)) == NULL) { + fprintf(stderr, "malloc: failed\n"); Hgoto_error(-1); } HDstrcpy(opts->filename, opts->progname); @@ -156,31 +156,31 @@ done: void show_parameters(options_t *opts) { - HDprintf("===Parameters used:===\n"); - HDprintf("chunk dims=(%llu, %llu, %llu)\n", (unsigned long long)opts->chunkdims[0], - (unsigned long long)opts->chunkdims[1], (unsigned long long)opts->chunkdims[2]); - HDprintf("dataset max dims=(%llu, %llu, %llu)\n", (unsigned long long)opts->max_dims[0], - (unsigned long long)opts->max_dims[1], (unsigned long long)opts->max_dims[2]); - HDprintf("number of planes to write=%llu\n", (unsigned long long)opts->nplanes); - HDprintf("using SWMR mode=%s\n", opts->use_swmr ? "yes(1)" : "no(0)"); - HDprintf("data filename=%s\n", opts->filename); - HDprintf("launch part="); + printf("===Parameters used:===\n"); + printf("chunk dims=(%llu, %llu, %llu)\n", (unsigned long long)opts->chunkdims[0], + (unsigned long long)opts->chunkdims[1], (unsigned long long)opts->chunkdims[2]); + printf("dataset max dims=(%llu, %llu, %llu)\n", (unsigned long long)opts->max_dims[0], + (unsigned long long)opts->max_dims[1], (unsigned long long)opts->max_dims[2]); + printf("number of planes to write=%llu\n", (unsigned long long)opts->nplanes); + printf("using SWMR mode=%s\n", opts->use_swmr ? "yes(1)" : "no(0)"); + printf("data filename=%s\n", opts->filename); + printf("launch part="); switch (opts->launch) { case UC_READWRITE: - HDprintf("Reader/Writer\n"); + printf("Reader/Writer\n"); break; case UC_WRITER: - HDprintf("Writer\n"); + printf("Writer\n"); break; case UC_READER: - HDprintf("Reader\n"); + printf("Reader\n"); break; default: /* should not happen */ - HDprintf("Illegal part(%d)\n", opts->launch); + printf("Illegal part(%d)\n", opts->launch); } - HDprintf("number of iterations=%d (not used yet)\n", opts->iterations); - HDprintf("===Parameters shown===\n"); + printf("number of iterations=%d (not used yet)\n", opts->iterations); + printf("===Parameters shown===\n"); } /* end show_parameters() */ /* ---------------------------------------------------------------------------- @@ -230,7 +230,7 @@ create_uc_file(options_t *opts) if (H5Dget_chunk_index_type(dsid, &idx_type) < 0) return -1; if (idx_type == H5D_CHUNK_IDX_BTREE) { - HDfprintf(stderr, "ERROR: Chunk index is version 1 B-tree: aborting.\n"); + fprintf(stderr, "ERROR: Chunk index is version 1 B-tree: aborting.\n"); return -1; } @@ -280,29 +280,29 @@ write_uc_file(hbool_t tosend, hid_t file_id, options_t *opts) /* Open the dataset of the program name */ if ((dsid = H5Dopen2(file_id, opts->progname, H5P_DEFAULT)) < 0) { - HDfprintf(stderr, "H5Dopen2 failed\n"); + fprintf(stderr, "H5Dopen2 failed\n"); return -1; } /* Find chunksize used */ if ((dcpl = H5Dget_create_plist(dsid)) < 0) { - HDfprintf(stderr, "H5Dget_create_plist failed\n"); + fprintf(stderr, "H5Dget_create_plist failed\n"); return -1; } if (H5D_CHUNKED != H5Pget_layout(dcpl)) { - HDfprintf(stderr, "storage layout is not chunked\n"); + fprintf(stderr, "storage layout is not chunked\n"); return -1; } if ((rank = H5Pget_chunk(dcpl, 3, chunk_dims)) != 3) { - HDfprintf(stderr, "storage rank is not 3\n"); + fprintf(stderr, "storage rank is not 3\n"); return -1; } /* verify chunk_dims against set parameters */ if (chunk_dims[0] != opts->chunkdims[0] || chunk_dims[1] != cz || chunk_dims[2] != cz) { - HDfprintf(stderr, "chunk size is not as expected. Got dims=(%llu,%llu,%llu)\n", - (unsigned long long)chunk_dims[0], (unsigned long long)chunk_dims[1], - (unsigned long long)chunk_dims[2]); + fprintf(stderr, "chunk size is not as expected. Got dims=(%llu,%llu,%llu)\n", + (unsigned long long)chunk_dims[0], (unsigned long long)chunk_dims[1], + (unsigned long long)chunk_dims[2]); return -1; } @@ -310,8 +310,8 @@ write_uc_file(hbool_t tosend, hid_t file_id, options_t *opts) memdims[0] = 1; memdims[1] = opts->dims[1]; memdims[2] = opts->dims[2]; - if ((buffer = (UC_CTYPE *)HDmalloc((size_t)memdims[1] * (size_t)memdims[2] * sizeof(UC_CTYPE))) == NULL) { - HDfprintf(stderr, "malloc: failed\n"); + if ((buffer = (UC_CTYPE *)malloc((size_t)memdims[1] * (size_t)memdims[2] * sizeof(UC_CTYPE))) == NULL) { + fprintf(stderr, "malloc: failed\n"); return -1; } @@ -321,29 +321,29 @@ write_uc_file(hbool_t tosend, hid_t file_id, options_t *opts) f_sid = H5Dget_space(dsid); /* Get filespace handle first. */ rank = H5Sget_simple_extent_ndims(f_sid); if (rank != UC_RANK) { - HDfprintf(stderr, "rank(%d) of dataset does not match\n", rank); - HDfree(buffer); + fprintf(stderr, "rank(%d) of dataset does not match\n", rank); + free(buffer); return -1; } if (H5Sget_simple_extent_dims(f_sid, dims, NULL) < 0) { - HDfprintf(stderr, "H5Sget_simple_extent_dims got error\n"); - HDfree(buffer); + fprintf(stderr, "H5Sget_simple_extent_dims got error\n"); + free(buffer); return -1; } - HDprintf("dataset rank %d, dimensions %llu x %llu x %llu\n", rank, (unsigned long long)(dims[0]), - (unsigned long long)(dims[1]), (unsigned long long)(dims[2])); + printf("dataset rank %d, dimensions %llu x %llu x %llu\n", rank, (unsigned long long)(dims[0]), + (unsigned long long)(dims[1]), (unsigned long long)(dims[2])); /* verify that file space dims are as expected and are consistent with memory space dims */ if (dims[0] != 0 || dims[1] != memdims[1] || dims[2] != memdims[2]) { - HDfprintf(stderr, "dataset is not empty. Got dims=(%llu,%llu,%llu)\n", (unsigned long long)dims[0], - (unsigned long long)dims[1], (unsigned long long)dims[2]); - HDfree(buffer); + fprintf(stderr, "dataset is not empty. Got dims=(%llu,%llu,%llu)\n", (unsigned long long)dims[0], + (unsigned long long)dims[1], (unsigned long long)dims[2]); + free(buffer); return -1; } /* setup mem-space for buffer */ if ((m_sid = H5Screate_simple(rank, memdims, NULL)) < 0) { - HDfprintf(stderr, "H5Screate_simple for memory failed\n"); - HDfree(buffer); + fprintf(stderr, "H5Screate_simple for memory failed\n"); + free(buffer); return -1; } @@ -363,8 +363,8 @@ write_uc_file(hbool_t tosend, hid_t file_id, options_t *opts) /* Cork the dataset's metadata in the cache, if SWMR is enabled */ if (opts->use_swmr) { if (H5Odisable_mdc_flushes(dsid) < 0) { - HDfprintf(stderr, "H5Odisable_mdc_flushes failed\n"); - HDfree(buffer); + fprintf(stderr, "H5Odisable_mdc_flushes failed\n"); + free(buffer); return -1; } } @@ -372,62 +372,62 @@ write_uc_file(hbool_t tosend, hid_t file_id, options_t *opts) /* extend the dataset by one for new plane */ dims[0] = i + 1; if (H5Dset_extent(dsid, dims) < 0) { - HDfprintf(stderr, "H5Dset_extent failed\n"); - HDfree(buffer); + fprintf(stderr, "H5Dset_extent failed\n"); + free(buffer); return -1; } /* Get the dataset's dataspace */ if ((f_sid = H5Dget_space(dsid)) < 0) { - HDfprintf(stderr, "H5Dset_extent failed\n"); - HDfree(buffer); + fprintf(stderr, "H5Dset_extent failed\n"); + free(buffer); return -1; } start[0] = i; /* Choose the next plane to write */ if (H5Sselect_hyperslab(f_sid, H5S_SELECT_SET, start, NULL, count, NULL) < 0) { - HDfprintf(stderr, "Failed H5Sselect_hyperslab\n"); - HDfree(buffer); + fprintf(stderr, "Failed H5Sselect_hyperslab\n"); + free(buffer); return -1; } /* Write plane to the dataset */ if (H5Dwrite(dsid, UC_DATATYPE, m_sid, f_sid, H5P_DEFAULT, buffer) < 0) { - HDfprintf(stderr, "Failed H5Dwrite\n"); - HDfree(buffer); + fprintf(stderr, "Failed H5Dwrite\n"); + free(buffer); return -1; } /* Uncork the dataset's metadata from the cache, if SWMR is enabled */ if (opts->use_swmr) { if (H5Oenable_mdc_flushes(dsid) < 0) { - HDfprintf(stderr, "H5Oenable_mdc_flushes failed\n"); - HDfree(buffer); + fprintf(stderr, "H5Oenable_mdc_flushes failed\n"); + free(buffer); return -1; } } /* flush file to make the just written plane available. */ if (H5Dflush(dsid) < 0) { - HDfprintf(stderr, "Failed to H5Fflush file\n"); - HDfree(buffer); + fprintf(stderr, "Failed to H5Fflush file\n"); + free(buffer); return -1; } } /* end for each plane to write */ /* Done writing. Free/Close all resources including data file */ - HDfree(buffer); + free(buffer); if (H5Dclose(dsid) < 0) { - HDfprintf(stderr, "Failed to close datasete\n"); + fprintf(stderr, "Failed to close datasete\n"); return -1; } if (H5Sclose(m_sid) < 0) { - HDfprintf(stderr, "Failed to close memory space\n"); + fprintf(stderr, "Failed to close memory space\n"); return -1; } if (H5Sclose(f_sid) < 0) { - HDfprintf(stderr, "Failed to close file space\n"); + fprintf(stderr, "Failed to close file space\n"); return -1; } @@ -466,19 +466,19 @@ read_uc_file(hbool_t towait, options_t *opts) /* Before reading, wait for the message that H5Fopen is complete--file lock is released */ if (towait && h5_wait_message(WRITER_MESSAGE) < 0) { - HDfprintf(stderr, "Cannot find writer message file...failed\n"); + fprintf(stderr, "Cannot find writer message file...failed\n"); return -1; } - HDfprintf(stderr, "Opening to read %s\n", opts->filename); + fprintf(stderr, "Opening to read %s\n", opts->filename); if ((fid = H5Fopen(opts->filename, H5F_ACC_RDONLY | (opts->use_swmr ? H5F_ACC_SWMR_READ : 0), opts->fapl_id)) < 0) { - HDfprintf(stderr, "H5Fopen failed\n"); + fprintf(stderr, "H5Fopen failed\n"); return -1; } if ((dsid = H5Dopen2(fid, opts->progname, H5P_DEFAULT)) < 0) { - HDfprintf(stderr, "H5Dopen2 failed\n"); + fprintf(stderr, "H5Dopen2 failed\n"); return -1; } @@ -486,8 +486,8 @@ read_uc_file(hbool_t towait, options_t *opts) memdims[0] = 1; memdims[1] = opts->dims[1]; memdims[2] = opts->dims[2]; - if ((buffer = (UC_CTYPE *)HDmalloc((size_t)memdims[1] * (size_t)memdims[2] * sizeof(UC_CTYPE))) == NULL) { - HDfprintf(stderr, "malloc: failed\n"); + if ((buffer = (UC_CTYPE *)malloc((size_t)memdims[1] * (size_t)memdims[2] * sizeof(UC_CTYPE))) == NULL) { + fprintf(stderr, "malloc: failed\n"); return -1; } @@ -498,31 +498,31 @@ read_uc_file(hbool_t towait, options_t *opts) f_sid = H5Dget_space(dsid); /* Get filespace handle first. */ rank = H5Sget_simple_extent_ndims(f_sid); if (rank != UC_RANK) { - HDfprintf(stderr, "rank(%d) of dataset does not match\n", rank); - HDfree(buffer); + fprintf(stderr, "rank(%d) of dataset does not match\n", rank); + free(buffer); return -1; } if (H5Sget_simple_extent_dims(f_sid, dims, NULL) < 0) { - HDfprintf(stderr, "H5Sget_simple_extent_dims got error\n"); - HDfree(buffer); + fprintf(stderr, "H5Sget_simple_extent_dims got error\n"); + free(buffer); return -1; } - HDprintf("dataset rank %d, dimensions %llu x %llu x %llu\n", rank, (unsigned long long)(dims[0]), - (unsigned long long)(dims[1]), (unsigned long long)(dims[2])); + printf("dataset rank %d, dimensions %llu x %llu x %llu\n", rank, (unsigned long long)(dims[0]), + (unsigned long long)(dims[1]), (unsigned long long)(dims[2])); /* verify that file space dims are as expected and are consistent with memory space dims */ if (dims[1] != memdims[1] || dims[2] != memdims[2]) { - HDfprintf(stderr, "dataset dimension is not as expected. Got dims=(%llu,%llu,%llu)\n", - (unsigned long long)dims[0], (unsigned long long)dims[1], (unsigned long long)dims[2]); - HDfprintf(stderr, "But memdims=(%llu,%llu,%llu)\n", (unsigned long long)memdims[0], - (unsigned long long)memdims[1], (unsigned long long)memdims[2]); - HDfree(buffer); + fprintf(stderr, "dataset dimension is not as expected. Got dims=(%llu,%llu,%llu)\n", + (unsigned long long)dims[0], (unsigned long long)dims[1], (unsigned long long)dims[2]); + fprintf(stderr, "But memdims=(%llu,%llu,%llu)\n", (unsigned long long)memdims[0], + (unsigned long long)memdims[1], (unsigned long long)memdims[2]); + free(buffer); return -1; } /* Setup mem-space for buffer */ if ((m_sid = H5Screate_simple(rank, memdims, NULL)) < 0) { - HDfprintf(stderr, "H5Screate_simple for memory failed\n"); - HDfree(buffer); + fprintf(stderr, "H5Screate_simple for memory failed\n"); + free(buffer); return -1; } @@ -537,24 +537,24 @@ read_uc_file(hbool_t towait, options_t *opts) if (nplanes_seen < dims[0]) { if (loops_waiting_for_plane) { /* end the previous message */ - HDprintf("\n"); + printf("\n"); loops_waiting_for_plane = 0; } - HDprintf("reading planes %llu to %llu\n", (unsigned long long)nplanes_seen, - (unsigned long long)dims[0]); + printf("reading planes %llu to %llu\n", (unsigned long long)nplanes_seen, + (unsigned long long)dims[0]); } else { if (loops_waiting_for_plane) { - HDprintf("."); + printf("."); if (loops_waiting_for_plane >= 30) { - HDfprintf(stderr, "waited too long for new plane, quit.\n"); - HDfree(buffer); + fprintf(stderr, "waited too long for new plane, quit.\n"); + free(buffer); return -1; } } else { /* print mesg only the first time; dots still no new plane */ - HDprintf("waiting for new planes to read "); + printf("waiting for new planes to read "); } loops_waiting_for_plane++; /* pause for a second */ @@ -565,23 +565,23 @@ read_uc_file(hbool_t towait, options_t *opts) /* read planes between last old nplanes and current extent */ /* Get the dataset's dataspace */ if ((f_sid = H5Dget_space(dsid)) < 0) { - HDfprintf(stderr, "H5Dget_space failed\n"); - HDfree(buffer); + fprintf(stderr, "H5Dget_space failed\n"); + free(buffer); return -1; } start[0] = nplane; /* Choose the next plane to read */ if (H5Sselect_hyperslab(f_sid, H5S_SELECT_SET, start, NULL, count, NULL) < 0) { - HDfprintf(stderr, "H5Sselect_hyperslab failed\n"); - HDfree(buffer); + fprintf(stderr, "H5Sselect_hyperslab failed\n"); + free(buffer); return -1; } /* Read the plane from the dataset */ if (H5Dread(dsid, UC_DATATYPE, m_sid, f_sid, H5P_DEFAULT, buffer) < 0) { - HDfprintf(stderr, "H5Dread failed\n"); - HDfree(buffer); + fprintf(stderr, "H5Dread failed\n"); + free(buffer); return -1; } @@ -592,17 +592,17 @@ read_uc_file(hbool_t towait, options_t *opts) for (k = 0; k < dims[2]; k++) { if ((hsize_t)*bufptr++ != nplane) { if (++nerrs < ErrorReportMax) { - HDfprintf(stderr, "found error %llu plane(%llu,%llu), expected %llu, got %d\n", - (unsigned long long)nplane, (unsigned long long)j, - (unsigned long long)k, (unsigned long long)nplane, (int)*(bufptr - 1)); + fprintf(stderr, "found error %llu plane(%llu,%llu), expected %llu, got %d\n", + (unsigned long long)nplane, (unsigned long long)j, (unsigned long long)k, + (unsigned long long)nplane, (int)*(bufptr - 1)); } /* end if should print error */ } /* end if value mismatch */ } /* end for plane second dimension */ } /* end for plane first dimension */ if (nerrs) { nreadererr++; - HDfprintf(stderr, "found %d unexpected values in plane %llu\n", nerrs, - (unsigned long long)nplane); + fprintf(stderr, "found %d unexpected values in plane %llu\n", nerrs, + (unsigned long long)nplane); } } /* end for each plane added since last read */ @@ -612,19 +612,19 @@ read_uc_file(hbool_t towait, options_t *opts) H5Drefresh(dsid); f_sid = H5Dget_space(dsid); /* Get filespace handle first. */ if (H5Sget_simple_extent_dims(f_sid, dims, NULL) < 0) { - HDfprintf(stderr, "H5Sget_simple_extent_dims got error\n"); - HDfree(buffer); + fprintf(stderr, "H5Sget_simple_extent_dims got error\n"); + free(buffer); return -1; } } /* end while (expecting more planes to read) */ if (H5Fclose(fid) < 0) { - HDfprintf(stderr, "H5Fclose failed\n"); - HDfree(buffer); + fprintf(stderr, "H5Fclose failed\n"); + free(buffer); return -1; } - HDfree(buffer); + free(buffer); if (nreadererr) return -1; diff --git a/test/use_disable_mdc_flushes.c b/test/use_disable_mdc_flushes.c index ea674ec..cf60e56 100644 --- a/test/use_disable_mdc_flushes.c +++ b/test/use_disable_mdc_flushes.c @@ -70,15 +70,15 @@ static int setup_parameters(int argc, char *const argv[]); static void usage(const char *prog) { - HDfprintf(stderr, "usage: %s [OPTIONS]\n", prog); - HDfprintf(stderr, " OPTIONS\n"); - HDfprintf(stderr, " -h Print a usage message and exit\n"); - HDfprintf(stderr, " -f FN Test file name [default: %s.h5]\n", prog); - HDfprintf(stderr, " -n N Number of planes to write. [default: 1000]\n"); - HDfprintf(stderr, " -s N Use SWMR mode (0: no, non-0: yes) default is yes\n"); - HDfprintf(stderr, " -z N Chunk size [default: %d]\n", Chunksize_DFT); - HDfprintf(stderr, " -y N Number of planes per chunk [default: 1]\n"); - HDfprintf(stderr, "\n"); + fprintf(stderr, "usage: %s [OPTIONS]\n", prog); + fprintf(stderr, " OPTIONS\n"); + fprintf(stderr, " -h Print a usage message and exit\n"); + fprintf(stderr, " -f FN Test file name [default: %s.h5]\n", prog); + fprintf(stderr, " -n N Number of planes to write. [default: 1000]\n"); + fprintf(stderr, " -s N Use SWMR mode (0: no, non-0: yes) default is yes\n"); + fprintf(stderr, " -z N Chunk size [default: %d]\n", Chunksize_DFT); + fprintf(stderr, " -y N Number of planes per chunk [default: 1]\n"); + fprintf(stderr, "\n"); } /* usage() */ /* @@ -102,46 +102,46 @@ parse_option(int argc, char *const argv[]) switch (c) { case 'h': usage(progname_g); - HDexit(EXIT_SUCCESS); + exit(EXIT_SUCCESS); break; case 'f': /* usecase data file name */ filename_g = optarg; break; case 'n': /* number of planes to write/read */ - if ((nplanes_g = (hsize_t)HDatoi(optarg)) <= 0) { - HDfprintf(stderr, "bad number of planes %s, must be a positive integer\n", optarg); + if ((nplanes_g = (hsize_t)atoi(optarg)) <= 0) { + fprintf(stderr, "bad number of planes %s, must be a positive integer\n", optarg); usage(progname_g); Hgoto_error(-1); }; break; case 's': /* use swmr file open mode */ - if ((use_swmr_g = HDatoi(optarg)) < 0) { - HDfprintf(stderr, "swmr value should be 0(no) or 1(yes)\n"); + if ((use_swmr_g = atoi(optarg)) < 0) { + fprintf(stderr, "swmr value should be 0(no) or 1(yes)\n"); usage(progname_g); Hgoto_error(-1); }; break; case 'y': /* Number of planes per chunk */ - if ((chunkplanes_g = HDatoi(optarg)) <= 0) { - HDfprintf(stderr, "bad number of planes per chunk %s, must be a positive integer\n", - optarg); + if ((chunkplanes_g = atoi(optarg)) <= 0) { + fprintf(stderr, "bad number of planes per chunk %s, must be a positive integer\n", + optarg); usage(progname_g); Hgoto_error(-1); }; break; case 'z': /* size of chunk=(z,z) */ - if ((chunksize_g = HDatoi(optarg)) <= 0) { - HDfprintf(stderr, "bad chunksize %s, must be a positive integer\n", optarg); + if ((chunksize_g = atoi(optarg)) <= 0) { + fprintf(stderr, "bad chunksize %s, must be a positive integer\n", optarg); usage(progname_g); Hgoto_error(-1); }; break; case '?': - HDfprintf(stderr, "getopt returned '%c'.\n", c); + fprintf(stderr, "getopt returned '%c'.\n", c); Hgoto_error(-1); default: - HDfprintf(stderr, "getopt returned unexpected value.\n"); - HDfprintf(stderr, "Unexpected value is %d\n", c); + fprintf(stderr, "getopt returned unexpected value.\n"); + fprintf(stderr, "Unexpected value is %d\n", c); Hgoto_error(-1); } } @@ -149,8 +149,8 @@ parse_option(int argc, char *const argv[]) /* set test file name if not given */ if (!filename_g) { /* default data file name is <progname>.h5 */ - if ((filename_g = (char *)HDmalloc(HDstrlen(progname_g) + 4)) == NULL) { - HDfprintf(stderr, "malloc: failed\n"); + if ((filename_g = (char *)malloc(HDstrlen(progname_g) + 4)) == NULL) { + fprintf(stderr, "malloc: failed\n"); Hgoto_error(-1); }; HDstrcpy(filename_g, progname_g); @@ -166,15 +166,15 @@ done: static void show_parameters(void) { - HDprintf("===Parameters used:===\n"); - HDprintf("chunk dims=(%llu, %llu, %llu)\n", (unsigned long long)chunkdims_g[0], - (unsigned long long)chunkdims_g[1], (unsigned long long)chunkdims_g[2]); - HDprintf("dataset max dims=(%llu, %llu, %llu)\n", (unsigned long long)max_dims_g[0], - (unsigned long long)max_dims_g[1], (unsigned long long)max_dims_g[2]); - HDprintf("number of planes to write=%llu\n", (unsigned long long)nplanes_g); - HDprintf("using SWMR mode=%s\n", use_swmr_g ? "yes(1)" : "no(0)"); - HDprintf("data filename=%s\n", filename_g); - HDprintf("===Parameters shown===\n"); + printf("===Parameters used:===\n"); + printf("chunk dims=(%llu, %llu, %llu)\n", (unsigned long long)chunkdims_g[0], + (unsigned long long)chunkdims_g[1], (unsigned long long)chunkdims_g[2]); + printf("dataset max dims=(%llu, %llu, %llu)\n", (unsigned long long)max_dims_g[0], + (unsigned long long)max_dims_g[1], (unsigned long long)max_dims_g[2]); + printf("number of planes to write=%llu\n", (unsigned long long)nplanes_g); + printf("using SWMR mode=%s\n", use_swmr_g ? "yes(1)" : "no(0)"); + printf("data filename=%s\n", filename_g); + printf("===Parameters shown===\n"); } /* show_parameters() */ /* @@ -263,7 +263,7 @@ create_file(void) if (H5D__layout_idx_type_test(dsid, &idx_type) < 0) return -1; if (idx_type == H5D_CHUNK_IDX_BTREE) { - HDfprintf(stderr, "ERROR: Chunk index is version 1 B-tree: aborting.\n"); + fprintf(stderr, "ERROR: Chunk index is version 1 B-tree: aborting.\n"); return -1; } @@ -320,51 +320,51 @@ write_file(void) if (H5Pset_libver_bounds(fapl, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0) return -1; if ((fid = H5Fopen(name, H5F_ACC_RDWR | (use_swmr_g ? H5F_ACC_SWMR_WRITE : 0), fapl)) < 0) { - HDfprintf(stderr, "H5Fopen failed\n"); + fprintf(stderr, "H5Fopen failed\n"); return -1; } /* Open the dataset of the program name */ if ((dsid = H5Dopen2(fid, progname_g, H5P_DEFAULT)) < 0) { - HDfprintf(stderr, "H5Dopen2 failed\n"); + fprintf(stderr, "H5Dopen2 failed\n"); return -1; } /* Disabled mdc flushed for the dataset */ if (H5Odisable_mdc_flushes(dsid) < 0) { - HDfprintf(stderr, "H5Odisable_mdc_flushes failed\n"); + fprintf(stderr, "H5Odisable_mdc_flushes failed\n"); return -1; } /* Get mdc disabled status of the dataset */ if (H5Oare_mdc_flushes_disabled(dsid, &disabled) < 0) { - HDfprintf(stderr, "H5Oare_mdc_flushes_disabled failed\n"); + fprintf(stderr, "H5Oare_mdc_flushes_disabled failed\n"); return -1; } else if (disabled) - HDprintf("Dataset has disabled mdc flushes.\n"); + printf("Dataset has disabled mdc flushes.\n"); else - HDprintf("Dataset should have disabled its mdc flushes.\n"); + printf("Dataset should have disabled its mdc flushes.\n"); /* Find chunksize used */ if ((dcpl = H5Dget_create_plist(dsid)) < 0) { - HDfprintf(stderr, "H5Dget_create_plist failed\n"); + fprintf(stderr, "H5Dget_create_plist failed\n"); return -1; } if (H5D_CHUNKED != H5Pget_layout(dcpl)) { - HDfprintf(stderr, "storage layout is not chunked\n"); + fprintf(stderr, "storage layout is not chunked\n"); return -1; } if ((rank = H5Pget_chunk(dcpl, 3, chunk_dims)) != 3) { - HDfprintf(stderr, "storage rank is not 3\n"); + fprintf(stderr, "storage rank is not 3\n"); return -1; } /* verify chunk_dims against set parameters */ if (chunk_dims[0] != chunkdims_g[0] || chunk_dims[1] != cz || chunk_dims[2] != cz) { - HDfprintf(stderr, "chunk size is not as expected. Got dims=(%llu,%llu,%llu)\n", - (unsigned long long)chunk_dims[0], (unsigned long long)chunk_dims[1], - (unsigned long long)chunk_dims[2]); + fprintf(stderr, "chunk size is not as expected. Got dims=(%llu,%llu,%llu)\n", + (unsigned long long)chunk_dims[0], (unsigned long long)chunk_dims[1], + (unsigned long long)chunk_dims[2]); return -1; } @@ -372,8 +372,8 @@ write_file(void) memdims[0] = 1; memdims[1] = dims_g[1]; memdims[2] = dims_g[2]; - if ((buffer = (UC_CTYPE *)HDmalloc((size_t)memdims[1] * (size_t)memdims[2] * sizeof(UC_CTYPE))) == NULL) { - HDfprintf(stderr, "malloc: failed\n"); + if ((buffer = (UC_CTYPE *)malloc((size_t)memdims[1] * (size_t)memdims[2] * sizeof(UC_CTYPE))) == NULL) { + fprintf(stderr, "malloc: failed\n"); return -1; }; @@ -383,25 +383,25 @@ write_file(void) f_sid = H5Dget_space(dsid); /* Get filespace handle first. */ rank = H5Sget_simple_extent_ndims(f_sid); if (rank != UC_RANK) { - HDfprintf(stderr, "rank(%d) of dataset does not match\n", rank); + fprintf(stderr, "rank(%d) of dataset does not match\n", rank); return -1; } if (H5Sget_simple_extent_dims(f_sid, dims, NULL) < 0) { - HDfprintf(stderr, "H5Sget_simple_extent_dims got error\n"); + fprintf(stderr, "H5Sget_simple_extent_dims got error\n"); return -1; } - HDprintf("dataset rank %d, dimensions %llu x %llu x %llu\n", rank, (unsigned long long)(dims[0]), - (unsigned long long)(dims[1]), (unsigned long long)(dims[2])); + printf("dataset rank %d, dimensions %llu x %llu x %llu\n", rank, (unsigned long long)(dims[0]), + (unsigned long long)(dims[1]), (unsigned long long)(dims[2])); /* verify that file space dims are as expected and are consistent with memory space dims */ if (dims[0] != 0 || dims[1] != memdims[1] || dims[2] != memdims[2]) { - HDfprintf(stderr, "dataset is not empty. Got dims=(%llu,%llu,%llu)\n", (unsigned long long)dims[0], - (unsigned long long)dims[1], (unsigned long long)dims[2]); + fprintf(stderr, "dataset is not empty. Got dims=(%llu,%llu,%llu)\n", (unsigned long long)dims[0], + (unsigned long long)dims[1], (unsigned long long)dims[2]); return -1; } /* setup mem-space for buffer */ if ((m_sid = H5Screate_simple(rank, memdims, NULL)) < 0) { - HDfprintf(stderr, "H5Screate_simple for memory failed\n"); + fprintf(stderr, "H5Screate_simple for memory failed\n"); return -1; }; @@ -415,7 +415,7 @@ write_file(void) for (j = 0; j < dims[1]; j++) for (k = 0; k < dims[2]; k++) { if (i > SHRT_MAX) { - HDfprintf(stderr, "rank(%d) of dataset overflow\n", rank); + fprintf(stderr, "rank(%d) of dataset overflow\n", rank); return -1; } *bufptr++ = (short)i; @@ -424,40 +424,40 @@ write_file(void) /* extend the dataset by one for new plane */ dims[0] = i + 1; if (H5Dset_extent(dsid, dims) < 0) { - HDfprintf(stderr, "H5Dset_extent failed\n"); + fprintf(stderr, "H5Dset_extent failed\n"); return -1; } /* Get the dataset's dataspace */ if ((f_sid = H5Dget_space(dsid)) < 0) { - HDfprintf(stderr, "H5Dset_extent failed\n"); + fprintf(stderr, "H5Dset_extent failed\n"); return -1; } start[0] = i; /* Choose the next plane to write */ if (H5Sselect_hyperslab(f_sid, H5S_SELECT_SET, start, NULL, count, NULL) < 0) { - HDfprintf(stderr, "Failed H5Sselect_hyperslab\n"); + fprintf(stderr, "Failed H5Sselect_hyperslab\n"); return -1; } /* Write plane to the dataset */ if (H5Dwrite(dsid, UC_DATATYPE, m_sid, f_sid, H5P_DEFAULT, buffer) < 0) { - HDfprintf(stderr, "Failed H5Dwrite\n"); + fprintf(stderr, "Failed H5Dwrite\n"); return -1; } /* Flush the dataset for every "chunkplanes_g" planes */ if (!((i + 1) % (hsize_t)chunkplanes_g)) { if (H5Dflush(dsid) < 0) { - HDfprintf(stderr, "Failed to H5Dflush dataset\n"); + fprintf(stderr, "Failed to H5Dflush dataset\n"); return -1; } } } if (H5Dflush(dsid) < 0) { - HDfprintf(stderr, "Failed to H5Dflush dataset\n"); + fprintf(stderr, "Failed to H5Dflush dataset\n"); return -1; } @@ -465,31 +465,31 @@ write_file(void) /* Closing the dataset later will enable mdc flushes automatically if this is not done */ if (disabled) if (H5Oenable_mdc_flushes(dsid) < 0) { - HDfprintf(stderr, "Failed to H5Oenable_mdc_flushes\n"); + fprintf(stderr, "Failed to H5Oenable_mdc_flushes\n"); return -1; } /* Done writing. Free/Close all resources including data file */ - HDfree(buffer); + free(buffer); if (H5Dclose(dsid) < 0) { - HDfprintf(stderr, "Failed to close datasete\n"); + fprintf(stderr, "Failed to close datasete\n"); return -1; } if (H5Sclose(m_sid) < 0) { - HDfprintf(stderr, "Failed to close memory space\n"); + fprintf(stderr, "Failed to close memory space\n"); return -1; } if (H5Sclose(f_sid) < 0) { - HDfprintf(stderr, "Failed to close file space\n"); + fprintf(stderr, "Failed to close file space\n"); return -1; } if (H5Pclose(fapl) < 0) { - HDfprintf(stderr, "Failed to property list\n"); + fprintf(stderr, "Failed to property list\n"); return -1; } if (H5Fclose(fid) < 0) { - HDfprintf(stderr, "Failed to close file id\n"); + fprintf(stderr, "Failed to close file id\n"); return -1; } @@ -513,26 +513,26 @@ main(int argc, char *argv[]) /* ============*/ /* Create file */ /* ============*/ - HDprintf("Creating skeleton data file for testing H5Odisable_mdc_flushes()...\n"); + printf("Creating skeleton data file for testing H5Odisable_mdc_flushes()...\n"); if (create_file() < 0) { - HDfprintf(stderr, "***encounter error\n"); + fprintf(stderr, "***encounter error\n"); Hgoto_error(1); } /* end if */ else - HDprintf("File created.\n"); + printf("File created.\n"); - HDprintf("writing to the file\n"); + printf("writing to the file\n"); if (write_file() < 0) { - HDfprintf(stderr, "write_file encountered error\n"); + fprintf(stderr, "write_file encountered error\n"); Hgoto_error(1); } done: /* Print result and exit */ if (ret_value != 0) - HDprintf("Error(s) encountered\n"); + printf("Error(s) encountered\n"); else - HDprintf("All passed\n"); + printf("All passed\n"); return (ret_value); } @@ -542,8 +542,8 @@ done: int main(void) { - HDfprintf(stderr, "Non-POSIX platform. Skipping.\n"); - HDexit(EXIT_SUCCESS); + fprintf(stderr, "Non-POSIX platform. Skipping.\n"); + exit(EXIT_SUCCESS); } /* end main() */ #endif /* H5_HAVE_UNISTD_H */ @@ -55,7 +55,7 @@ const char *FILENAME[] = {"vds_virt_0", "vds_virt_1", "vds_src_0", "vds_src_1", /* Print config directly to output */ #define PRINT_CONFIG(...) \ do { \ - HDprintf("Config: " __VA_ARGS__); \ + printf("Config: " __VA_ARGS__); \ HDputs(""); \ } while (0) @@ -80,11 +80,11 @@ char vds_test_str_g[128] = ""; /* Replacement for TEST_ERROR for non-verbose output */ #define TEST_ERROR_SUPPRESSED \ do { \ - HDprintf("Failed config: %s\nFailed test: %s\n", vds_config_str_g, vds_test_str_g); \ + printf("Failed config: %s\nFailed test: %s\n", vds_config_str_g, vds_test_str_g); \ TEST_ERROR; \ } while (0) -/* Replacement for HDprintf for printing configuration for non-verbose output */ +/* Replacement for printf for printing configuration for non-verbose output */ #define PRINT_CONFIG(...) \ do { \ HDsnprintf(vds_config_str_g, sizeof(vds_config_str_g), __VA_ARGS__); \ @@ -164,9 +164,9 @@ vds_select_equal(hid_t space1, hid_t space2) /* Allocate point lists. Do not return directly after * allocating, to make sure buffers are freed. */ - if (NULL == (buf1 = (hsize_t *)HDmalloc((size_t)rank1 * (size_t)npoints1 * sizeof(hsize_t)))) + if (NULL == (buf1 = (hsize_t *)malloc((size_t)rank1 * (size_t)npoints1 * sizeof(hsize_t)))) TEST_ERROR; - if (NULL == (buf2 = (hsize_t *)HDmalloc((size_t)rank1 * (size_t)npoints1 * sizeof(hsize_t)))) + if (NULL == (buf2 = (hsize_t *)malloc((size_t)rank1 * (size_t)npoints1 * sizeof(hsize_t)))) TEST_ERROR; /* Get and compare point lists */ @@ -181,9 +181,9 @@ vds_select_equal(hid_t space1, hid_t space2) } /* Free buffers */ - HDfree(buf1); + free(buf1); buf1 = NULL; - HDfree(buf2); + free(buf2); buf2 = NULL; } /* end block */ @@ -214,10 +214,10 @@ vds_select_equal(hid_t space1, hid_t space2) /* Allocate block lists. Do not return directly after * allocating, to make sure buffers are freed. */ if (NULL == - (buf1 = (hsize_t *)HDmalloc((size_t)2 * (size_t)rank1 * (size_t)nblocks1 * sizeof(*buf1)))) + (buf1 = (hsize_t *)malloc((size_t)2 * (size_t)rank1 * (size_t)nblocks1 * sizeof(*buf1)))) TEST_ERROR; if (NULL == - (buf2 = (hsize_t *)HDmalloc((size_t)2 * (size_t)rank1 * (size_t)nblocks1 * sizeof(*buf2)))) + (buf2 = (hsize_t *)malloc((size_t)2 * (size_t)rank1 * (size_t)nblocks1 * sizeof(*buf2)))) TEST_ERROR; /* Get and compare block lists */ @@ -232,9 +232,9 @@ vds_select_equal(hid_t space1, hid_t space2) } /* Free buffers */ - HDfree(buf1); + free(buf1); buf1 = NULL; - HDfree(buf2); + free(buf2); buf2 = NULL; } /* end block */ @@ -250,9 +250,9 @@ vds_select_equal(hid_t space1, hid_t space2) error: if (buf1) - HDfree(buf1); + free(buf1); if (buf2) - HDfree(buf2); + free(buf2); return -1; } /* end vds_select_equal() */ @@ -277,11 +277,11 @@ vds_check_mapping(hid_t dcpl, size_t i, hid_t vspace, hid_t srcspace, const char htri_t tri_ret; ssize_t str_len; - HDassert(dcpl >= 0); - HDassert(vspace >= 0); - HDassert(srcspace >= 0); - HDassert(filename); - HDassert(dsetname); + assert(dcpl >= 0); + assert(vspace >= 0); + assert(srcspace >= 0); + assert(filename); + assert(dsetname); /* Check vspace */ if ((space_out = H5Pget_virtual_vspace(dcpl, i)) < 0) @@ -314,7 +314,7 @@ vds_check_mapping(hid_t dcpl, size_t i, hid_t vspace, hid_t srcspace, const char TEST_ERROR; if ((size_t)str_len != HDstrlen(filename)) TEST_ERROR; - HDassert((size_t)str_len < sizeof(name_out)); + assert((size_t)str_len < sizeof(name_out)); if ((str_len = H5Pget_virtual_filename(dcpl, i, name_out, sizeof(name_out))) < 0) TEST_ERROR; if ((size_t)str_len != HDstrlen(filename)) @@ -327,7 +327,7 @@ vds_check_mapping(hid_t dcpl, size_t i, hid_t vspace, hid_t srcspace, const char TEST_ERROR; if ((size_t)str_len != HDstrlen(dsetname)) TEST_ERROR; - HDassert((size_t)str_len < sizeof(name_out)); + assert((size_t)str_len < sizeof(name_out)); if ((str_len = H5Pget_virtual_dsetname(dcpl, i, name_out, sizeof(name_out))) < 0) TEST_ERROR; if ((size_t)str_len != HDstrlen(dsetname)) @@ -368,13 +368,13 @@ test_api_get_ex_dcpl(test_api_config_t config, hid_t fapl, hid_t dcpl, hid_t *ex H5O_native_info_t ninfo; /* Object info struct */ htri_t tri_ret; - HDassert((config >= TEST_API_BASIC) && (config < TEST_API_NTESTS)); - HDassert(fapl >= 0); - HDassert(dcpl >= 0); - HDassert(ex_dcpl); - HDassert(*ex_dcpl < 0); - HDassert(vspace >= 0); - HDassert(filename); + assert((config >= TEST_API_BASIC) && (config < TEST_API_NTESTS)); + assert(fapl >= 0); + assert(dcpl >= 0); + assert(ex_dcpl); + assert(*ex_dcpl < 0); + assert(vspace >= 0); + assert(filename); /* Take different action depending on test configuration */ if (config >= TEST_API_CREATE_DSET) { @@ -426,9 +426,8 @@ test_api_get_ex_dcpl(test_api_config_t config, hid_t fapl, hid_t dcpl, hid_t *ex TEST_ERROR; if (config == TEST_API_REOPEN_FILE) { if (ninfo.meta_size.obj.heap_size != exp_meta_size) { - HDprintf("VDS metadata size: %llu Expected: %llu\n", - (long long unsigned)ninfo.meta_size.obj.heap_size, - (long long unsigned)exp_meta_size); + printf("VDS metadata size: %llu Expected: %llu\n", + (long long unsigned)ninfo.meta_size.obj.heap_size, (long long unsigned)exp_meta_size); TEST_ERROR; } } @@ -471,7 +470,7 @@ test_api_get_ex_dcpl(test_api_config_t config, hid_t fapl, hid_t dcpl, hid_t *ex /* Encode property list to plist_buf */ if (H5Pencode2(dcpl, NULL, &plist_buf_size, fapl) < 0) TEST_ERROR; - if (NULL == (plist_buf = HDmalloc(plist_buf_size))) + if (NULL == (plist_buf = malloc(plist_buf_size))) TEST_ERROR; if (H5Pencode2(dcpl, plist_buf, &plist_buf_size, fapl) < 0) TEST_ERROR; @@ -481,7 +480,7 @@ test_api_get_ex_dcpl(test_api_config_t config, hid_t fapl, hid_t dcpl, hid_t *ex TEST_ERROR; /* Free plist_buf */ - HDfree(plist_buf); + free(plist_buf); plist_buf = NULL; } else { @@ -513,7 +512,7 @@ error: } H5E_END_TRY; if (plist_buf) - HDfree(plist_buf); + free(plist_buf); return -1; } /* end test_api_get_ex_dcpl() */ @@ -1208,15 +1207,15 @@ test_vds_prefix_first(unsigned config, hid_t vds_fapl, hid_t src_fapl) TESTING_2_SUPPRESSED("basic virtual dataset I/O via H5Pset_vds_prefix(): all selection"); - if ((srcfilename = (char *)HDcalloc(FILENAME_BUF_SIZE, sizeof(char))) == NULL) + if ((srcfilename = (char *)calloc(FILENAME_BUF_SIZE, sizeof(char))) == NULL) TEST_ERROR_SUPPRESSED; - if ((srcfilename_map = (char *)HDcalloc(FILENAME_BUF_SIZE, sizeof(char))) == NULL) + if ((srcfilename_map = (char *)calloc(FILENAME_BUF_SIZE, sizeof(char))) == NULL) TEST_ERROR_SUPPRESSED; - if ((vfilename = (char *)HDcalloc(FILENAME_BUF_SIZE, sizeof(char))) == NULL) + if ((vfilename = (char *)calloc(FILENAME_BUF_SIZE, sizeof(char))) == NULL) TEST_ERROR_SUPPRESSED; - if ((srcfilenamepct = (char *)HDcalloc(FILENAME_BUF_SIZE, sizeof(char))) == NULL) + if ((srcfilenamepct = (char *)calloc(FILENAME_BUF_SIZE, sizeof(char))) == NULL) TEST_ERROR_SUPPRESSED; - if ((srcfilenamepct_map = (char *)HDcalloc(FILENAME_BUF_SIZE, sizeof(char))) == NULL) + if ((srcfilenamepct_map = (char *)calloc(FILENAME_BUF_SIZE, sizeof(char))) == NULL) TEST_ERROR_SUPPRESSED; h5_fixname(FILENAME[0], vds_fapl, vfilename, FILENAME_BUF_SIZE); @@ -1335,7 +1334,7 @@ test_vds_prefix_first(unsigned config, hid_t vds_fapl, hid_t src_fapl) } /* Read data through virtual dataset */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); if (H5Dread(vdset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0) TEST_ERROR_SUPPRESSED; @@ -1373,7 +1372,7 @@ test_vds_prefix_first(unsigned config, hid_t vds_fapl, hid_t src_fapl) } /* Read data directly from source dataset */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); if (H5Dread(srcdset[0], H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0) TEST_ERROR_SUPPRESSED; @@ -1409,11 +1408,11 @@ test_vds_prefix_first(unsigned config, hid_t vds_fapl, hid_t src_fapl) TEST_ERROR_SUPPRESSED; dcpl = -1; - HDfree(srcfilename); - HDfree(srcfilename_map); - HDfree(vfilename); - HDfree(srcfilenamepct); - HDfree(srcfilenamepct_map); + free(srcfilename); + free(srcfilename_map); + free(vfilename); + free(srcfilenamepct); + free(srcfilenamepct_map); PASSED_SUPPRESSED(); return 0; @@ -1440,11 +1439,11 @@ error: if (HDsetenv("HDF5_VDS_PREFIX", "", 1) < 0) TEST_ERROR_SUPPRESSED; - HDfree(srcfilename); - HDfree(srcfilename_map); - HDfree(vfilename); - HDfree(srcfilenamepct); - HDfree(srcfilenamepct_map); + free(srcfilename); + free(srcfilename_map); + free(vfilename); + free(srcfilenamepct); + free(srcfilenamepct_map); return 1; } /* end test_vds_prefix */ @@ -1495,17 +1494,17 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl) TESTING_2_SUPPRESSED("basic virtual dataset I/O"); - if ((srcfilename = (char *)HDcalloc(FILENAME_BUF_SIZE, sizeof(char))) == NULL) + if ((srcfilename = (char *)calloc(FILENAME_BUF_SIZE, sizeof(char))) == NULL) TEST_ERROR_SUPPRESSED; - if ((srcfilename_map = (char *)HDcalloc(FILENAME_BUF_SIZE, sizeof(char))) == NULL) + if ((srcfilename_map = (char *)calloc(FILENAME_BUF_SIZE, sizeof(char))) == NULL) TEST_ERROR_SUPPRESSED; - if ((vfilename = (char *)HDcalloc(FILENAME_BUF_SIZE, sizeof(char))) == NULL) + if ((vfilename = (char *)calloc(FILENAME_BUF_SIZE, sizeof(char))) == NULL) TEST_ERROR_SUPPRESSED; - if ((vfilename2 = (char *)HDcalloc(FILENAME_BUF_SIZE, sizeof(char))) == NULL) + if ((vfilename2 = (char *)calloc(FILENAME_BUF_SIZE, sizeof(char))) == NULL) TEST_ERROR_SUPPRESSED; - if ((srcfilenamepct = (char *)HDcalloc(FILENAME_BUF_SIZE, sizeof(char))) == NULL) + if ((srcfilenamepct = (char *)calloc(FILENAME_BUF_SIZE, sizeof(char))) == NULL) TEST_ERROR_SUPPRESSED; - if ((srcfilenamepct_map = (char *)HDcalloc(FILENAME_BUF_SIZE, sizeof(char))) == NULL) + if ((srcfilenamepct_map = (char *)calloc(FILENAME_BUF_SIZE, sizeof(char))) == NULL) TEST_ERROR_SUPPRESSED; h5_fixname(FILENAME[0], vds_fapl, vfilename, FILENAME_BUF_SIZE); @@ -1606,7 +1605,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl) } /* Read data through virtual dataset */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); if (H5Dread(vdset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0) TEST_ERROR_SUPPRESSED; @@ -1635,7 +1634,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl) } /* Read data directly from source dataset */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); if (H5Dread(srcdset[0], H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0) TEST_ERROR_SUPPRESSED; @@ -1778,7 +1777,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl) } /* Read data through virtual dataset */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); if (H5Dread(vdset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0) TEST_ERROR_SUPPRESSED; @@ -1809,7 +1808,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl) } /* Read data directly from source datasets */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); if (H5Dread(srcdset[0], H5T_NATIVE_INT, vspace[0], H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0) TEST_ERROR_SUPPRESSED; if (H5Dread(srcdset[1], H5T_NATIVE_INT, vspace[1], H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0) @@ -1872,7 +1871,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl) TEST_ERROR_SUPPRESSED; /* Read data through copied virtual dataset */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); if (H5Dread(vdset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0) TEST_ERROR_SUPPRESSED; @@ -1950,7 +1949,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl) TEST_ERROR_SUPPRESSED; /* Read data through copied virtual dataset */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); if (H5Dread(vdset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0) TEST_ERROR_SUPPRESSED; @@ -2120,7 +2119,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl) } /* Read data through virtual dataset */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); if (H5Dread(vdset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0) TEST_ERROR_SUPPRESSED; @@ -2151,7 +2150,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl) } /* Read data directly from source datasets */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); offset[1] = -3; if (H5Soffset_simple(vspace[0], offset) < 0) TEST_ERROR_SUPPRESSED; @@ -2305,7 +2304,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl) } /* Read first source dataset through virtual dataset */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); if (H5Dread(vdset, H5T_NATIVE_INT, vspace[0], vspace[0], H5P_DEFAULT, rbuf[0]) < 0) TEST_ERROR_SUPPRESSED; @@ -2316,7 +2315,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl) TEST_ERROR_SUPPRESSED; /* Read second source dataset through virtual dataset */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); if (H5Dread(vdset, H5T_NATIVE_INT, vspace[1], vspace[1], H5P_DEFAULT, rbuf[0]) < 0) TEST_ERROR_SUPPRESSED; @@ -2356,7 +2355,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl) } /* Read data directly from source datasets */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); if (H5Dread(srcdset[0], H5T_NATIVE_INT, vspace[0], H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0) TEST_ERROR_SUPPRESSED; if (H5Dread(srcdset[1], H5T_NATIVE_INT, vspace[1], H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0) @@ -2539,7 +2538,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset by hyperslab */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Read first slice */ if (H5Dread(vdset, H5T_NATIVE_INT, vspace[0], srcspace[0], H5P_DEFAULT, rbuf[0]) < 0) @@ -2619,7 +2618,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data directly from source datasets */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Read first dataset */ if (H5Dread(srcdset[0], H5T_NATIVE_INT, srcspace[0], srcspace[0], H5P_DEFAULT, rbuf[0]) < 0) @@ -2844,7 +2843,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset by hyperslab */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Read first stripe pattern */ if (H5Dread(vdset, H5T_NATIVE_INT, memspace, srcspace[0], H5P_DEFAULT, rbuf[0]) < 0) @@ -2915,7 +2914,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data directly from source datasets */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Read first dataset */ if (H5Dread(srcdset[0], H5T_NATIVE_INT, memspace, srcspace[0], H5P_DEFAULT, rbuf[0]) < 0) @@ -3170,7 +3169,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ start[0] = 0; @@ -3182,7 +3181,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset by hyperslab */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select stripe */ start[0] = 0; @@ -3201,7 +3200,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl) TEST_ERROR_SUPPRESSED; /* Update erbuf */ - HDmemset(erbuf, 0, sizeof(erbuf)); + memset(erbuf, 0, sizeof(erbuf)); for (i = 0; i < 9; i++) for (j = 0; j < 3; j++) erbuf[i][j] = fill; @@ -3223,7 +3222,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl) TEST_ERROR_SUPPRESSED; /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select stripe */ start[0] = 0; @@ -3277,7 +3276,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl) TEST_ERROR_SUPPRESSED; /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select stripe */ start[0] = 0; @@ -3402,7 +3401,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl) TEST_ERROR_SUPPRESSED; /* Update erbuf */ - HDmemset(erbuf, 0, sizeof(erbuf)); + memset(erbuf, 0, sizeof(erbuf)); erbuf[0][0] = buf[0][0]; erbuf[0][1] = buf[0][1]; erbuf[0][8] = buf[0][2]; @@ -3553,7 +3552,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl) TEST_ERROR_SUPPRESSED; /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Read dataset */ if (H5Dread(srcdset[0], H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0) @@ -3686,7 +3685,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl) TEST_ERROR_SUPPRESSED; /* Reset erbuf */ - HDmemset(erbuf[0], 0, sizeof(rbuf)); + memset(erbuf[0], 0, sizeof(rbuf)); /* Populate write buffer */ for (i = 0; i < (int)(sizeof(buf) / sizeof(buf[0])); i++) @@ -3786,7 +3785,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl) TEST_ERROR_SUPPRESSED; /* Read data through virtual dataset */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); if (H5Dread(vdset, H5T_NATIVE_INT, memspace, vspace[0], H5P_DEFAULT, rbuf[0]) < 0) TEST_ERROR_SUPPRESSED; @@ -3919,7 +3918,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl) TEST_ERROR_SUPPRESSED; /* Reset erbuf */ - HDmemset(erbuf[0], 0, sizeof(rbuf)); + memset(erbuf[0], 0, sizeof(rbuf)); /* Populate write buffer */ for (i = 0; i < (int)(sizeof(buf) / sizeof(buf[0])); i++) @@ -4043,7 +4042,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl) TEST_ERROR_SUPPRESSED; /* Read data through virtual dataset */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); if (H5Dread(vdset, H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0) TEST_ERROR_SUPPRESSED; @@ -4180,7 +4179,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl) TEST_ERROR_SUPPRESSED; /* Initialize erbuf */ - HDmemset(erbuf[0], 0, sizeof(rbuf)); + memset(erbuf[0], 0, sizeof(rbuf)); for (i = 0; i < 10; i++) for (j = 0; j < 24; j += 6) { erbuf[i][j] = -1; @@ -4295,7 +4294,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl) TEST_ERROR_SUPPRESSED; /* Read data through virtual dataset */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); if (H5Dread(vdset, H5T_NATIVE_INT, memspace, vspace[0], H5P_DEFAULT, rbuf[0]) < 0) TEST_ERROR_SUPPRESSED; @@ -4341,12 +4340,12 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl) TEST_ERROR_SUPPRESSED; dcpl = -1; - HDfree(srcfilename); - HDfree(srcfilename_map); - HDfree(vfilename); - HDfree(vfilename2); - HDfree(srcfilenamepct); - HDfree(srcfilenamepct_map); + free(srcfilename); + free(srcfilename_map); + free(vfilename); + free(vfilename2); + free(srcfilenamepct); + free(srcfilenamepct_map); PASSED_SUPPRESSED(); return 0; @@ -4370,12 +4369,12 @@ error: } H5E_END_TRY; - HDfree(srcfilename); - HDfree(srcfilename_map); - HDfree(vfilename); - HDfree(vfilename2); - HDfree(srcfilenamepct); - HDfree(srcfilenamepct_map); + free(srcfilename); + free(srcfilename_map); + free(vfilename); + free(vfilename2); + free(srcfilenamepct); + free(srcfilenamepct_map); return 1; } /* end test_basic_io() */ @@ -4615,7 +4614,7 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ start[0] = 0; @@ -4691,7 +4690,7 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Read data */ if (H5Dread(vdset, H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0) @@ -4797,7 +4796,7 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ start[1] = 0; @@ -4867,7 +4866,7 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ start[1] = 0; @@ -4981,7 +4980,7 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ start[1] = 0; @@ -4999,7 +4998,7 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl) TEST_ERROR_SUPPRESSED; /* Now just read middle 2 rows */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); start[0] = 4; count[0] = 2; count[1] = 20; @@ -5035,7 +5034,7 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ start[0] = 0; @@ -5061,7 +5060,7 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ start[0] = 0; @@ -5091,7 +5090,7 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ start[0] = 0; @@ -5157,7 +5156,7 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ start[0] = 0; @@ -5196,7 +5195,7 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ start[1] = 0; @@ -5226,7 +5225,7 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ start[0] = 0; @@ -5256,7 +5255,7 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ start[0] = 0; @@ -5483,7 +5482,7 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0) @@ -5546,7 +5545,7 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Read data */ if (H5Dread(vdset, H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0) @@ -5657,7 +5656,7 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0) @@ -5725,7 +5724,7 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0) @@ -5838,7 +5837,7 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0) @@ -5855,7 +5854,7 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl) TEST_ERROR_SUPPRESSED; /* Now just read middle 2 rows */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); start[0] = 4; count[0] = 2; count[1] = 20; @@ -5924,7 +5923,7 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0) @@ -6204,7 +6203,7 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0) @@ -6267,7 +6266,7 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Read data */ if (H5Dread(vdset, H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0) @@ -6372,7 +6371,7 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0) @@ -6443,7 +6442,7 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0) @@ -6559,7 +6558,7 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0) @@ -6622,7 +6621,7 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0) @@ -6736,7 +6735,7 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0) @@ -6795,7 +6794,7 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0) @@ -6817,7 +6816,7 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl) } /* Now just read middle 2 rows */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); start[0] = 4; count[0] = 2; count[1] = 19; @@ -7052,7 +7051,7 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ start[0] = 0; @@ -7117,7 +7116,7 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Read data */ if (H5Dread(vdset, H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0) @@ -7222,7 +7221,7 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ start[0] = 0; @@ -7287,7 +7286,7 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ start[0] = 0; @@ -7436,21 +7435,21 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl) TESTING_2_SUPPRESSED("virtual dataset I/O with printf source"); - if ((srcfilename = (char *)HDcalloc(FILENAME_BUF_SIZE, sizeof(char))) == NULL) + if ((srcfilename = (char *)calloc(FILENAME_BUF_SIZE, sizeof(char))) == NULL) TEST_ERROR_SUPPRESSED; - if ((srcfilename_map = (char *)HDcalloc(FILENAME_BUF_SIZE, sizeof(char))) == NULL) + if ((srcfilename_map = (char *)calloc(FILENAME_BUF_SIZE, sizeof(char))) == NULL) TEST_ERROR_SUPPRESSED; - if ((srcfilename2 = (char *)HDcalloc(FILENAME_BUF_SIZE, sizeof(char))) == NULL) + if ((srcfilename2 = (char *)calloc(FILENAME_BUF_SIZE, sizeof(char))) == NULL) TEST_ERROR_SUPPRESSED; - if ((srcfilename2_map = (char *)HDcalloc(FILENAME_BUF_SIZE, sizeof(char))) == NULL) + if ((srcfilename2_map = (char *)calloc(FILENAME_BUF_SIZE, sizeof(char))) == NULL) TEST_ERROR_SUPPRESSED; - if ((vfilename = (char *)HDcalloc(FILENAME_BUF_SIZE, sizeof(char))) == NULL) + if ((vfilename = (char *)calloc(FILENAME_BUF_SIZE, sizeof(char))) == NULL) TEST_ERROR_SUPPRESSED; - if ((printf_srcfilename_map = (char *)HDcalloc(FILENAME_BUF_SIZE, sizeof(char))) == NULL) + if ((printf_srcfilename_map = (char *)calloc(FILENAME_BUF_SIZE, sizeof(char))) == NULL) TEST_ERROR_SUPPRESSED; - if ((srcfilenamepct = (char *)HDcalloc(FILENAME_BUF_SIZE, sizeof(char))) == NULL) + if ((srcfilenamepct = (char *)calloc(FILENAME_BUF_SIZE, sizeof(char))) == NULL) TEST_ERROR_SUPPRESSED; - if ((srcfilenamepct_map = (char *)HDcalloc(FILENAME_BUF_SIZE, sizeof(char))) == NULL) + if ((srcfilenamepct_map = (char *)calloc(FILENAME_BUF_SIZE, sizeof(char))) == NULL) TEST_ERROR_SUPPRESSED; h5_fixname(FILENAME[0], vds_fapl, vfilename, FILENAME_BUF_SIZE); @@ -7679,7 +7678,7 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0) @@ -7775,7 +7774,7 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0) @@ -7801,7 +7800,7 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl) for (start[1] = (hsize_t)0; start[1] < (hsize_t)5; start[1]++) for (count[1] = (hsize_t)1; count[1] < (hsize_t)11; count[1]++) { /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, count, NULL) < 0) @@ -8187,7 +8186,7 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0) @@ -8262,7 +8261,7 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0) @@ -8331,7 +8330,7 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0) @@ -8400,7 +8399,7 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0) @@ -8469,7 +8468,7 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0) @@ -8532,7 +8531,7 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0) @@ -8755,7 +8754,7 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0) @@ -8852,7 +8851,7 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0) @@ -9065,7 +9064,7 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0) @@ -9162,7 +9161,7 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0) @@ -9431,7 +9430,7 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0) @@ -9530,7 +9529,7 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0) @@ -9594,7 +9593,7 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0) @@ -9693,7 +9692,7 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0) @@ -9757,7 +9756,7 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0) @@ -9821,7 +9820,7 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0) @@ -10112,7 +10111,7 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0) @@ -10176,7 +10175,7 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0) @@ -10279,7 +10278,7 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0) @@ -10342,7 +10341,7 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0) @@ -10442,7 +10441,7 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0) @@ -10479,7 +10478,7 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0) @@ -10508,7 +10507,7 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0) @@ -10536,7 +10535,7 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0) @@ -10600,7 +10599,7 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0) @@ -10637,7 +10636,7 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0) @@ -10666,7 +10665,7 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0) @@ -10694,7 +10693,7 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0) @@ -10933,7 +10932,7 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0) @@ -10996,7 +10995,7 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0) @@ -11059,14 +11058,14 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl) TEST_ERROR_SUPPRESSED; memspace = -1; - HDfree(srcfilename); - HDfree(srcfilename_map); - HDfree(srcfilename2); - HDfree(srcfilename2_map); - HDfree(vfilename); - HDfree(printf_srcfilename_map); - HDfree(srcfilenamepct); - HDfree(srcfilenamepct_map); + free(srcfilename); + free(srcfilename_map); + free(srcfilename2); + free(srcfilename2_map); + free(vfilename); + free(printf_srcfilename_map); + free(srcfilenamepct); + free(srcfilenamepct_map); PASSED_SUPPRESSED(); return 0; @@ -11090,14 +11089,14 @@ error: } H5E_END_TRY; - HDfree(srcfilename); - HDfree(srcfilename_map); - HDfree(srcfilename2); - HDfree(srcfilename2_map); - HDfree(vfilename); - HDfree(printf_srcfilename_map); - HDfree(srcfilenamepct); - HDfree(srcfilenamepct_map); + free(srcfilename); + free(srcfilename_map); + free(srcfilename2); + free(srcfilename2_map); + free(vfilename); + free(printf_srcfilename_map); + free(srcfilenamepct); + free(srcfilenamepct_map); return 1; } /* end test_printf() */ @@ -11387,7 +11386,7 @@ test_all(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ start[0] = 0; @@ -11495,7 +11494,7 @@ test_all(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ start[0] = 0; @@ -11600,7 +11599,7 @@ test_all(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ start[0] = 0; @@ -11717,7 +11716,7 @@ test_all(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ start[0] = 0; @@ -11822,7 +11821,7 @@ test_all(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ start[0] = 0; @@ -11940,7 +11939,7 @@ test_all(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ start[0] = 0; @@ -12045,7 +12044,7 @@ test_all(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ start[0] = 0; @@ -12326,7 +12325,7 @@ main(void) */ if (driver_is_parallel || !HDstrcmp(env_h5_drvr, "splitter")) { HDputs(" -- SKIPPED for incompatible VFD --"); - HDexit(EXIT_SUCCESS); + exit(EXIT_SUCCESS); } h5_fixname(FILENAME[0], fapl, filename, sizeof(filename)); @@ -12437,13 +12436,13 @@ main(void) if (nerrors) goto error; - HDprintf("All virtual dataset tests passed.\n"); + printf("All virtual dataset tests passed.\n"); h5_cleanup(FILENAME, fapl); return EXIT_SUCCESS; error: nerrors = MAX(1, nerrors); - HDprintf("***** %d VIRTUAL DATASET TEST%s FAILED! *****\n", nerrors, 1 == nerrors ? "" : "S"); + printf("***** %d VIRTUAL DATASET TEST%s FAILED! *****\n", nerrors, 1 == nerrors ? "" : "S"); return EXIT_FAILURE; } /* end main() */ diff --git a/test/vds_env.c b/test/vds_env.c index 74b3caa..caf5ffa 100644 --- a/test/vds_env.c +++ b/test/vds_env.c @@ -69,17 +69,17 @@ test_vds_prefix_second(unsigned config, hid_t fapl) TESTING("basic virtual dataset I/O via H5Pset_vds_prefix(): all selection with ENV prefix"); - if (NULL == (srcfilename = HDmalloc(FILENAME_BUF_SIZE))) + if (NULL == (srcfilename = malloc(FILENAME_BUF_SIZE))) TEST_ERROR; - if (NULL == (srcfilename_map = HDmalloc(FILENAME_BUF_SIZE))) + if (NULL == (srcfilename_map = malloc(FILENAME_BUF_SIZE))) TEST_ERROR; - if (NULL == (vfilename = HDmalloc(FILENAME_BUF_SIZE))) + if (NULL == (vfilename = malloc(FILENAME_BUF_SIZE))) TEST_ERROR; - if (NULL == (vfilename2 = HDmalloc(FILENAME_BUF_SIZE))) + if (NULL == (vfilename2 = malloc(FILENAME_BUF_SIZE))) TEST_ERROR; - if (NULL == (srcfilenamepct = HDmalloc(FILENAME_BUF_SIZE))) + if (NULL == (srcfilenamepct = malloc(FILENAME_BUF_SIZE))) TEST_ERROR; - if (NULL == (srcfilenamepct_map = HDmalloc(FILENAME_BUF_SIZE))) + if (NULL == (srcfilenamepct_map = malloc(FILENAME_BUF_SIZE))) TEST_ERROR; h5_fixname(FILENAME[0], fapl, vfilename, FILENAME_BUF_SIZE); @@ -199,7 +199,7 @@ test_vds_prefix_second(unsigned config, hid_t fapl) } /* Read data through virtual dataset */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); if (H5Dread(vdset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0) TEST_ERROR; @@ -237,7 +237,7 @@ test_vds_prefix_second(unsigned config, hid_t fapl) } /* Read data directly from source dataset */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); if (H5Dread(srcdset[0], H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0) TEST_ERROR; @@ -273,23 +273,23 @@ test_vds_prefix_second(unsigned config, hid_t fapl) TEST_ERROR; dcpl = -1; - HDfree(srcfilenamepct_map); - HDfree(srcfilenamepct); - HDfree(vfilename2); - HDfree(vfilename); - HDfree(srcfilename_map); - HDfree(srcfilename); + free(srcfilenamepct_map); + free(srcfilenamepct); + free(vfilename2); + free(vfilename); + free(srcfilename_map); + free(srcfilename); PASSED(); return 0; error: - HDfree(srcfilenamepct_map); - HDfree(srcfilenamepct); - HDfree(vfilename2); - HDfree(vfilename); - HDfree(srcfilename_map); - HDfree(srcfilename); + free(srcfilenamepct_map); + free(srcfilenamepct); + free(vfilename2); + free(vfilename); + free(srcfilename_map); + free(srcfilename); H5E_BEGIN_TRY { @@ -348,7 +348,7 @@ main(void) */ if (driver_is_parallel || !HDstrcmp(env_h5_drvr, "splitter")) { HDputs(" -- SKIPPED for incompatible VFD --"); - HDexit(EXIT_SUCCESS); + exit(EXIT_SUCCESS); } /* Set to use the latest file format */ @@ -383,9 +383,9 @@ main(void) HDputs(msg); for (bit_config = 0; bit_config < TEST_IO_NTESTS; bit_config++) { - HDprintf("Config: %s%s%s\n", bit_config & TEST_IO_CLOSE_SRC ? "closed source dataset, " : "", - bit_config & TEST_IO_DIFFERENT_FILE ? "different source file" : "same source file", - bit_config & TEST_IO_REOPEN_VIRT ? ", reopen virtual file" : ""); + printf("Config: %s%s%s\n", bit_config & TEST_IO_CLOSE_SRC ? "closed source dataset, " : "", + bit_config & TEST_IO_DIFFERENT_FILE ? "different source file" : "same source file", + bit_config & TEST_IO_REOPEN_VIRT ? ", reopen virtual file" : ""); nerrors += test_vds_prefix_second(bit_config, fapl); } @@ -400,13 +400,13 @@ main(void) if (nerrors) goto error; - HDprintf("All virtual dataset tests passed.\n"); + printf("All virtual dataset tests passed.\n"); h5_cleanup(FILENAME, fapl); return EXIT_SUCCESS; error: nerrors = MAX(1, nerrors); - HDprintf("***** %d VIRTUAL DATASET TEST%s FAILED! *****\n", nerrors, 1 == nerrors ? "" : "S"); + printf("***** %d VIRTUAL DATASET TEST%s FAILED! *****\n", nerrors, 1 == nerrors ? "" : "S"); return EXIT_FAILURE; } /* end main() */ diff --git a/test/vds_swmr_reader.c b/test/vds_swmr_reader.c index 5752d02..f6e9ddd 100644 --- a/test/vds_swmr_reader.c +++ b/test/vds_swmr_reader.c @@ -47,7 +47,7 @@ main(void) TEST_ERROR; n_elements = (int)(VDS_PLANE[1] * VDS_PLANE[2]); size = (size_t)n_elements * sizeof(int); - if (NULL == (buffer = (int *)HDmalloc(size))) + if (NULL == (buffer = (int *)malloc(size))) TEST_ERROR; /* Create memory dataspace */ @@ -117,9 +117,9 @@ main(void) if (H5Fclose(fid) < 0) TEST_ERROR; - HDfree(buffer); + free(buffer); - HDfprintf(stderr, "SWMR reader exited successfully\n"); + fprintf(stderr, "SWMR reader exited successfully\n"); return EXIT_SUCCESS; error: @@ -139,9 +139,9 @@ error: } H5E_END_TRY - HDfree(buffer); + free(buffer); - HDfprintf(stderr, "ERROR: SWMR reader exited with errors\n"); + fprintf(stderr, "ERROR: SWMR reader exited with errors\n"); return EXIT_FAILURE; } /* end main */ diff --git a/test/vds_swmr_writer.c b/test/vds_swmr_writer.c index 33f2a86..d5fa74b 100644 --- a/test/vds_swmr_writer.c +++ b/test/vds_swmr_writer.c @@ -43,11 +43,11 @@ main(int argc, char *argv[]) * This is an integer index into the FILE_NAMES array. */ if (argc != 2) { - HDfprintf(stderr, "ERROR: Must pass the source file number on the command line.\n"); + fprintf(stderr, "ERROR: Must pass the source file number on the command line.\n"); return EXIT_FAILURE; } - file_number = HDatoi(argv[1]); + file_number = atoi(argv[1]); if (file_number < 0 || file_number >= N_SOURCES) TEST_ERROR; @@ -64,7 +64,7 @@ main(int argc, char *argv[]) /* Create a data buffer that represents a plane */ n_elements = PLANES[file_number][1] * PLANES[file_number][2]; - if (NULL == (buffer = (int *)HDmalloc(n_elements * sizeof(int)))) + if (NULL == (buffer = (int *)malloc(n_elements * sizeof(int)))) TEST_ERROR; /* Create the memory dataspace */ @@ -132,9 +132,9 @@ main(int argc, char *argv[]) TEST_ERROR; if (H5Fclose(fid) < 0) TEST_ERROR; - HDfree(buffer); + free(buffer); - HDfprintf(stderr, "SWMR writer exited successfully\n"); + fprintf(stderr, "SWMR writer exited successfully\n"); return EXIT_SUCCESS; error: @@ -152,11 +152,11 @@ error: if (fsid >= 0) (void)H5Sclose(fsid); if (buffer != NULL) - HDfree(buffer); + free(buffer); } H5E_END_TRY - HDfprintf(stderr, "ERROR: SWMR writer exited with errors\n"); + fprintf(stderr, "ERROR: SWMR writer exited with errors\n"); return EXIT_FAILURE; } /* end main */ @@ -80,9 +80,9 @@ static int __k; #define HEXPRINT(size, buf) \ for (__k = 0; __k < (size); __k++) { \ if (__k % 16 == 0) { \ - HDprintf("\n%04x", __k); \ + printf("\n%04x", __k); \ } \ - HDprintf((__k % 4 == 0) ? " %02X" : " %02X", (unsigned char)(buf)[__k]); \ + printf((__k % 4 == 0) ? " %02X" : " %02X", (unsigned char)(buf)[__k]); \ } /* end #define HEXPRINT() */ /* Macro SET_SIZE() @@ -102,7 +102,7 @@ static int __k; \ if ((sizes_array)[idx] == 0) { \ \ - HDassert((idx) > 0); \ + assert((idx) > 0); \ (bool_size_fixed) = TRUE; \ } \ else { \ @@ -129,7 +129,7 @@ static int __k; \ if ((types_array)[idx] == H5FD_MEM_NOLIST) { \ \ - HDassert((idx) > 0); \ + assert((idx) > 0); \ (bool_type_fixed) = TRUE; \ } \ else { \ @@ -485,9 +485,9 @@ test_core(void) TEST_ERROR; /* Allocate memory for data set. */ - if (NULL == (data_w = (int *)HDmalloc(DSET1_DIM1 * DSET1_DIM2 * sizeof(int)))) + if (NULL == (data_w = (int *)malloc(DSET1_DIM1 * DSET1_DIM2 * sizeof(int)))) FAIL_PUTS_ERROR("unable to allocate memory for input array"); - if (NULL == (data_r = (int *)HDmalloc(DSET1_DIM1 * DSET1_DIM2 * sizeof(int)))) + if (NULL == (data_r = (int *)malloc(DSET1_DIM1 * DSET1_DIM2 * sizeof(int)))) FAIL_PUTS_ERROR("unable to allocate memory for output array"); /* Initialize the buffers */ @@ -496,7 +496,7 @@ test_core(void) for (i = 0; i < CORE_DSET_DIM1; i++) for (j = 0; j < CORE_DSET_DIM2; j++) *pw++ = val++; - HDmemset(data_r, 0, DSET1_DIM1 * DSET1_DIM2 * sizeof(int)); + memset(data_r, 0, DSET1_DIM1 * DSET1_DIM2 * sizeof(int)); /* Create the dataspace */ dims[0] = CORE_DSET_DIM1; @@ -530,8 +530,8 @@ test_core(void) for (j = 0; j < CORE_DSET_DIM2; j++) if (*pr++ != *pw++) { H5_FAILED(); - HDprintf(" Read different values than written in data set.\n"); - HDprintf(" At index %d,%d\n", i, j); + printf(" Read different values than written in data set.\n"); + printf(" At index %d,%d\n", i, j); TEST_ERROR; } /* end if */ @@ -587,7 +587,7 @@ test_core(void) TEST_ERROR; /* Read the data back from the dataset */ - HDmemset(data_r, 0, DSET1_DIM1 * DSET1_DIM2 * sizeof(int)); + memset(data_r, 0, DSET1_DIM1 * DSET1_DIM2 * sizeof(int)); if (H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, data_r) < 0) TEST_ERROR; @@ -598,8 +598,8 @@ test_core(void) for (j = 0; j < CORE_DSET_DIM2; j++) if (*pw++ != *pr++) { H5_FAILED(); - HDprintf(" Read different values than written in data set.\n"); - HDprintf(" At index %d,%d\n", i, j); + printf(" Read different values than written in data set.\n"); + printf(" At index %d,%d\n", i, j); TEST_ERROR; } /* end if */ @@ -620,8 +620,8 @@ test_core(void) if (H5Dclose(did) < 0) TEST_ERROR; - HDfree(data_w); - HDfree(data_r); + free(data_w); + free(data_r); /* Close and delete the file */ if (H5Fclose(fid) < 0) @@ -679,9 +679,9 @@ error: H5E_END_TRY; if (data_w) - HDfree(data_w); + free(data_w); if (data_r) - HDfree(data_r); + free(data_r); return -1; } /* end test_core() */ @@ -751,7 +751,7 @@ test_direct(void) if (file < 0) { H5Pclose(fapl); SKIPPED(); - HDprintf(" Probably the file system doesn't support Direct I/O\n"); + printf(" Probably the file system doesn't support Direct I/O\n"); return 0; } @@ -831,8 +831,8 @@ test_direct(void) for (j = 0; j < DSET1_DIM2; j++) if (*p1++ != *p2++) { H5_FAILED(); - HDprintf(" Read different values than written in data set 1.\n"); - HDprintf(" At index %d,%d\n", i, j); + printf(" Read different values than written in data set 1.\n"); + printf(" At index %d,%d\n", i, j); TEST_ERROR; } /* end if */ @@ -864,8 +864,8 @@ test_direct(void) for (i = 0; i < DSET2_DIM; i++) if (wdata2[i] != rdata2[i]) { H5_FAILED(); - HDprintf(" Read different values than written in data set 2.\n"); - HDprintf(" At index %d\n", i); + printf(" Read different values than written in data set 2.\n"); + printf(" At index %d\n", i); TEST_ERROR; } /* end if */ @@ -878,8 +878,8 @@ test_direct(void) if (H5Dclose(dset2) < 0) TEST_ERROR; - HDfree(points); - HDfree(check); + free(points); + free(check); /* Close and delete the file */ if (H5Fclose(file) < 0) @@ -906,9 +906,9 @@ error: H5E_END_TRY; if (proto_points) - HDfree(proto_points); + free(proto_points); if (proto_check) - HDfree(proto_check); + free(proto_check); return -1; #endif /*H5_HAVE_DIRECT*/ @@ -1032,9 +1032,9 @@ test_family(void) TESTING("FAMILY file driver"); /* Set up data array */ - if (NULL == (buf_data = (int *)HDcalloc(FAMILY_NUMBER * FAMILY_SIZE, sizeof(int)))) + if (NULL == (buf_data = (int *)calloc(FAMILY_NUMBER * FAMILY_SIZE, sizeof(int)))) TEST_ERROR; - if (NULL == (buf = (int **)HDcalloc(FAMILY_NUMBER, sizeof(buf_data)))) + if (NULL == (buf = (int **)calloc(FAMILY_NUMBER, sizeof(buf_data)))) TEST_ERROR; for (i = 0; i < FAMILY_NUMBER; i++) buf[i] = buf_data + (i * FAMILY_SIZE); @@ -1178,8 +1178,8 @@ test_family(void) if (H5Pclose(fapl) < 0) TEST_ERROR; - HDfree(buf); - HDfree(buf_data); + free(buf); + free(buf_data); PASSED(); return SUCCEED; @@ -1195,8 +1195,8 @@ error: } H5E_END_TRY; - HDfree(buf); - HDfree(buf_data); + free(buf); + free(buf_data); return FAIL; } /* end test_family() */ @@ -1344,9 +1344,9 @@ test_family_member_fapl(void) TESTING("Family member FAPL"); /* Set up data array */ - if (NULL == (buf_data = (int *)HDcalloc(FAMILY_NUMBER * FAMILY_SIZE, sizeof(int)))) + if (NULL == (buf_data = (int *)calloc(FAMILY_NUMBER * FAMILY_SIZE, sizeof(int)))) TEST_ERROR; - if (NULL == (buf = (int **)HDcalloc(FAMILY_NUMBER, sizeof(buf_data)))) + if (NULL == (buf = (int **)calloc(FAMILY_NUMBER, sizeof(buf_data)))) TEST_ERROR; for (i = 0; i < FAMILY_NUMBER; i++) buf[i] = buf_data + (i * FAMILY_SIZE); @@ -1409,8 +1409,8 @@ test_family_member_fapl(void) if (H5Pclose(fapl_id) == FAIL) TEST_ERROR; - HDfree(buf); - HDfree(buf_data); + free(buf); + free(buf_data); PASSED(); return SUCCEED; @@ -1426,8 +1426,8 @@ error: } H5E_END_TRY; - HDfree(buf); - HDfree(buf_data); + free(buf); + free(buf_data); return FAIL; } /* end test_family_member_fapl() */ @@ -1512,9 +1512,9 @@ test_multi(void) TESTING("MULTI file driver"); /* Set up data array */ - if (NULL == (buf_data = (int *)HDcalloc(MULTI_SIZE * MULTI_SIZE, sizeof(int)))) + if (NULL == (buf_data = (int *)calloc(MULTI_SIZE * MULTI_SIZE, sizeof(int)))) TEST_ERROR; - if (NULL == (buf = (int **)HDcalloc(MULTI_SIZE, sizeof(buf_data)))) + if (NULL == (buf = (int **)calloc(MULTI_SIZE, sizeof(buf_data)))) TEST_ERROR; for (i = 0; i < MULTI_SIZE; i++) buf[i] = buf_data + (i * MULTI_SIZE); @@ -1523,11 +1523,11 @@ test_multi(void) if ((fapl = H5Pcreate(H5P_FILE_ACCESS)) < 0) TEST_ERROR; - HDmemset(memb_map, 0, sizeof(memb_map)); - HDmemset(memb_fapl, 0, sizeof(memb_fapl)); - HDmemset(memb_name, 0, sizeof(memb_name)); - HDmemset(memb_addr, 0, sizeof(memb_addr)); - HDmemset(sv, 0, sizeof(sv)); + memset(memb_map, 0, sizeof(memb_map)); + memset(memb_fapl, 0, sizeof(memb_fapl)); + memset(memb_name, 0, sizeof(memb_name)); + memset(memb_addr, 0, sizeof(memb_addr)); + memset(sv, 0, sizeof(sv)); for (mt = H5FD_MEM_DEFAULT; mt < H5FD_MEM_NTYPES; mt++) { memb_fapl[mt] = H5P_DEFAULT; @@ -1699,8 +1699,8 @@ test_multi(void) if (H5Pclose(fapl) < 0) TEST_ERROR; - HDfree(buf); - HDfree(buf_data); + free(buf); + free(buf_data); PASSED(); @@ -1718,8 +1718,8 @@ error: } H5E_END_TRY; - HDfree(buf); - HDfree(buf_data); + free(buf); + free(buf_data); return FAIL; } /* end test_multi() */ @@ -1764,9 +1764,9 @@ test_multi_compat(void) TESTING("MULTI file driver backward compatibility"); /* Set up data array */ - if (NULL == (buf_data = (int *)HDcalloc(MULTI_SIZE * MULTI_SIZE, sizeof(int)))) + if (NULL == (buf_data = (int *)calloc(MULTI_SIZE * MULTI_SIZE, sizeof(int)))) TEST_ERROR; - if (NULL == (buf = (int **)HDcalloc(MULTI_SIZE, sizeof(buf_data)))) + if (NULL == (buf = (int **)calloc(MULTI_SIZE, sizeof(buf_data)))) TEST_ERROR; for (i = 0; i < MULTI_SIZE; i++) buf[i] = buf_data + (i * MULTI_SIZE); @@ -1775,11 +1775,11 @@ test_multi_compat(void) if ((fapl = H5Pcreate(H5P_FILE_ACCESS)) < 0) TEST_ERROR; - HDmemset(memb_map, 0, sizeof memb_map); - HDmemset(memb_fapl, 0, sizeof memb_fapl); - HDmemset(memb_name, 0, sizeof memb_name); - HDmemset(memb_addr, 0, sizeof memb_addr); - HDmemset(sv, 0, sizeof sv); + memset(memb_map, 0, sizeof memb_map); + memset(memb_fapl, 0, sizeof memb_fapl); + memset(memb_name, 0, sizeof memb_name); + memset(memb_addr, 0, sizeof memb_addr); + memset(sv, 0, sizeof sv); for (mt = H5FD_MEM_DEFAULT; mt < H5FD_MEM_NTYPES; mt++) memb_map[mt] = H5FD_MEM_SUPER; @@ -1893,8 +1893,8 @@ test_multi_compat(void) if (H5Pclose(fapl) < 0) TEST_ERROR; - HDfree(buf); - HDfree(buf_data); + free(buf); + free(buf_data); PASSED(); @@ -1910,8 +1910,8 @@ error: } H5E_END_TRY; - HDfree(buf); - HDfree(buf_data); + free(buf); + free(buf_data); return FAIL; } /* end test_multi_compat() */ @@ -2384,9 +2384,9 @@ error: { \ H5_FAILED(); \ AT(); \ - HDfprintf(stderr, mesg); \ + fprintf(stderr, mesg); \ H5Eprint2(H5E_DEFAULT, stderr); \ - HDfflush(stderr); \ + fflush(stderr); \ ret_value = -1; \ goto done; \ } @@ -2408,7 +2408,7 @@ compare_splitter_config_info(hid_t fapl_id, H5FD_splitter_vfd_config_t *info) int ret_value = 0; H5FD_splitter_vfd_config_t *fetched_info = NULL; - if (NULL == (fetched_info = HDcalloc(1, sizeof(H5FD_splitter_vfd_config_t)))) + if (NULL == (fetched_info = calloc(1, sizeof(H5FD_splitter_vfd_config_t)))) SPLITTER_TEST_FAULT("memory allocation for fetched_info struct failed"); fetched_info->magic = H5FD_SPLITTER_MAGIC; @@ -2441,14 +2441,14 @@ compare_splitter_config_info(hid_t fapl_id, H5FD_splitter_vfd_config_t *info) } if ((HDstrlen(info->wo_path) != HDstrlen(fetched_info->wo_path)) || HDstrncmp(info->wo_path, fetched_info->wo_path, H5FD_SPLITTER_PATH_MAX) != 0) { - HDfprintf(stderr, "MISMATCH: '%s' :: '%s'\n", info->wo_path, fetched_info->wo_path); + fprintf(stderr, "MISMATCH: '%s' :: '%s'\n", info->wo_path, fetched_info->wo_path); HEXPRINT(H5FD_SPLITTER_PATH_MAX, info->wo_path); HEXPRINT(H5FD_SPLITTER_PATH_MAX, fetched_info->wo_path); SPLITTER_TEST_FAULT("Write-Only file path mismatch\n"); } done: - HDfree(fetched_info); + free(fetched_info); return ret_value; } /* end compare_splitter_config_info() */ @@ -2485,9 +2485,9 @@ run_splitter_test(const struct splitter_dataset_def *data, hbool_t ignore_wo_err FILE *logfile = NULL; int ret_value = 0; - if (NULL == (vfd_config = HDcalloc(1, sizeof(H5FD_splitter_vfd_config_t)))) + if (NULL == (vfd_config = calloc(1, sizeof(H5FD_splitter_vfd_config_t)))) SPLITTER_TEST_FAULT("memory allocation for vfd_config struct failed"); - if (NULL == (filename_rw = HDcalloc(H5FD_SPLITTER_PATH_MAX + 1, sizeof(char)))) + if (NULL == (filename_rw = calloc(H5FD_SPLITTER_PATH_MAX + 1, sizeof(char)))) SPLITTER_TEST_FAULT("memory allocation for filename_rw string failed"); vfd_config->magic = H5FD_SPLITTER_MAGIC; @@ -2598,7 +2598,7 @@ run_splitter_test(const struct splitter_dataset_def *data, hbool_t ignore_wo_err } /* Verify existence of logfile if appropriate */ - logfile = HDfopen(vfd_config->log_file_path, "r"); + logfile = fopen(vfd_config->log_file_path, "r"); if ((TRUE == provide_logfile_path && NULL == logfile) || (FALSE == provide_logfile_path && NULL != logfile)) { SPLITTER_TEST_FAULT("no logfile when one was expected\n"); @@ -2621,8 +2621,8 @@ done: if (logfile != NULL) HDfclose(logfile); - HDfree(vfd_config); - HDfree(filename_rw); + free(vfd_config); + free(filename_rw); return ret_value; } /* end run_splitter_test() */ @@ -2650,7 +2650,7 @@ driver_is_splitter_compatible(hid_t fapl_id) herr_t ret = SUCCEED; int ret_value = 0; - if (NULL == (vfd_config = HDcalloc(1, sizeof(H5FD_splitter_vfd_config_t)))) { + if (NULL == (vfd_config = calloc(1, sizeof(H5FD_splitter_vfd_config_t)))) { FAIL_PUTS_ERROR("memory allocation for vfd_config struct failed"); } @@ -2679,7 +2679,7 @@ driver_is_splitter_compatible(hid_t fapl_id) } split_fapl_id = H5I_INVALID_HID; - HDfree(vfd_config); + free(vfd_config); return ret_value; @@ -2690,7 +2690,7 @@ error: } H5E_END_TRY; - HDfree(vfd_config); + free(vfd_config); return -1; } /* end driver_is_splitter_compatible() */ @@ -2717,9 +2717,9 @@ splitter_RO_test(const struct splitter_dataset_def *data, hid_t child_fapl_id) hid_t file_id = H5I_INVALID_HID; int ret_value = 0; - if (NULL == (vfd_config = HDcalloc(1, sizeof(H5FD_splitter_vfd_config_t)))) + if (NULL == (vfd_config = calloc(1, sizeof(H5FD_splitter_vfd_config_t)))) SPLITTER_TEST_FAULT("memory allocation for vfd_config struct failed"); - if (NULL == (filename_rw = HDcalloc(H5FD_SPLITTER_PATH_MAX + 1, sizeof(char)))) + if (NULL == (filename_rw = calloc(H5FD_SPLITTER_PATH_MAX + 1, sizeof(char)))) SPLITTER_TEST_FAULT("memory allocation for filename_rw string failed"); vfd_config->magic = H5FD_SPLITTER_MAGIC; @@ -2826,8 +2826,8 @@ done: H5E_END_TRY; } - HDfree(vfd_config); - HDfree(filename_rw); + free(vfd_config); + free(filename_rw); return ret_value; } /* end splitter_RO_test() */ @@ -2994,7 +2994,7 @@ splitter_compare_expected_data(hid_t file_id, const struct splitter_dataset_def if (sizeof((void *)buf) != sizeof(data->buf)) { SPLITTER_TEST_FAULT("invariant size of expected data does not match that received!\n"); } - HDmemcpy(expected, data->buf, sizeof(expected)); + memcpy(expected, data->buf, sizeof(expected)); dset_id = H5Dopen2(file_id, data->dset_name, H5P_DEFAULT); if (dset_id < 0) { @@ -3066,9 +3066,9 @@ splitter_tentative_open_test(hid_t child_fapl_id) struct splitter_dataset_def data; /* for comparison */ int ret_value = 0; - if (NULL == (vfd_config = HDcalloc(1, sizeof(H5FD_splitter_vfd_config_t)))) + if (NULL == (vfd_config = calloc(1, sizeof(H5FD_splitter_vfd_config_t)))) SPLITTER_TEST_FAULT("memory allocation for vfd_config struct failed"); - if (NULL == (filename_rw = HDcalloc(H5FD_SPLITTER_PATH_MAX + 1, sizeof(char)))) + if (NULL == (filename_rw = calloc(H5FD_SPLITTER_PATH_MAX + 1, sizeof(char)))) SPLITTER_TEST_FAULT("memory allocation for filename_rw string failed"); /* pre-fill data buffer to write */ @@ -3317,8 +3317,8 @@ done: H5E_END_TRY; } - HDfree(vfd_config); - HDfree(filename_rw); + free(vfd_config); + free(filename_rw); return ret_value; } /* end splitter_tentative_open_test() */ @@ -3415,7 +3415,7 @@ test_splitter(void) if (!driver_is_splitter_compatible(child_fapl_id)) { SKIPPED(); - HDprintf(" given driver is not Splitter W/O compatible.\n"); + printf(" given driver is not Splitter W/O compatible.\n"); return 0; } @@ -3500,8 +3500,8 @@ setup_rand(void) seed = predefined_seed; - HDfprintf(stdout, "\n%s: predefined_seed = %d.\n\n", __func__, seed); - HDfflush(stdout); + fprintf(stdout, "\n%s: predefined_seed = %d.\n\n", __func__, seed); + fflush(stdout); HDsrand(seed); } @@ -3509,15 +3509,15 @@ setup_rand(void) if (HDgettimeofday(&tv, NULL) != 0) { - HDfprintf(stdout, "\n%s: gettimeofday() failed -- srand() not called.\n\n", __func__); - HDfflush(stdout); + fprintf(stdout, "\n%s: gettimeofday() failed -- srand() not called.\n\n", __func__); + fflush(stdout); } else { seed = (unsigned)tv.tv_usec; - HDfprintf(stdout, "\n%s: seed = %d.\n\n", __func__, seed); - HDfflush(stdout); + fprintf(stdout, "\n%s: seed = %d.\n\n", __func__, seed); + fflush(stdout); HDsrand(seed); } @@ -3534,12 +3534,12 @@ static H5FD_t * H5FD__ctl_test_vfd_open(const char H5_ATTR_UNUSED *name, unsigned H5_ATTR_UNUSED flags, hid_t H5_ATTR_UNUSED fapl_id, haddr_t H5_ATTR_UNUSED maxaddr) { - return HDcalloc(1, sizeof(H5FD_t)); + return calloc(1, sizeof(H5FD_t)); } static herr_t H5FD__ctl_test_vfd_close(H5FD_t H5_ATTR_UNUSED *_file) { - HDfree(_file); + free(_file); return SUCCEED; } static haddr_t @@ -3847,7 +3847,7 @@ test_ctl(void) PASSED(); /* Set up splitter VFD config */ - if (NULL == (splitter_config = HDcalloc(1, sizeof(H5FD_splitter_vfd_config_t)))) + if (NULL == (splitter_config = calloc(1, sizeof(H5FD_splitter_vfd_config_t)))) TEST_ERROR; splitter_config->magic = H5FD_SPLITTER_MAGIC; @@ -3999,7 +3999,7 @@ test_ctl(void) TESTING_2("test cleanup"); - HDfree(splitter_config); + free(splitter_config); if (H5FDunregister(driver_id) < 0) TEST_ERROR; @@ -4016,7 +4016,7 @@ error: H5E_BEGIN_TRY { if (splitter_config) - HDfree(splitter_config); + free(splitter_config); H5FDunregister(driver_id); H5Pclose(sub_fapl_id); H5Pclose(fapl_id); @@ -4074,12 +4074,12 @@ test_vector_io__setup_v(uint32_t count, H5FD_mem_t types[], haddr_t addrs[], siz sizes[i] = (size_t)((rand() & 1023) + 1); - temp_buf = HDmalloc(sizes[i] + 1); - read_bufs[i] = HDmalloc(sizes[i] + 1); + temp_buf = malloc(sizes[i] + 1); + read_bufs[i] = malloc(sizes[i] + 1); if ((NULL == temp_buf) || (NULL == read_bufs[i])) { - HDfprintf(stderr, "%s: can't malloc read / write bufs.\n", __func__); + fprintf(stderr, "%s: can't malloc read / write bufs.\n", __func__); result = FALSE; break; } @@ -4101,7 +4101,7 @@ test_vector_io__setup_v(uint32_t count, H5FD_mem_t types[], haddr_t addrs[], siz if (!result) { /* free buffers */ - HDfree(temp_buf); + free(temp_buf); for (i = 0; i < count; i++) { @@ -4113,7 +4113,7 @@ test_vector_io__setup_v(uint32_t count, H5FD_mem_t types[], haddr_t addrs[], siz if (read_bufs[i]) { - HDfree(read_bufs[i]); + free(read_bufs[i]); read_bufs[i] = NULL; } } @@ -4182,7 +4182,7 @@ test_vector_io__setup_fixed_size_v(uint32_t count, H5FD_mem_t types[], haddr_t a */ fix_point = ((uint32_t)rand() & (count - 1)) / 2; - HDassert(fix_point < count / 2); + assert(fix_point < count / 2); for (i = 0; i < count; i++) { @@ -4194,8 +4194,8 @@ test_vector_io__setup_fixed_size_v(uint32_t count, H5FD_mem_t types[], haddr_t a sizes[i] = (size_t)((rand() & 1023) + 1); - temp_buf = HDmalloc(sizes[i] + 1); - read_bufs[i] = HDmalloc(sizes[i] + 1); + temp_buf = malloc(sizes[i] + 1); + read_bufs[i] = malloc(sizes[i] + 1); } else { @@ -4210,13 +4210,13 @@ test_vector_io__setup_fixed_size_v(uint32_t count, H5FD_mem_t types[], haddr_t a addrs[i] = HADDR_UNDEF; - temp_buf = HDmalloc(sizes[fix_point] + 1); - read_bufs[i] = HDmalloc(sizes[fix_point] + 1); + temp_buf = malloc(sizes[fix_point] + 1); + read_bufs[i] = malloc(sizes[fix_point] + 1); } if ((NULL == temp_buf) || (NULL == read_bufs[i])) { - HDfprintf(stderr, "%s: can't malloc read / write bufs.\n", __func__); + fprintf(stderr, "%s: can't malloc read / write bufs.\n", __func__); result = FALSE; break; } @@ -4241,7 +4241,7 @@ test_vector_io__setup_fixed_size_v(uint32_t count, H5FD_mem_t types[], haddr_t a if (!result) { /* free buffers */ - HDfree(temp_buf); + free(temp_buf); for (i = 0; i < count; i++) { @@ -4253,7 +4253,7 @@ test_vector_io__setup_fixed_size_v(uint32_t count, H5FD_mem_t types[], haddr_t a if (read_bufs[i]) { - HDfree(read_bufs[i]); + free(read_bufs[i]); read_bufs[i] = NULL; } } @@ -4303,7 +4303,7 @@ test_vector_io__read_v_indiv(H5FD_t *lf, uint32_t count, H5FD_mem_t types[], had if (verbose) { - HDfprintf(stdout, "%s: H5FDread() failed on entry %d.\n", __func__, i); + fprintf(stdout, "%s: H5FDread() failed on entry %d.\n", __func__, i); } result = FALSE; break; @@ -4354,7 +4354,7 @@ test_vector_io__write_v_indiv(H5FD_t *lf, uint32_t count, H5FD_mem_t types[], ha if (verbose) { - HDfprintf(stdout, "%s: HDwrite() failed on entry %d.\n", __func__, i); + fprintf(stdout, "%s: HDwrite() failed on entry %d.\n", __func__, i); } result = FALSE; break; @@ -4418,10 +4418,10 @@ test_vector_io__verify_v(uint32_t count, H5FD_mem_t types[], size_t sizes[], con if (verbose) { - HDfprintf(stdout, "\n\nread/write buf mismatch in vector/entry"); - HDfprintf(stdout, "\"%s\"/%u at offset %llu/%llu w/r = %c/%c type = %s\n\n", name, - (unsigned)i, (long long unsigned)j, (long long unsigned)size, w_buf[j], - r_buf[j], mem_type_names[type]); + fprintf(stdout, "\n\nread/write buf mismatch in vector/entry"); + fprintf(stdout, "\"%s\"/%u at offset %llu/%llu w/r = %c/%c type = %s\n\n", name, + (unsigned)i, (long long unsigned)j, (long long unsigned)size, w_buf[j], r_buf[j], + mem_type_names[type]); } } j++; @@ -4465,7 +4465,7 @@ test_vector_io__dump_test_vectors(uint32_t count, H5FD_mem_t types[], haddr_t ad const char *w_buf; char *r_buf; - HDfprintf(stdout, "\n\nDumping test vector \"%s\" of length %d\n\n", name, count); + fprintf(stdout, "\n\nDumping test vector \"%s\" of length %d\n\n", name, count); for (i = 0; i < count; i++) { @@ -4473,7 +4473,7 @@ test_vector_io__dump_test_vectors(uint32_t count, H5FD_mem_t types[], haddr_t ad SET_TYPE(type_fixed, types, type, i); - HDassert((H5FD_MEM_DEFAULT <= type) && (type <= H5FD_MEM_OHDR)); + assert((H5FD_MEM_DEFAULT <= type) && (type <= H5FD_MEM_OHDR)); w_buf = (const char *)(write_bufs[i]); @@ -4486,12 +4486,12 @@ test_vector_io__dump_test_vectors(uint32_t count, H5FD_mem_t types[], haddr_t ad r_buf = NULL; } - HDfprintf(stdout, "%u: addr/len = %llu/%llu, type = %s, w_buf = \"%s\"\n", (unsigned)i, - (long long unsigned)(addrs[i]), (long long unsigned)(size), mem_type_names[type], w_buf); + fprintf(stdout, "%u: addr/len = %llu/%llu, type = %s, w_buf = \"%s\"\n", (unsigned)i, + (long long unsigned)(addrs[i]), (long long unsigned)(size), mem_type_names[type], w_buf); if (r_buf) { - HDfprintf(stdout, " r_buf = \"%s\"\n", r_buf); + fprintf(stdout, " r_buf = \"%s\"\n", r_buf); } } @@ -4607,7 +4607,7 @@ test_vector_io(const char *vfd_name) } else { - HDfprintf(stdout, "un-supported VFD\n"); + fprintf(stdout, "un-supported VFD\n"); TEST_ERROR; } @@ -4908,13 +4908,13 @@ test_vector_io(const char *vfd_name) h5_free_const(write_bufs_2[i]); write_bufs_2[i] = NULL; - HDfree(read_bufs_0[i]); + free(read_bufs_0[i]); read_bufs_0[i] = NULL; - HDfree(read_bufs_1[i]); + free(read_bufs_1[i]); read_bufs_1[i] = NULL; - HDfree(read_bufs_2[i]); + free(read_bufs_2[i]); read_bufs_2[i] = NULL; h5_free_const(f_write_bufs_0[i]); @@ -4926,13 +4926,13 @@ test_vector_io(const char *vfd_name) h5_free_const(f_write_bufs_2[i]); f_write_bufs_2[i] = NULL; - HDfree(f_read_bufs_0[i]); + free(f_read_bufs_0[i]); f_read_bufs_0[i] = NULL; - HDfree(f_read_bufs_1[i]); + free(f_read_bufs_1[i]); f_read_bufs_1[i] = NULL; - HDfree(f_read_bufs_2[i]); + free(f_read_bufs_2[i]); f_read_bufs_2[i] = NULL; } @@ -5042,15 +5042,15 @@ test_selection_io_read_verify(H5FD_t *lf, H5FD_mem_t type, uint32_t count, hid_t if (rbufs[i][j] != erbufs[i][j]) { H5_FAILED(); AT(); - HDprintf("data read from file does not match expected values at mapping array location %d\n", - i); - HDprintf("expected data: \n"); + printf("data read from file does not match expected values at mapping array location %d\n", + i); + printf("expected data: \n"); for (j = 0; j < SEL_IO_DIM0 * SEL_IO_DIM1; j++) { printf("%6d", erbufs[i][j]); if (!((j + 1) % SEL_IO_DIM1)) printf("\n"); } - HDprintf("read data: \n"); + printf("read data: \n"); for (j = 0; j < SEL_IO_DIM0 * SEL_IO_DIM1; j++) { printf("%6d", rbufs[i][j]); if (!((j + 1) % SEL_IO_DIM1)) @@ -5141,7 +5141,7 @@ test_selection_io(const char *vfd_name) } else { - HDfprintf(stdout, "un-supported VFD\n"); + fprintf(stdout, "un-supported VFD\n"); TEST_ERROR; } @@ -5213,7 +5213,7 @@ test_selection_io(const char *vfd_name) * Test 3: Strided <> Contiguous 1D I/O */ /* SEL_IO_DIM1 must be even */ - HDassert(SEL_IO_DIM1 / 2 == (SEL_IO_DIM1 + 1) / 2); + assert(SEL_IO_DIM1 / 2 == (SEL_IO_DIM1 + 1) / 2); /* Strided selection in memory */ start[0] = 1; @@ -5262,7 +5262,7 @@ test_selection_io(const char *vfd_name) * Test 4: Contiguous <> Strided 1D I/O */ /* SEL_IO_DIM1 must be even */ - HDassert(SEL_IO_DIM1 / 2 == (SEL_IO_DIM1 + 1) / 2); + assert(SEL_IO_DIM1 / 2 == (SEL_IO_DIM1 + 1) / 2); /* Contiguous selection in memory */ start[0] = 1; @@ -5311,7 +5311,7 @@ test_selection_io(const char *vfd_name) * Test 5: Strided <> Strided 1D I/O */ /* SEL_IO_DIM1 must be even */ - HDassert(SEL_IO_DIM1 / 2 == (SEL_IO_DIM1 + 1) / 2); + assert(SEL_IO_DIM1 / 2 == (SEL_IO_DIM1 + 1) / 2); /* Strided selection in memory */ start[0] = 1; @@ -5467,8 +5467,8 @@ test_selection_io(const char *vfd_name) * Test 8: Strided <> Strided 2D I/O */ /* SEL_IO_DIM0 and SEL_IO_DIM1 must be even */ - HDassert(SEL_IO_DIM0 / 2 == (SEL_IO_DIM0 + 1) / 2); - HDassert(SEL_IO_DIM1 / 2 == (SEL_IO_DIM1 + 1) / 2); + assert(SEL_IO_DIM0 / 2 == (SEL_IO_DIM0 + 1) / 2); + assert(SEL_IO_DIM1 / 2 == (SEL_IO_DIM1 + 1) / 2); /* Strided selection (across dim 1) in memory */ start[0] = 0; @@ -5502,7 +5502,7 @@ test_selection_io(const char *vfd_name) /* Update file buf */ for (i = 0, i2 = 1, j2 = 0; i < SEL_IO_DIM0; i++) for (j = 1; j < SEL_IO_DIM1; j += 2) { - HDassert(i2 < SEL_IO_DIM0); + assert(i2 < SEL_IO_DIM0); fbuf2[i2][j2] = wbuf2[i][j]; if (++j2 == SEL_IO_DIM1) { i2 += 2; @@ -5564,7 +5564,7 @@ test_selection_io(const char *vfd_name) /* Update file buf */ for (i = 1, i2 = 0, j2 = 1; i < (SEL_IO_DIM0 * SEL_IO_DIM1); i += 2) { - HDassert(i2 < SEL_IO_DIM0); + assert(i2 < SEL_IO_DIM0); fbuf2[i2][j2] = wbuf1[i]; j2 += 2; if (j2 >= SEL_IO_DIM1) { @@ -5626,7 +5626,7 @@ test_selection_io(const char *vfd_name) /* Update file buf */ for (i = 0, i2 = 0; i < SEL_IO_DIM0; i += 2) for (j = 0; j < SEL_IO_DIM1; j++) { - HDassert(i2 < (SEL_IO_DIM0 * SEL_IO_DIM1)); + assert(i2 < (SEL_IO_DIM0 * SEL_IO_DIM1)); fbuf1[i2] = wbuf2[i][j]; i2 += 2; } @@ -5661,7 +5661,7 @@ test_selection_io(const char *vfd_name) * Test 11: Strided <> Strided 1D and 2D I/O */ /* SEL_IO_DIM1 must be even */ - HDassert(SEL_IO_DIM1 / 2 == (SEL_IO_DIM1 + 1) / 2); + assert(SEL_IO_DIM1 / 2 == (SEL_IO_DIM1 + 1) / 2); /* Strided selection in memory (1D) */ start[0] = 0; @@ -5710,7 +5710,7 @@ test_selection_io(const char *vfd_name) fbuf1[(2 * i) + 1] = wbuf1[2 * i]; for (i = 1, i2 = 0, j2 = 1; i < SEL_IO_DIM0; i += 2) for (j = 0; j < SEL_IO_DIM1; j++) { - HDassert(i2 < SEL_IO_DIM0); + assert(i2 < SEL_IO_DIM0); fbuf2[i2][j2] = wbuf2[i][j]; j2 += 2; if (j2 >= SEL_IO_DIM1) { @@ -5819,7 +5819,7 @@ test_selection_io(const char *vfd_name) * find 1D index into 2D array */ for (i = 0, i2 = 0, j2 = 0; i < SEL_IO_DIM0; i += 2) for (j = 0; j < SEL_IO_DIM1; j++) { - HDassert(i2 < SEL_IO_DIM0); + assert(i2 < SEL_IO_DIM0); fbuf1[(i2 * SEL_IO_DIM1) + j2] = wbuf2[i][j]; j2 += 2; if (j2 >= SEL_IO_DIM1) { @@ -5829,7 +5829,7 @@ test_selection_io(const char *vfd_name) } for (i = 1, i2 = 0, j2 = 1; i < SEL_IO_DIM0; i += 2) for (j = 0; j < SEL_IO_DIM1; j++) { - HDassert(i2 < SEL_IO_DIM0); + assert(i2 < SEL_IO_DIM0); fbuf2[i2][j2] = wbuf2[i][j]; j2 += 2; if (j2 >= SEL_IO_DIM1) { @@ -5946,13 +5946,13 @@ main(void) */ env_h5_drvr = HDgetenv(HDF5_DRIVER); if (env_h5_drvr) { - HDprintf(" -- SKIPPED VFD tests because %s is set -- \n", HDF5_DRIVER); - HDexit(EXIT_SUCCESS); + printf(" -- SKIPPED VFD tests because %s is set -- \n", HDF5_DRIVER); + exit(EXIT_SUCCESS); } h5_reset(); - HDprintf("Testing basic Virtual File Driver functionality.\n"); + printf("Testing basic Virtual File Driver functionality.\n"); setup_rand(); @@ -5976,11 +5976,11 @@ main(void) nerrors += test_ctl() < 0 ? 1 : 0; if (nerrors) { - HDprintf("***** %d Virtual File Driver TEST%s FAILED! *****\n", nerrors, nerrors > 1 ? "S" : ""); + printf("***** %d Virtual File Driver TEST%s FAILED! *****\n", nerrors, nerrors > 1 ? "S" : ""); return EXIT_FAILURE; } - HDprintf("All Virtual File Driver tests passed.\n"); + printf("All Virtual File Driver tests passed.\n"); return EXIT_SUCCESS; } /* end main() */ diff --git a/test/vfd_plugin.c b/test/vfd_plugin.c index 182c048..2b7ed38 100644 --- a/test/vfd_plugin.c +++ b/test/vfd_plugin.c @@ -291,7 +291,7 @@ test_get_config_str(void) TEST_ERROR; /* Try to retrieve length of default configuration string - should be 0 */ - HDmemset(config_str_buf, 0, 128); + memset(config_str_buf, 0, 128); if ((config_str_len = H5Pget_driver_config_str(fapl_id, config_str_buf, 128)) < 0) TEST_ERROR; @@ -349,7 +349,7 @@ test_env_var(void) TESTING("Loading of VFD plugin with HDF5_DRIVER environment variable"); /* Try to retrieve length of default configuration string - should be 0 */ - HDmemset(config_str_buf, 0, 128); + memset(config_str_buf, 0, 128); if ((config_str_len = H5Pget_driver_config_str(H5P_FILE_ACCESS_DEFAULT, config_str_buf, 128)) < 0) TEST_ERROR; @@ -379,7 +379,7 @@ test_env_var(void) TEST_ERROR; /* Check driver configuration string */ - HDmemset(config_str_buf, 0, 128); + memset(config_str_buf, 0, 128); if ((config_str_len = H5Pget_driver_config_str(H5P_FILE_ACCESS_DEFAULT, config_str_buf, 128)) < 0) TEST_ERROR; if (HDstrlen(config_str) != config_str_len) @@ -429,11 +429,11 @@ main(void) nerrors += (test_env_var() < 0) ? 1 : 0; if (nerrors) { - HDprintf("***** %d VFD plugin TEST%s FAILED! *****\n", nerrors, nerrors > 1 ? "S" : ""); - HDexit(EXIT_FAILURE); + printf("***** %d VFD plugin TEST%s FAILED! *****\n", nerrors, nerrors > 1 ? "S" : ""); + exit(EXIT_FAILURE); } HDputs("All VFD plugin tests passed."); - HDexit(EXIT_SUCCESS); + exit(EXIT_SUCCESS); } @@ -579,12 +579,12 @@ fake_vol_info_to_str(const void *info, char **str) /* Verify the info is correct before continuing */ if (val != INT_MAX) { - HDprintf("The value of info (%d) is incorrect\n", val); + printf("The value of info (%d) is incorrect\n", val); return FAIL; } /* Allocate the string long enough for the info */ - if (NULL == (*str = (char *)HDcalloc(1, str_size))) + if (NULL == (*str = (char *)calloc(1, str_size))) return FAIL; HDsnprintf(*str, str_size, "%d", val); @@ -628,7 +628,7 @@ fake_vol_free_info(void *info) herr_t ret_value = SUCCEED; /* Return value */ if (info) - HDfree(info); + free(info); return ret_value; } /* end fake_vol_free_info() */ @@ -715,9 +715,9 @@ test_vol_registration(void) TEST_ERROR; /* Test registering a VOL connector with an incompatible version # */ - if (NULL == (bad_fake_vol_class = HDmalloc(sizeof(H5VL_class_t)))) + if (NULL == (bad_fake_vol_class = malloc(sizeof(H5VL_class_t)))) TEST_ERROR; - HDmemcpy(bad_fake_vol_class, &fake_vol_g, sizeof(H5VL_class_t)); + memcpy(bad_fake_vol_class, &fake_vol_g, sizeof(H5VL_class_t)); bad_fake_vol_class->version = H5VL_VERSION + 1; H5E_BEGIN_TRY { @@ -726,7 +726,7 @@ test_vol_registration(void) H5E_END_TRY; if (H5I_INVALID_HID != vol_id) FAIL_PUTS_ERROR("should not be able to register a connector with an incompatible version #"); - HDfree(bad_fake_vol_class); + free(bad_fake_vol_class); bad_fake_vol_class = NULL; /* Load a VOL interface @@ -807,7 +807,7 @@ error: H5E_END_TRY; if (bad_fake_vol_class) - HDfree(bad_fake_vol_class); + free(bad_fake_vol_class); return FAIL; } /* end test_vol_registration() */ @@ -2192,7 +2192,7 @@ test_async_vol_props(void) if (conn_env_str) { if (HDsetenv(HDF5_VOL_CONNECTOR, conn_env_str, TRUE) < 0) TEST_ERROR; - HDfree(conn_env_str); + free(conn_env_str); if (H5VL__reparse_def_vol_conn_variable_test() < 0) TEST_ERROR; @@ -2209,7 +2209,7 @@ error: H5VLunregister_connector(vol_id); } H5E_END_TRY; - HDfree(conn_env_str); + free(conn_env_str); return FAIL; } /* end test_async_vol_props() */ @@ -2345,7 +2345,7 @@ test_get_vol_name(void) /* Skip the connectors other than the native and pass_through connector */ if (HDstrcmp(conn_env_str, "native") && HDstrcmp(conn_env_str, "pass_through")) { SKIPPED(); - HDprintf(" only test the native or internal pass_through connector\n"); + printf(" only test the native or internal pass_through connector\n"); return SUCCEED; } @@ -2510,7 +2510,7 @@ test_info_to_str(void) /* Free the string being returned */ if (ret_str) - HDfree(ret_str); + free(ret_str); if (H5Pclose(fapl_id) < 0) TEST_ERROR; @@ -2655,12 +2655,12 @@ main(void) nerrors += test_query_optional() < 0 ? 1 : 0; if (nerrors) { - HDprintf("***** %d Virtual Object Layer TEST%s FAILED! *****\n", nerrors, nerrors > 1 ? "S" : ""); - HDexit(EXIT_FAILURE); + printf("***** %d Virtual Object Layer TEST%s FAILED! *****\n", nerrors, nerrors > 1 ? "S" : ""); + exit(EXIT_FAILURE); } HDputs("All Virtual Object Layer (VOL) tests passed."); - HDexit(EXIT_SUCCESS); + exit(EXIT_SUCCESS); } /* end main() */ diff --git a/test/vol_plugin.c b/test/vol_plugin.c index c7baf5a..b5c0756 100644 --- a/test/vol_plugin.c +++ b/test/vol_plugin.c @@ -342,12 +342,12 @@ main(void) nerrors += test_getters() < 0 ? 1 : 0; if (nerrors) { - HDprintf("***** %d VOL connector plugin TEST%s FAILED! *****\n", nerrors, nerrors > 1 ? "S" : ""); - HDexit(EXIT_FAILURE); + printf("***** %d VOL connector plugin TEST%s FAILED! *****\n", nerrors, nerrors > 1 ? "S" : ""); + exit(EXIT_FAILURE); } HDputs("All VOL connector plugin tests passed."); - HDexit(EXIT_SUCCESS); + exit(EXIT_SUCCESS); } /* end main() */ |