diff options
author | Dana Robinson <43805+derobins@users.noreply.github.com> | 2023-06-28 22:48:12 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-06-28 22:48:12 (GMT) |
commit | aebac33a1f290fa5065bce96bb0512317a34c283 (patch) | |
tree | cdbae6dbd65a2eb4e6f786921ee907cec92c92d3 /test/tfile.c | |
parent | 605cea4af60cfcbe03a54f697de392eec75e5a85 (diff) | |
download | hdf5-aebac33a1f290fa5065bce96bb0512317a34c283.zip hdf5-aebac33a1f290fa5065bce96bb0512317a34c283.tar.gz hdf5-aebac33a1f290fa5065bce96bb0512317a34c283.tar.bz2 |
Remove HD from memory allocate/free calls (#3195)
* HDcalloc
* HDfree
* HDmalloc
* HDrealloc
Diffstat (limited to 'test/tfile.c')
-rw-r--r-- | test/tfile.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/test/tfile.c b/test/tfile.c index 9da1c9b..8482e1f 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 */ @@ -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 */ @@ -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; |