diff options
Diffstat (limited to 'test/vds.c')
-rw-r--r-- | test/vds.c | 140 |
1 files changed, 70 insertions, 70 deletions
@@ -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() */ @@ -470,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; @@ -480,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 { @@ -512,7 +512,7 @@ error: } H5E_END_TRY if (plist_buf) - HDfree(plist_buf); + free(plist_buf); return -1; } /* end test_api_get_ex_dcpl() */ @@ -1207,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); @@ -1408,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; @@ -1439,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 */ @@ -1494,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); @@ -4340,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; @@ -4369,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() */ @@ -7435,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); @@ -11058,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; @@ -11089,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() */ |