diff --git a/vol_dataset_test.c b/vol_dataset_test.c index f4ec448..3e232f4 100644 --- a/vol_dataset_test.c +++ b/vol_dataset_test.c @@ -3989,21 +3989,21 @@ test_dataset_property_lists(void) static int test_get_dataset_storage_size(void) { - hsize_t dims[DATASET_STORAGE_SIZE_TEST_ALL_DSET_SPACE_RANK] = - {DATASET_STORAGE_SIZE_TEST_ALL_DSET_EXTENT, DATASET_STORAGE_SIZE_TEST_ALL_DSET_EXTENT}; - size_t data_size = 0, type_size = 0; - hid_t dset_id_contiguous = H5I_INVALID_HID; - hid_t dset_id_chunked = H5I_INVALID_HID; - hid_t dset_id_filtered = H5I_INVALID_HID; - - hid_t file_id = H5I_INVALID_HID; + hsize_t dims[DATASET_STORAGE_SIZE_TEST_ALL_DSET_SPACE_RANK] = {DATASET_STORAGE_SIZE_TEST_ALL_DSET_EXTENT, + DATASET_STORAGE_SIZE_TEST_ALL_DSET_EXTENT}; + size_t data_size = 0, type_size = 0; + hid_t dset_id_contiguous = H5I_INVALID_HID; + hid_t dset_id_chunked = H5I_INVALID_HID; + hid_t dset_id_filtered = H5I_INVALID_HID; + + hid_t file_id = H5I_INVALID_HID; hid_t container_group = H5I_INVALID_HID, group_id = H5I_INVALID_HID; - hid_t type_id = H5I_INVALID_HID; + hid_t type_id = H5I_INVALID_HID; hid_t space_id = H5I_INVALID_HID; - hid_t dcpl_id = H5I_INVALID_HID; + hid_t dcpl_id = H5I_INVALID_HID; void *write_buf = NULL; - + TESTING_MULTIPART("H5Dget_storage_size"); /* Make sure the connector supports the API functions being tested */ @@ -4049,36 +4049,38 @@ test_get_dataset_storage_size(void) if ((H5Pset_layout(dcpl_id, H5D_CONTIGUOUS)) < 0) TEST_ERROR; - if ((dset_id_contiguous = H5Dcreate(group_id, DATASET_STORAGE_SIZE_TEST_DSET_CONTIGUOUS_NAME, - type_id, space_id, H5P_DEFAULT, dcpl_id, H5P_DEFAULT)) < 0) + if ((dset_id_contiguous = H5Dcreate(group_id, DATASET_STORAGE_SIZE_TEST_DSET_CONTIGUOUS_NAME, type_id, + space_id, H5P_DEFAULT, dcpl_id, H5P_DEFAULT)) < 0) TEST_ERROR; if ((H5Pset_layout(dcpl_id, H5D_CHUNKED)) < 0) TEST_ERROR; - + if ((H5Pset_chunk(dcpl_id, DATASET_STORAGE_SIZE_TEST_ALL_DSET_SPACE_RANK, dims)) < 0) TEST_ERROR; - if ((dset_id_chunked = H5Dcreate(group_id, DATASET_STORAGE_SIZE_TEST_DSET_CHUNKED_NAME, - type_id, space_id, H5P_DEFAULT, dcpl_id, H5P_DEFAULT)) < 0) + if ((dset_id_chunked = H5Dcreate(group_id, DATASET_STORAGE_SIZE_TEST_DSET_CHUNKED_NAME, type_id, space_id, + H5P_DEFAULT, dcpl_id, H5P_DEFAULT)) < 0) TEST_ERROR; if ((H5Pset_deflate(dcpl_id, 6)) < 0) TEST_ERROR; - if ((dset_id_filtered = H5Dcreate(group_id, DATASET_STORAGE_SIZE_TEST_DSET_FILTERED_NAME, - type_id, space_id, H5P_DEFAULT, dcpl_id, H5P_DEFAULT)) < 0) + if ((dset_id_filtered = H5Dcreate(group_id, DATASET_STORAGE_SIZE_TEST_DSET_FILTERED_NAME, type_id, + space_id, H5P_DEFAULT, dcpl_id, H5P_DEFAULT)) < 0) TEST_ERROR; if ((type_size = H5Tget_size(type_id)) <= 0) TEST_ERROR; - if ((write_buf = calloc(DATASET_STORAGE_SIZE_TEST_ALL_DSET_EXTENT * DATASET_STORAGE_SIZE_TEST_ALL_DSET_EXTENT, type_size)) == NULL) + if ((write_buf = + calloc(DATASET_STORAGE_SIZE_TEST_ALL_DSET_EXTENT * DATASET_STORAGE_SIZE_TEST_ALL_DSET_EXTENT, + type_size)) == NULL) TEST_ERROR; for (size_t i = 0; i < DATASET_STORAGE_SIZE_TEST_ALL_DSET_EXTENT; i++) for (size_t j = 0; j < DATASET_STORAGE_SIZE_TEST_ALL_DSET_EXTENT; j++) - ((int*)write_buf)[i * DATASET_STORAGE_SIZE_TEST_ALL_DSET_EXTENT + j] = j; + ((int *)write_buf)[i * DATASET_STORAGE_SIZE_TEST_ALL_DSET_EXTENT + j] = j; PASSED(); @@ -4088,7 +4090,8 @@ test_get_dataset_storage_size(void) { TESTING_2("H5Dget_storage_size on contiguous dataset"); - if (H5Dwrite(dset_id_contiguous, type_id, H5S_ALL, H5S_ALL, H5P_DEFAULT, (const void*) write_buf) < 0) { + if (H5Dwrite(dset_id_contiguous, type_id, H5S_ALL, H5S_ALL, H5P_DEFAULT, + (const void *)write_buf) < 0) { H5_FAILED(); HDprintf(" couldn't write to contiguous dataset\n"); PART_ERROR(H5Dget_storage_size_contiguous); @@ -4108,7 +4111,8 @@ test_get_dataset_storage_size(void) { TESTING_2("H5Dget_storage_size of chunked dataset"); - if (H5Dwrite(dset_id_chunked, type_id, H5S_ALL, H5S_ALL, H5P_DEFAULT, (const void*) write_buf) < 0) { + if (H5Dwrite(dset_id_chunked, type_id, H5S_ALL, H5S_ALL, H5P_DEFAULT, (const void *)write_buf) < + 0) { H5_FAILED(); HDprintf(" couldn't write to chunked dataset\n"); PART_ERROR(H5Dget_storage_size_chunked); @@ -4134,7 +4138,8 @@ test_get_dataset_storage_size(void) PART_EMPTY(H5Dget_storage_size_filtered); } - if (H5Dwrite(dset_id_filtered, type_id, H5S_ALL, H5S_ALL, H5P_DEFAULT, (const void*) write_buf) < 0) { + if (H5Dwrite(dset_id_filtered, type_id, H5S_ALL, H5S_ALL, H5P_DEFAULT, (const void *)write_buf) < + 0) { H5_FAILED(); HDprintf(" couldn't write to filtered dataset\n"); PART_ERROR(H5Dget_storage_size_filtered); @@ -4151,7 +4156,7 @@ test_get_dataset_storage_size(void) PART_END(H5Dget_storage_size_filtered); } END_MULTIPART; - + done: free(write_buf); diff --git a/vol_dataset_test.h b/vol_dataset_test.h index caa5712..7d12a1f 100644 --- a/vol_dataset_test.h +++ b/vol_dataset_test.h @@ -126,13 +126,13 @@ int vol_dataset_test(void); #define DATASET_PROPERTY_LIST_TEST_DSET_NAME3 "property_list_test_dataset3" #define DATASET_PROPERTY_LIST_TEST_DSET_NAME4 "property_list_test_dataset4" -#define DATASET_STORAGE_SIZE_TEST_ALL_DSET_SPACE_RANK 2 -#define DATASET_STORAGE_SIZE_TEST_ALL_DSET_EXTENT 10 -#define DATASET_STORAGE_SIZE_TEST_GROUP_NAME "dataset_get_storage_size_test" +#define DATASET_STORAGE_SIZE_TEST_ALL_DSET_SPACE_RANK 2 +#define DATASET_STORAGE_SIZE_TEST_ALL_DSET_EXTENT 10 +#define DATASET_STORAGE_SIZE_TEST_GROUP_NAME "dataset_get_storage_size_test" #define DATASET_STORAGE_SIZE_TEST_DSET_CONTIGUOUS_NAME "dataset_contiguous" -#define DATASET_STORAGE_SIZE_TEST_DSET_CHUNKED_NAME "dataset_chunked" -#define DATASET_STORAGE_SIZE_TEST_DSET_FILTERED_NAME "dataset_filtered" -#define DATASET_STORAGE_SIZE_TEST_TYPE H5T_NATIVE_INT +#define DATASET_STORAGE_SIZE_TEST_DSET_CHUNKED_NAME "dataset_chunked" +#define DATASET_STORAGE_SIZE_TEST_DSET_FILTERED_NAME "dataset_filtered" +#define DATASET_STORAGE_SIZE_TEST_TYPE H5T_NATIVE_INT #define DATASET_SMALL_READ_TEST_ALL_DSET_SPACE_RANK 3 #define DATASET_SMALL_READ_TEST_ALL_DSET_DTYPESIZE sizeof(int)